Commit graph

1650 commits

Author SHA1 Message Date
Trxye
12ae345437 fix multiple pickups display 2021-06-07 01:24:15 -05:00
MontyTRC89
f6e5ab5af4 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-06-07 06:05:44 +02:00
MontyTRC89
59f24e1cc5 Remove GET_REACHED_GOAL macro in GetAITarget(); Fixed GetFindAITargetObject(); Fixed ID_GUIDE; 2021-06-07 06:05:29 +02:00
wolfcheese
378d725077 Merge branch 'master' of https://github.com/montytrc89/tombengine 2021-06-06 18:14:20 -04:00
wolfcheese
ad231589bb Disable all bubbles when the game unloads to avoid crashing 2021-06-06 18:14:13 -04:00
Trxye
3757f236bf Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-06-06 15:01:52 -05:00
Trxye
87b6f25678 implement examines; add inventory scale support; fix rocket and harpoon ammo not showing; 2021-06-06 15:01:46 -05:00
wolfcheese
18cb0b05f7 Same apply/cancel return key fix applied to pause menu 2021-06-06 14:01:20 -04:00
Trxye
770ec1f45f improve waterskin combination 2021-06-06 11:38:39 -05:00
Trxye
245d82566a add apply and cancel to the pause menu 2021-06-06 10:51:20 -05:00
MontyTRC89
20aa5e3fe8 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-06-06 06:49:58 +02:00
MontyTRC89
7406577e29 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
92186db88e fix waterskin meshswaps 2021-06-05 22:15:25 -05:00
Trxye
2fb00cde8a Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-06-05 15:27:26 -05:00
Trxye
a6091bdc70 implement waterskins 2021-06-05 15:27:19 -05:00
MontyTRC89
4e373fe251 Fixed ID_SLICER_DICER 2021-06-05 11:14:06 +02:00
MontyTRC89
43064b99ae Some little adjustments to ID_TEETH_SPIKES 2021-06-05 06:26:15 +02:00
MontyTRC89
5e61cb477e Fixed ID_ROLLINGBALL 2021-06-05 06:03:12 +02:00
MontyTRC89
9cb078bf08 Merge remote-tracking branch 'origin/TwoBlockPlatformsBroken' 2021-06-05 05:35:46 +02:00
MontyTRC89
3d39166d63 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-06-05 05:27:34 +02:00
wolfcheese
ee9d704b6e ceiling sector plane fixes 2021-06-04 10:13:59 -04:00
MontyTRC89
6235959889 Added some constants to TestTrigger(); Fixed ID_SETH_BLADE; Fixed many collision bugs with Lara; 2021-06-04 06:02:19 +02:00
wolfcheese
365dd16e5a Fixed plane selection for split ceilings 2021-06-03 23:19:38 -04:00
wolfcheese
fa9e301a9d Fixed bug preventing user from using Return key on Apply and Cancel in title's control settings 2021-06-02 23:03:04 -04:00
wolfcheese
ae467d4d73 Fixed collision for crouch roll 2021-06-02 20:44:39 -04:00
asasas9500
ab1bfd71b2 Fix two blocks platform 2021-06-02 16:59:30 -03:00
Trxye
9728282c14 comment feet hanging 2021-06-02 13:24:17 -05:00
MontyTRC89
70b3635dae Fixed ID_MUMMY init; Bugged 2 blocks platform; 2021-06-01 13:02:05 +02:00
Trxye
bee5ba5cc8 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-31 11:57:49 -05:00
Trxye
fbb50b4609 fix crowbar inv bug 2021-05-31 11:57:42 -05:00
MontyTRC89
92069c701d Fixed ID_MUMMY being damaged even if immortal 2021-05-31 14:56:04 +02:00
MontyTRC89
6e3a71c056 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-31 07:18:09 +02:00
MontyTRC89
0a83e02568 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
wolfcheese
f81a54edae Commenting out more diagonal floor checks, this time for jumping upward or forward to grab ledges 2021-05-30 23:50:32 -04:00
wolfcheese
e58250eaca Removed diagonal floor check interfering with Lara climbing out of water 2021-05-30 19:16:25 -04:00
Trxye
6be9afd436 fix pickups 2021-05-30 13:18:39 -05:00
wolfcheese
f3613375f8 Removed diagonal checks, which prevented Lara from vaulting when standing on a split floor 2021-05-30 12:25:48 -04:00
Trxye
91ed7b0cf7 clean up some inv code; add clockwork beetle to items cheat; 2021-05-29 11:54:01 -05:00
Trxye
9000585d89 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-28 21:45:09 -05:00
Trxye
71b97945d6 fix clockwork beetle going only north; 2021-05-28 21:44:43 -05:00
asasas9500
b8166324ec Fix extra move in Senet 2021-05-28 23:25:07 -03:00
asasas9500
4485415c67 Fix beetle 2021-05-28 17:48:21 -03:00
asasas9500
dc7f621bbb Fix beetle rotation 2021-05-28 17:17:00 -03:00
asasas9500
8f69449965 Fix project 2021-05-28 16:58:07 -03:00
MontyTRC89
0490455c0e Fix merge conflicts 2021-05-28 12:41:38 +02:00
MontyTRC89
fdea84fb43 Fixed bug in level loading; Fixed ID_DOG from TR4; 2021-05-28 12:36:40 +02:00
Nils
0750bee65b Setting correct blend state after horizon and sky 2021-05-28 09:22:17 +02:00
Trxye
5973a049b7 fix level select; fix pause menu audio bug; fix clockwork beetle hand pos; 2021-05-28 00:57:53 -05:00
Trxye
3952e8bdca fix ClockworkBeetleControl(); 2021-05-27 18:35:31 -05:00
Trxye
8b31698cd2 fix setting ClockworkBeetleFlag; 2021-05-27 18:02:25 -05:00