Commit graph

42 commits

Author SHA1 Message Date
Lwmte
c871884301 Don't use legacy function names in sound code 2021-10-02 18:54:53 +03:00
Lwmte
04f580c81a Fix boat sounds 2021-09-25 15:02:39 +03:00
Lwmte
015815c5d3 Fix embedding into diagonal walls and steps, fix Lara freeze on triangle slopes 2021-09-17 22:55:09 +03:00
Lwmte
8d86c2e97d Rename draw.cpp to animation.cpp which makes more sense, some more edits 2021-09-16 05:06:03 +03:00
Lwmte
1d0ceb0ff4 Fix more stuff 2021-09-16 01:12:19 +03:00
Lwmte
f79d6436a3 Remove optional TestTriggers argument 2021-09-15 16:58:53 +03:00
Lwmte
280c9fa28b Merge branch 'master' into coll_info_reorganize 2021-09-10 10:11:15 +03:00
Lwmte
c9d4914e3d Simplify COLL_POSITION 2021-09-10 00:43:26 +03:00
Lwmte
1df38ae15a Rename settings to setup 2021-09-10 00:20:59 +03:00
Lwmte
1efe0a9f09 Reorganize COLL_INFO 2021-09-10 00:18:47 +03:00
Lwmte
48a9a1d52a Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Lwmte
ba6c260b92 Further code organizing 2021-09-08 18:19:06 +03:00
Lwmte
f293735d11 Move all effect source files to separate directory, rename effect2 to effects 2021-09-08 18:07:48 +03:00
Raildex
b422cafc79 Merge branch 'master' into item_data
# Conflicts:
#	TR5Main/Game/Lara/lara.cpp
#	TR5Main/Game/Lara/lara_collide.cpp
#	TR5Main/Game/Lara/lara_monkey.cpp
#	TR5Main/Game/Lara/lara_struct.h
#	TR5Main/Game/Lara/lara_tests.cpp
#	TR5Main/Game/collide.h
#	TR5Main/Game/control.h
#	TR5Main/Game/effect.h
#	TR5Main/Game/effect2.cpp
#	TR5Main/Game/flipeffect.cpp
#	TR5Main/Game/floordata.h
#	TR5Main/Game/hair.cpp
#	TR5Main/Game/health.cpp
#	TR5Main/Game/items.cpp
#	TR5Main/Game/newinv2.cpp
#	TR5Main/Game/spotcam.cpp
#	TR5Main/Objects/Effects/tr4_bubbles.cpp
#	TR5Main/Objects/TR1/Entity/tr1_ape.cpp
#	TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp
#	TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp
#	TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp
#	TR5Main/Objects/TR2/Entity/tr2_shark.cpp
#	TR5Main/Objects/TR2/Entity/tr2_spider.cpp
#	TR5Main/Objects/TR2/Entity/tr2_yeti.cpp
#	TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
#	TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp
#	TR5Main/Objects/TR3/Entity/tr3_monkey.cpp
#	TR5Main/Objects/TR3/Entity/tr3_raptor.cpp
#	TR5Main/Objects/TR3/Entity/tr3_scuba.cpp
#	TR5Main/Objects/TR3/Entity/tr3_trex.cpp
#	TR5Main/Objects/TR3/Vehicles/kayak.cpp
#	TR5Main/Objects/TR3/Vehicles/minecart.cpp
#	TR5Main/Objects/TR4/Entity/tr4_bat.cpp
#	TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
#	TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp
#	TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
#	TR5Main/Objects/TR4/Entity/tr4_dog.cpp
#	TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp
#	TR5Main/Objects/TR4/Entity/tr4_harpy.cpp
#	TR5Main/Objects/TR4/Entity/tr4_mutant.cpp
#	TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp
#	TR5Main/Objects/TR4/Entity/tr4_troops.cpp
#	TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp
#	TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
#	TR5Main/Objects/TR4/Vehicles/motorbike.cpp
#	TR5Main/Objects/TR5/Entity/tr5_doberman.cpp
#	TR5Main/Objects/TR5/Entity/tr5_imp.cpp
#	TR5Main/Objects/TR5/Entity/tr5_larson.cpp
#	TR5Main/Objects/TR5/Entity/tr5_lion.cpp
#	TR5Main/Objects/TR5/Entity/tr5_reaper.cpp
#	TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
#	TR5Main/Objects/TR5/Object/tr5_rollingball.cpp
#	TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp
#	TR5Main/Renderer/Renderer11Draw2D.cpp
#	TR5Main/Specific/input.cpp
#	TR5Main/Specific/level.cpp
#	TR5Main/TombEngine.vcxproj.filters
2021-08-31 18:20:23 +02:00
Raildex
8a330f1da0 Removed unnecessary constructor of ITEM_DATA
Removed Debugging leftovers
2021-08-30 17:50:11 +02:00
Lwmte
6d9cf3c214 Fix namespace case 2021-08-30 18:03:21 +03:00
Lwmte
21df1e84f1 Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug 2021-08-29 23:53:58 +03:00
Raildex
f7080f56c9 Integrated ITEM_DATA into ITEM_INFO
TODO: See what happens with ENEMY_JEEP
2021-08-29 16:11:03 +02:00
Raildex
59987a69a7 Refactored several info types into separate files 2021-08-29 10:19:47 +02:00
Lwmte
1f68fd812b Simplify TestTriggers by providing overloads 2021-08-26 12:12:05 +03:00
Lwmte
ec9479860f Merge branch 'master' into legacy_trigger_refactor 2021-08-24 19:04:54 +03:00
Lwmte
70626854f0 Replace all remaining occurences of coll globals 2021-08-24 16:54:26 +03:00
Lwmte
1828ddaeab Replace all direct occurences of TestTriggers with TestTriggersAtXYZ and references to TriggerIndex global in structs 2021-08-20 14:13:06 +03:00
MontyTRC89
0ed8181cda Merge branch 'master' of https://github.com/MontyTRC89/TombEngine; Renamed namespaces;
# Conflicts:
#	TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
MontyTRC89
b2f102ae63 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
KrysB4k
c19577233b Comment cleanup (TR1 & TR2) 2021-03-24 20:06:37 +01:00
Raildex
2a2c52674f Refactored SpeedBoatCheckGeton to use a descriptive Enum as return type 2021-01-25 11:09:36 +01:00
asasas9500
2a7ed3e61f Merge branch 'master' into NewTRMath 2020-10-14 22:22:10 -03:00
Woops
a8b36fab20 remove bitshifts from vehicles 2020-10-06 10:36:30 -05:00
asasas9500
7218086a0f Fix phd_sin() and phd_cos() 2020-10-05 22:24:57 -03:00
Woops
28e5b4e7ec small boat fix 2020-10-03 13:47:20 -05:00
Raildex
85b4a2ff1c Added parameter to SetupRIpple to specifiy sprite 2020-09-21 15:20:59 +02:00
Raildex
624f5675b7 Merge branch 'VehicleSprites'
# Conflicts:
#	TR5Main/Objects/TR2/Vehicles/boat.cpp
2020-09-15 08:13:58 +02:00
Raildex
9dc7ab6d18 Added Boat foam, Skidoo snow trail 2020-09-15 08:10:38 +02:00
MontyTRC89
b275f0b356 Cleaned ID_SPEED_BOAT 2020-09-14 20:04:58 +02:00
MontyTRC89
6b3872d4ff Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-09-13 15:53:54 +02:00
MontyTRC89
2500e60059 More fixes to ID_BOAT; Improved snow and water effects; Cleaned skidoo; 2020-09-13 15:53:37 +02:00
Woops
34205dd532 restore TR2 controls for TR2 boat 2020-09-12 12:43:24 -05:00
MontyTRC89
54893c42be Improved vehicles; Fixed bugs in ID_SPEEDBOAT; 2020-09-12 07:52:47 +02:00
MontyTRC89
83bba01a99 Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
Raildex
5ef674b577 Made Game_Malloc a template with a count parameter 2020-07-05 22:19:06 +02:00
TokyoSU
39050f69ea Fixing Entity Include (Part 1)
- Less Compile Time...
2020-05-27 13:01:32 +02:00
Renamed from TR5Main/Objects/Vehicles/boat.cpp (Browse further)