Commit graph

1650 commits

Author SHA1 Message Date
Trxye
5a2fd5611c fix clockwork control; fix infinite pickup display; 2021-05-27 17:06:38 -05:00
Trxye
185756d549 correct UseClockworkBeetle(); 2021-05-27 16:15:16 -05:00
Trxye
8f74bad385 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 16:08:09 -05:00
Trxye
e5ffb1f70e decompile clockwork beetle; 2021-05-27 16:07:57 -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
asasas9500
f015feb0ae Improve Semerkhet strategy 2021-05-25 20:10:59 -03:00
Trxye
388227bf63 fix _0x0040FAE0(); 2021-05-25 12:56:35 -05:00
MontyTRC89
ad9a6eaba2 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-25 06:01:25 +02:00
MontyTRC
64d090277f
Merge pull request #256 from MontyTRC89/inventory
correct ammo counts, correct combine list positions;
2021-05-25 06:01:08 +02:00
MontyTRC89
bde1dd3901 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-25 06:00:11 +02:00
MontyTRC89
1ccd6eb160 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
6392aa001b Fix Senet 2021-05-24 23:57:09 -03:00
asasas9500
40d7daaff6 Fix MakeMove() 2021-05-24 23:02:08 -03:00
asasas9500
b2cea0aa9d Fix line endings 2021-05-24 18:56:23 -03:00
Trxye
f94b778f00 SenetControl(); add senet things to tr4_objects.cpp 2021-05-24 16:04:13 -05:00
asasas9500
de9a749b3f Add InitialiseGamePiece() 2021-05-24 17:22:42 -03:00
Trxye
786f6d90d5 ControlGodHead(); 2021-05-24 14:14:04 -05:00
Trxye
59a17c9381 GameStixCollision(); 2021-05-24 13:48:29 -05:00
asasas9500
699fbe40b4 Add MakeMove() 2021-05-24 15:35:22 -03:00
MontyTRC89
429c989f22 Fixed bug in ItemNewRoom 2021-05-24 09:27:52 +02:00
Trxye
6cb1b21dfd trigger_item_in_room(); CheckSenetWinner(); 2021-05-23 23:02:35 -05:00
Trxye
27bd701963 _0x0040FAE0(); SenetPieceExplosionEffect(); 2021-05-23 22:23:10 -05:00
Trxye
0bb6e6e507 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-23 21:49:34 -05:00
Trxye
0b53c552de remove monkeyswing jump with action 2021-05-23 21:49:24 -05:00
asasas9500
67a97ace45 Add InitialiseGameStix() and GameStixControl() 2021-05-23 23:47:37 -03:00
Trxye
d8166daae0 show level name in the statistics 2021-05-23 00:47:06 -05:00
Trxye
997b515a93 correct ammo counts, correct combine list positions; 2021-05-21 11:33:05 -05:00
MontyTRC89
8d88fcce5b Fix merge conflicts 2021-05-21 05:38:20 +02:00
MontyTRC89
7b7756204b Fixed baddy slot code; Added missing slots for inventory; 2021-05-21 05:32:34 +02:00
MontyTRC
f090071835
Merge pull request #255 from MontyTRC89/inventory
Implement new Inventory
2021-05-21 05:31:08 +02:00
Trxye
622cc4210a fix inventory drawing; implement inventory in game code; 2021-05-20 14:19:11 -05:00
Trxye
4cc7cee4c9 implement new inventory 2021-05-18 19:16:58 -05:00
Trxye
c7fc2f89e7 rewrite (hack) title 2021-05-14 18:01:56 -05:00
MontyTRC89
481d355a7e Fixed ID_BIG_SCORPION and ID_TROOPS 2021-05-13 10:11:22 +02:00
MontyTRC89
93a2693abb Possibly fixed DoRayBox and GetTargetOnLOS for working like in original game; Fixed ID_TROOPS; 2021-05-07 06:06:30 +02:00
MontyTRC89
94e627cb13 Fixed ID_TROOPS 2021-05-01 16:16:05 +02:00
MontyTRC89
2eaba7e55b Decompiled ID_HAMMERHEAD 2021-04-29 15:19:28 +02:00
MontyTRC89
e798d50d32 Fixed ID_SAS; Fixed serious bugs with CreatureActive(); Fixed grenades;' 2021-04-29 06:26:30 +02:00
MontyTRC89
13b9a964d6 Fixed SAS flashing himself 2021-04-22 08:13:54 +02:00
MontyTRC89
48b9b1bfca More fixes to SAS 2021-04-22 05:58:40 +02:00
MontyTRC89
f7a1dd9e64 Fixing SAS 2021-04-21 13:54:12 +02:00
MontyTRC89
7c9fcbb18f Baddy 1 & 2 tested and fixed 2021-04-21 13:37:42 +02:00
MontyTRC89
5a481ccb0b Fixed baddy state 0 2021-04-21 06:45:08 +02:00
MontyTRC89
8938043686 Added big medipack picking to baddy 2021-04-19 07:41:37 +02:00
MontyTRC89
b3418f3e02 Fixed some BADDY ocbs; Added picking for baddies like in TR4; 2021-04-18 07:20:27 +02:00
MontyTRC89
bf053b6049 Fixed cylindrical billboards 2021-04-16 14:34:40 +02:00
MontyTRC89
976ce7a316 Fixed SameZone(); Adding picking to Baddy 1-2; 2021-04-16 10:13:59 +02:00
MontyTRC89
8c07826651 Fixed energy arcs 2021-04-16 06:46:54 +02:00