Commit graph

837 commits

Author SHA1 Message Date
MontyTRC89
255393b589 Added FROM_DEGREES function; Added quantity param to PickedUpObject(); LUA scripting refactoring WIP; 2021-06-29 05:00:15 +02:00
MontyTRC89
a4d3ec9d26 Switched audio tracks from int index to string; Added Tracks.lua loading support; 2021-06-26 07:36:54 +02:00
asasas9500
f5d5070373 Improve expanding platform 2021-06-17 20:13:28 -03:00
wolfcheese
afeb234ebe Missed these from the previous commit 2021-06-15 19:52:39 -04:00
wolfcheese
d446c14175 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-06-15 19:48:53 -04:00
wolfcheese
8da8973f19 Added checks to raising block, pushable block, floor and ceiling trapdoors to prevent crashing upon load 2021-06-15 19:48:30 -04:00
Trxye
cec71ac156 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-06-15 14:09:56 -05:00
Trxye
55b517010d diary bs 2021-06-15 14:09:49 -05:00
wolfcheese
4301289df4 Updates to expanding platform 2021-06-15 10:43:13 -04:00
wolfcheese
b9e9971a35 Added height check to expanding_platform based on its animation 2021-06-13 11:34:46 -04:00
wolfcheese
d83cd56a50 Cleaned up code for generic trapdoors 2021-06-12 16:39:13 -04:00
wolfcheese
28f377789e Added rudimentary implementation of EXPANDING_PLATFORM 2021-06-11 22:57:58 -04:00
wolfcheese
48ccbe0d8a Added bridge collision to trapdoor 2021-06-11 12:07:09 -04:00
Trxye
fda0e1ac3d fix compile 2021-06-10 11:36:34 -05:00
Trxye
e2b0178cb8 InitialiseObelisk(); some of ObeliskControl() 2021-06-09 22:48:18 -05:00
wolfcheese
866cfe6de1 Fixed skeleton OCB 3 2021-06-09 12:37:40 -04:00
wolfcheese
3b198afaef Beetle's room number was not updating due to low height; added small adjustment to its GetFloor() 2021-06-08 16:04:43 -04:00
wolfcheese
0ce18644b5 Merge branch 'master' of https://github.com/montytrc89/tombengine 2021-06-07 12:03:59 -04:00
wolfcheese
077766d662 Twoblockplatform ceiling adjusted to allow tall blocks to enter underneath. GetCollidingObjects no longer finds objects under the colliding item's floor 2021-06-07 12:03:53 -04:00
MontyTRC89
3508c7217b Fixed ID_SKELETON immortality 2021-06-07 16:10:43 +02:00
MontyTRC89
00a5c93eb4 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-06-06 06:49:58 +02:00
MontyTRC89
b3f1f246e1 Partially fixed ID_GUIDE; Restored flipeffects processing; Fixed LARA_INFO struct for flipeffect 30 Lara location; 2021-06-06 06:49:49 +02:00
Trxye
e9f65c0b8b Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-06-05 15:27:26 -05:00
Trxye
61db16c17e implement waterskins 2021-06-05 15:27:19 -05:00
MontyTRC89
5780f9b81d Fixed ID_SLICER_DICER 2021-06-05 11:14:06 +02:00
MontyTRC89
28d3a1078b Some little adjustments to ID_TEETH_SPIKES 2021-06-05 06:26:15 +02:00
MontyTRC89
95b4ee4ca0 Fixed ID_ROLLINGBALL 2021-06-05 06:03:12 +02:00
MontyTRC89
9d0f90df97 Merge remote-tracking branch 'origin/TwoBlockPlatformsBroken' 2021-06-05 05:35:46 +02:00
MontyTRC89
abb7b0c862 Added some constants to TestTrigger(); Fixed ID_SETH_BLADE; Fixed many collision bugs with Lara; 2021-06-04 06:02:19 +02:00
asasas9500
5541f21bd0 Fix two blocks platform 2021-06-02 16:59:30 -03:00
MontyTRC89
b2f146922d Fixed ID_MUMMY init; Bugged 2 blocks platform; 2021-06-01 13:02:05 +02:00
MontyTRC89
f08943bb27 Fixed ID_MUMMY being damaged even if immortal 2021-05-31 14:56:04 +02:00
MontyTRC89
c26ed68231 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-31 07:18:09 +02:00
MontyTRC89
c6fb38d67f Fixed statics not disappearing after shatter; Some refactoring for ID_MUMMY and ID_SKELETON; Fixed plinth pickup; 2021-05-31 07:18:02 +02:00
Trxye
f0a3f4d801 fix pickups 2021-05-30 13:18:39 -05:00
Trxye
8a414c2c84 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-28 21:45:09 -05:00
Trxye
8e40531a49 fix clockwork beetle going only north; 2021-05-28 21:44:43 -05:00
asasas9500
6be29e6c9c Fix extra move in Senet 2021-05-28 23:25:07 -03:00
asasas9500
7ef797ed87 Fix beetle 2021-05-28 17:48:21 -03:00
asasas9500
3247694c07 Fix beetle rotation 2021-05-28 17:17:00 -03:00
MontyTRC89
984e2856a0 Fix merge conflicts 2021-05-28 12:41:38 +02:00
MontyTRC89
cd2a9a6216 Fixed bug in level loading; Fixed ID_DOG from TR4; 2021-05-28 12:36:40 +02:00
Trxye
e41623d3be fix level select; fix pause menu audio bug; fix clockwork beetle hand pos; 2021-05-28 00:57:53 -05:00
Trxye
e3ba7234e7 fix ClockworkBeetleControl(); 2021-05-27 18:35:31 -05:00
Trxye
d4474a1888 fix clockwork control; fix infinite pickup display; 2021-05-27 17:06:38 -05:00
Trxye
d6bf00d110 correct UseClockworkBeetle(); 2021-05-27 16:15:16 -05:00
Trxye
a6de3f6141 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 16:08:09 -05:00
Trxye
3edfe48af6 decompile clockwork beetle; 2021-05-27 16:07:57 -05:00
MontyTRC89
6ed2dfd28d Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 05:33:17 +02:00
Trxye
c0ca04a806 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00