Commit graph

56 commits

Author SHA1 Message Date
Lwmte
fb65e68191 Remove broken CollideStaticObjects function
# Conflicts:
#	TR5Main/Game/collide.cpp
2021-09-02 19:50:10 +02:00
Lwmte
e879038220 Fix namespace case 2021-08-30 18:03:21 +03:00
Lwmte
56c71d1fe6 Separate volume code from TestTriggers, fix DoRayBox bounds 2021-08-30 15:35:00 +03:00
Lwmte
e2e20a2497 Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug 2021-08-29 23:53:58 +03:00
Lwmte
39f2a8803a Update lara.cpp 2021-08-26 19:55:52 +03:00
Lwmte
5e48c0350e Rename effect.cpp to flipeffect.cpp to avoid confusions 2021-08-26 16:24:43 +03:00
Lwmte
dd3b6fa4e5 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
bcf1fbc6d4 Remove magic numbers from GetCollisionInfo 2021-08-26 13:06:24 +03:00
Lwmte
932ccc40d1 Simplify TestTriggers by providing overloads 2021-08-26 12:12:05 +03:00
Lwmte
e0b47d629f Merge branch 'master' into legacy_trigger_refactor 2021-08-24 19:04:54 +03:00
Lwmte
ef2ff5bf51 Completely get rid of TriggerIndex 2021-08-20 15:26:12 +03:00
Lwmte
218e9f685a Replace all direct occurences of TestTriggers with TestTriggersAtXYZ and references to TriggerIndex global in structs 2021-08-20 14:13:06 +03:00
MontyTRC89
2e1ac44c08 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-20 05:26:07 +02:00
MontyTRC89
109b7d6e18 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine; Renamed namespaces;
# Conflicts:
#	TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
Lwmte
e7e1cca356 First commit 2021-08-20 02:01:50 +03:00
Lwmte
6727138e64 Add RefreshFloorGlobals hack to temporarily fix issues with monkeyswing and possibly other states 2021-08-19 18:43:52 +03:00
hispidence
d1ca2df0a6 Fix old LARA_DRAW_TYPE usage with LARA_TYPE constants.
These don't need to be scoped, but I originally made it an enum class and plan to end up doing so down the line anyway, and this should save a bit of time there.
2021-08-07 19:24:39 +01:00
Troye
1cf0aef90d Add more anims to NewAnims; Fix lean 2021-07-09 19:41:56 -05:00
Troye
e201df8f97 clean up larainfo; add anim bools' 2021-07-08 14:15:14 -05:00
Trxye
9728282c14 comment feet hanging 2021-06-02 13:24:17 -05:00
MontyTRC89
99614caa27 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 05:33:17 +02:00
Trxye
35af9b2c92 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
MontyTRC89
6b5a932ff8 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
Trxye
622cc4210a fix inventory drawing; implement inventory in game code; 2021-05-20 14:19:11 -05:00
asasas9500
3a56b42ae2 Remove comments; Fix ID_ANIMATING13, ID_ANIMATING14, ID_ANIMATING15 and ID_ANIMATING16 2021-02-07 00:10:36 -03:00
asasas9500
4521994088 Remove function markers 2021-02-03 01:50:59 -03:00
asasas9500
d4c6cc4a97 Fix line endings 2020-12-21 13:16:29 -03:00
asasas9500
91f0bb20f7 Revert move angle relative to Lara rotation 2020-12-19 23:34:52 -03:00
asasas9500
2df3f39d4c Merge branch 'master' into NewTRMath 2020-11-04 11:51:17 -03:00
Woops
248039f4ad better cheats 2020-10-24 12:51:58 -05:00
Woops
516d100706 remove bitshifts from Lara code 2020-10-06 11:15:37 -05:00
asasas9500
6fc9bd9890 Fix phd_sin() and phd_cos() 2020-10-05 22:24:57 -03:00
Sezz
92bc8b662d Revert "Cleanup, control code standardisation, some command-query separation, un-hardcoding of animation state dispatches, QOL improvements to Lara's basic moveset."
This reverts commit 2ee7059470.
2020-09-26 05:06:08 +10:00
Sezz
2ee7059470 Cleanup, control code standardisation, some command-query separation, un-hardcoding of animation state dispatches, QOL improvements to Lara's basic moveset. 2020-09-26 03:28:30 +10:00
Montagna Marco
31c7019e3f Improved vehicles; Fixed bugs in ID_SPEEDBOAT; 2020-09-12 07:52:47 +02:00
asasas9500
894a11837d Finish merge 2020-08-29 22:02:41 -03:00
asasas9500
50ba19525d Finish merge 2020-08-25 19:39:50 -03:00
Woops
aca8da8db1 Lara refactor: lara_cheat, move the rest of the functions out of laramisc.cpp and delete it. fix includes. 2020-08-16 16:01:58 -05:00
Woops
5440880ef8 Lara refactor: lara_initialise and move AnimateLara to lara.cpp 2020-08-15 15:16:08 -05:00
Woops
78007cde4c Lara refactor: move "level 1" functions to Lara.cpp 2020-08-14 18:29:20 -05:00
Woops
6248fcb0ed Lara refactor: move basic movements to lara_basic, take care of the other functions. 2020-08-14 17:54:25 -05:00
Woops
7d58b73cc4 Lara refactor: move sliding to lara_slide, move deathslide to lara_objects, add file descriptions 2020-08-14 04:08:10 -05:00
Woops
ab0f5ec2b4 Lara refactor: delete lara_pickup, move contents to lara_objects, move all object functions to lara_objects 2020-08-13 19:53:13 -05:00
Woops
015dba9b1c Lara refactor: move all hanging functions to lara_hang, and move lara_crawl2hang to lara_crawl 2020-08-11 03:55:34 -05:00
Woops
567af76366 Lara refactor: move pickup functions from pickup.cpp to lara_pickup.cpp 2020-08-10 22:07:00 -05:00
Woops
8473a38964 Lara refactor: move pickup states to pickup.cpp 2020-08-10 00:34:19 -05:00
Woops
fad97f2201 Lara refactor: move crouch/crawl into lara_crawl.cpp 2020-08-10 00:21:45 -05:00
asasas9500
b9bc1cf54e Rename Lara files 2020-08-09 22:09:14 -03:00
Woops
80882f77a2 Lara refactor: move monkeyswing functions to lara_monkey 2020-08-09 19:18:29 -05:00
Woops
98dbafdd34 Lara refactor: Move functions around, clean up Lara.h 2020-08-09 00:54:57 -05:00