Lwmte
407373d193
Remove poisoning by medkits
2021-08-02 14:44:28 +03:00
Lwmte
e013ed4e24
Fix binoculars mode engaging other states
2021-08-02 12:35:17 +03:00
MontyTRC89
916d22759b
Merge remote-tracking branch 'origin/lara_info'
...
# Conflicts:
# TR5Main/Game/Lara/lara_flare.h
# TR5Main/Scripting/GameLogicScript.cpp
2021-07-14 05:48:42 +02:00
hispidence
b93b6aca71
Use GetInventoryCount in have_i_got_object as it works the same way.
2021-07-11 17:10:35 +01:00
Troye
8dc41f1f0f
fix control selection screens
2021-07-08 17:57:08 -05:00
MontyTRC89
a455a091c0
Removed test code; Removed scripts from project (they will be created by LD); Added some missing strings for inventory; Added scripting for puzzles; Removed some old code for scripting;
2021-06-23 05:58:24 +02:00
MontyTRC89
dc5db910f2
Added translations support and fixed some bugs with strings
2021-06-20 06:33:44 +02:00
MontyTRC89
a6b3916d72
Merge conflicts
2021-06-19 07:14:38 +02:00
MontyTRC89
a4467c2a4b
Moving to stringed keys for game strings
2021-06-19 07:11:22 +02:00
Trxye
55b517010d
diary bs
2021-06-15 14:09:49 -05:00
Trxye
a1b49f75bf
move options_table to the inventory list; implement rotation flags
2021-06-11 02:47:23 -05:00
Trxye
9a54e9a124
implement extra pickup items & examines
2021-06-11 01:06:43 -05:00
Trxye
0c6f3de5b7
fix pickup display; fix ring inv compile; implement extra puzzle/key items in inventory;
2021-06-10 14:40:28 -05:00
Trxye
846308a641
implement inv obj rotations
2021-06-07 04:23:30 -05:00
Trxye
ef5041c5e0
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
2021-06-06 15:01:52 -05:00
Trxye
53647806e4
implement examines; add inventory scale support; fix rocket and harpoon ammo not showing;
2021-06-06 15:01:46 -05:00
wolfcheese
1bafd67f1c
Same apply/cancel return key fix applied to pause menu
2021-06-06 14:01:20 -04:00
Trxye
6290bd29c9
improve waterskin combination
2021-06-06 11:38:39 -05:00
Trxye
13cd409830
add apply and cancel to the pause menu
2021-06-06 10:51:20 -05: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
wolfcheese
1fa0a8a1c9
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
Trxye
44a1f18bee
clean up some inv code; add clockwork beetle to items cheat;
2021-05-29 11:54:01 -05: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
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
b2f102ae63
Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall;
2021-05-26 06:04:32 +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
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
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
asasas9500
5682a3b6cd
Delete empty files
2021-02-07 18:15:20 -03:00
TokyoSU
29f0724693
New project format ( #206 )
...
* Starting Reformat the project
- New Import Method, no more "../../" in import,
- New Entity Folder Structure, less compile time
* Refactoring the Project
- added precompiled header with default import like microsoft or directx.
- fix many double import.
- fix math.h confliting math.h from
microsoft.
- fix effects.h confliting Effects.h from DirectX.
- refactored TR4 entity folder and how it's loaded.
* Update Some Code Before Switching to Master
* Finished the NewProjectFormat Template
- need to finish entity in the master later.
* Added Monty NewFileFormat
* Fixed Monty NewFileFormat Include
* Revert "Fixed Monty NewFileFormat Include"
This reverts commit ebf0afca10
2020-05-27 09:21:20 +02:00
TokyoSU
aafb5d91ab
misc fix & adding boat/kayak/snowmobile file
2019-11-20 11:24:36 +01:00
MontyTRC89
e6114af969
First commit
2018-08-19 09:46:58 +02:00
