Commit graph

8102 commits

Author SHA1 Message Date
Trxye
e3ba7234e7 fix ClockworkBeetleControl(); 2021-05-27 18:35:31 -05:00
Trxye
41508e1b92 fix setting ClockworkBeetleFlag; 2021-05-27 18:02:25 -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
MontyTRC89
b2f102ae63 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
asasas9500
e0d5cd4c09 Improve Semerkhet strategy 2021-05-25 20:10:59 -03:00
Trxye
a999bcd3a8 fix _0x0040FAE0(); 2021-05-25 12:56:35 -05:00
MontyTRC89
361e543a61 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-25 06:01:25 +02:00
MontyTRC89
9c957fb708 Merge pull request #256 from MontyTRC89/inventory
correct ammo counts, correct combine list positions;
2021-05-25 06:01:08 +02:00
MontyTRC89
00436a16ab Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-25 06:00:11 +02:00
MontyTRC89
906703b1ab Merge branch 'AnimTextures'; Fixed doors init;
# Conflicts:
#	TR5Main/Renderer/Renderer11.h
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/TR5Main.vcxproj.filters
2021-05-25 05:58:44 +02:00
asasas9500
c1fb3b0422 Fix Senet 2021-05-24 23:57:09 -03:00
asasas9500
784745f945 Fix MakeMove() 2021-05-24 23:02:08 -03:00
asasas9500
858d9a3512 Fix line endings 2021-05-24 18:56:23 -03:00
Trxye
848a3ef5b5 SenetControl(); add senet things to tr4_objects.cpp 2021-05-24 16:04:13 -05:00
asasas9500
686ec4a1ec Add InitialiseGamePiece() 2021-05-24 17:22:42 -03:00
Trxye
abd2c2c8a6 ControlGodHead(); 2021-05-24 14:14:04 -05:00
Trxye
33f82e4548 GameStixCollision(); 2021-05-24 13:48:29 -05:00
asasas9500
5f906a9325 Add MakeMove() 2021-05-24 15:35:22 -03:00
MontyTRC89
97cc77446a Fixed bug in ItemNewRoom 2021-05-24 09:27:52 +02:00
Trxye
c7a96a4ad0 trigger_item_in_room(); CheckSenetWinner(); 2021-05-23 23:02:35 -05:00
Trxye
03dc550c59 _0x0040FAE0(); SenetPieceExplosionEffect(); 2021-05-23 22:23:10 -05:00
Trxye
a31b019d24 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-23 21:49:34 -05:00
Trxye
d715b3cd19 remove monkeyswing jump with action 2021-05-23 21:49:24 -05:00
asasas9500
dea8d8ed22 Add InitialiseGameStix() and GameStixControl() 2021-05-23 23:47:37 -03:00
Trxye
c59260ef89 show level name in the statistics 2021-05-23 00:47:06 -05:00
Trxye
350c5b4b96 correct ammo counts, correct combine list positions; 2021-05-21 11:33:05 -05:00
MontyTRC89
42ce51dd9e Fix merge conflicts 2021-05-21 05:38:20 +02:00
MontyTRC89
27776a9c12 Fixed baddy slot code; Added missing slots for inventory; 2021-05-21 05:32:34 +02:00
MontyTRC89
b805817ab1 Merge pull request #255 from MontyTRC89/inventory
Implement new Inventory
2021-05-21 05:31:08 +02:00
Trxye
d7fa758df7 fix inventory drawing; implement inventory in game code; 2021-05-20 14:19:11 -05:00
Trxye
6074ab93a2 implement new inventory 2021-05-18 19:16:58 -05:00
Trxye
c85ccb166f rewrite (hack) title 2021-05-14 18:01:56 -05:00
MontyTRC89
8d2194517f Fixed ID_BIG_SCORPION and ID_TROOPS 2021-05-13 10:11:22 +02:00
MontyTRC89
c707f533c8 Possibly fixed DoRayBox and GetTargetOnLOS for working like in original game; Fixed ID_TROOPS; 2021-05-07 06:06:30 +02:00
MontyTRC89
bbe66ee104 Fixed ID_TROOPS 2021-05-01 16:16:05 +02:00
MontyTRC89
107a677afa Decompiled ID_HAMMERHEAD 2021-04-29 15:19:28 +02:00
MontyTRC89
5c39ead909 Fixed ID_SAS; Fixed serious bugs with CreatureActive(); Fixed grenades;' 2021-04-29 06:26:30 +02:00
MontyTRC89
7d9c21f18b Fixed SAS flashing himself 2021-04-22 08:13:54 +02:00
MontyTRC89
06ca306645 More fixes to SAS 2021-04-22 05:58:40 +02:00
MontyTRC89
9cfb3bf166 Fixing SAS 2021-04-21 13:54:12 +02:00
MontyTRC89
2fb28b84a3 Baddy 1 & 2 tested and fixed 2021-04-21 13:37:42 +02:00
MontyTRC89
adf51a567c Fixed baddy state 0 2021-04-21 06:45:08 +02:00
MontyTRC89
3da38df713 Added big medipack picking to baddy 2021-04-19 07:41:37 +02:00
MontyTRC89
ec8fedf2ee Fixed some BADDY ocbs; Added picking for baddies like in TR4; 2021-04-18 07:20:27 +02:00
MontyTRC89
e748a0c947 Fixed cylindrical billboards 2021-04-16 14:34:40 +02:00