Commit graph

55 commits

Author SHA1 Message Date
Lwmte
35d736421c Fix UPV bugs 2021-10-04 12:28:05 +03:00
Lwmte
971d1b203f Cleanup 2 2021-09-25 16:04:16 +03:00
Lwmte
e6fc5aba77 Cleanup 2021-09-25 16:00:30 +03:00
Raildex
2b0b1ff282 Added newlines 2021-09-25 11:27:47 +02:00
Raildex
7b070e75ad Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Lwmte
add6629267 Swap BadHeightUp/Down 2021-09-19 17:48:32 +03:00
Lwmte
b3898b7940 Embed height data into COLL_INFO, fix issues with rolling under statics and statics submerged into water 2021-09-19 06:42:24 +03:00
Lwmte
5ae79a461e Remove legacy RoomBelow/Above helper funcs, fix door offset 2021-09-17 15:32:55 +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
4a551c0918 Move LOS stuff out of control.cpp 2021-09-15 17:20:42 +03:00
Lwmte
f79d6436a3 Remove optional TestTriggers argument 2021-09-15 16:58:53 +03:00
Lwmte
d8ab386840 Rename DeathIsPit to be more descriptive 2021-09-13 09:55:54 +03:00
Lwmte
2f3af7e3ea Simplify GetCollisionInfo arguments 2021-09-10 12:14:28 +03:00
Lwmte
280c9fa28b Merge branch 'master' into coll_info_reorganize 2021-09-10 10:11:15 +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
31ec83f9cc Merge branch 'master' into item_data
# Conflicts:
#	TR5Main/Game/items.cpp
2021-09-04 11:52:34 +02:00
Lwmte
522b41d1d6 Clarify function names
# Conflicts:
#	TR5Main/Game/collide.cpp
2021-09-02 19:49:07 +02: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
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
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
1f68fd812b Simplify TestTriggers by providing overloads 2021-08-26 12:12:05 +03:00
Lwmte
3378c8791a Organize COLL_INFO 2021-08-25 06:54:17 +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
1effeed738 Refactored cameras, sinks and sound sources; Added sound sources playback; 2021-07-10 06:55:37 +02:00
Trxye
a6462075a3 Remove TR3 comments 2021-03-24 12:49:36 -05:00
asasas9500
f9432ce420 Merge branch 'master' into NewTRMath 2020-11-04 11:51:17 -03:00
Woops
8525f21d4a cleanup UPV code, defines 2020-10-30 00:00:41 -05:00
Woops
4438a8a0af fix UPV surface bug 2020-10-28 18:03:48 -05:00
Woops
ea291e702b restore upv bump, fix upv and kayak positions 2020-10-26 13:04:58 -05:00
Woops
f0e2469f8f Fix the UPV glitch one and for all 2020-10-19 15:06:51 -05: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
ab5438deed fix UPV shooting 2020-10-01 14:52:03 -05:00
Woops
c1a188a594 lovely UPV jitter workaround 2020-09-30 22:00:54 -05:00
Woops
dc3695e283 upv: make fan rotate + light 2020-09-30 14:45:46 -05:00
Woops
4255532fb6 hotfix but I still hate this 2020-09-30 14:13:36 -05:00
asasas9500
9f415aa291 Remove rcossin_tbl; Remove duplicated TriggerAlertLight() 2020-09-30 12:37:06 -03:00
Woops
44a9ff2df2 more UPV fixes/cleanups 2020-09-28 15:21:19 -05:00
Woops
747cb652ea partially fix UPV 2020-09-27 23:29:25 -05:00
asasas9500
7365cdf4c8 Rename Lara files 2020-08-09 22:09:14 -03:00
MontyTRC89
83bba01a99 Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00