hispidence
cf0a415527
Remove ID_GOLDROSE_ITEM; the current plan is for secrets to be done via triggers instead of the pickup itself.
2021-07-12 16:13:52 +01:00
hispidence
9823087e32
Separate the logic for giving/taking inventory items from pickup.cpp and into its own set of files. It's not a perfect solution but it makes it somewhat cleaner and reduces the places where we have to make sure we're writing the correct enums/magic numbers.
...
Implement inventory item removal and GetInventoryCount for all items listed in PickedUpObject (except for ID_GOLDROSE_ITEM).
Make RemoveObjectFromInventory and GetInventoryCount take GAME_OBJECT_ID instead of short.
2021-07-10 13:54:15 +01:00
MontyTRC89
f81d8e439f
Added FROM_DEGREES function; Added quantity param to PickedUpObject(); LUA scripting refactoring WIP;
2021-06-29 05:00:15 +02:00
MontyTRC89
4c7110558f
Switched audio tracks from int index to string; Added Tracks.lua loading support;
2021-06-26 07:36:54 +02:00
Trxye
8813790f9a
fix pickup display; fix ring inv compile; implement extra puzzle/key items in inventory;
2021-06-10 14:40:28 -05:00
Trxye
92186db88e
fix waterskin meshswaps
2021-06-05 22:15:25 -05:00
Trxye
a6091bdc70
implement waterskins
2021-06-05 15:27:19 -05: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
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
Trxye
6be9afd436
fix pickups
2021-05-30 13:18:39 -05:00
Trxye
e5ffb1f70e
decompile clockwork beetle;
2021-05-27 16:07:57 -05:00
Trxye
35af9b2c92
clean up ring inventory code; fix KillItem();
2021-05-26 01:58:30 -05:00
Trxye
622cc4210a
fix inventory drawing; implement inventory in game code;
2021-05-20 14:19:11 -05:00
asasas9500
6444365346
Fix bomb
2020-12-23 11:04:21 -03:00
asasas9500
d4c6cc4a97
Fix line endings
2020-12-21 13:16:29 -03:00
Woops
c812665152
remove bitshifts from the "Game" folder
2020-10-06 12:44:14 -05:00
Nils
ea9afa7413
Refactored framework.h
...
Removed Renderer headers from framework.h
Removed bass headers from framework.h
Removed windows-related headers to avoid nameclashes with std::min and std::max
added <algorithm> for general-purpose functions (like std::min/max)
Added NOMINMAX define to project
Minor Refactorings
2020-09-29 21:43:56 +02:00
Sezz
92bc8b662d
Revert "Cleanup, control code standardisation, some command-query separation, un-hardcoding of animation state dispatches, QOL improvements to Lara's basic moveset."
...
This reverts commit 2ee7059470
2020-09-26 05:06:08 +10:00
Sezz
2ee7059470
Cleanup, control code standardisation, some command-query separation, un-hardcoding of animation state dispatches, QOL improvements to Lara's basic moveset.
2020-09-26 03:28:30 +10:00
Woops
6248fcb0ed
Lara refactor: move basic movements to lara_basic, take care of the other functions.
2020-08-14 17:54:25 -05:00
Woops
567af76366
Lara refactor: move pickup functions from pickup.cpp to lara_pickup.cpp
2020-08-10 22:07:00 -05:00
Woops
8473a38964
Lara refactor: move pickup states to pickup.cpp
2020-08-10 00:34:19 -05:00
asasas9500
b9bc1cf54e
Rename Lara files
2020-08-09 22:09:14 -03:00
Woops
acc17d9897
Refactor: move puzzle and keys out of pickup.cpp into their own file
2020-08-09 01:24:06 -05:00
Woops
622d86c6a2
clean up remove comments
2020-08-06 03:34:49 -05:00
Woops
047bb9507b
small fix
2020-08-05 15:52:07 -05:00
Sebastian Zych
6a3700345e
Updated animation and state names to follow a consistent system.
2020-08-04 20:32:07 +10:00
Woops
643ae060a7
super ugly check for joby-like crowbar pickups
2020-07-31 16:36:58 -05:00
Montagna Marco
de90a64b34
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
2020-07-26 07:22:43 +02:00
Montagna Marco
014aa1baa7
Frames refactoring
2020-07-25 18:02:35 +02:00
Woops
f96d7a584e
oops, add missing state check, fixes "hole" pickups
2020-07-25 00:56:37 -05:00
Woops
9d91f7c4a3
puzzle, do_puzzle
2020-07-23 15:29:02 -05:00
Woops
3491173b02
torch pickup stuff
2020-07-23 14:55:27 -05:00
Montagna Marco
bba838cfd3
Fixed pickups; Fixed no statics bug;
2020-07-23 21:38:12 +02:00
Montagna Marco
18994dd59e
Moving all globals of level under LEVEL struct; Fixed severe performance issue;
2020-07-21 09:56:47 +02:00
Montagna Marco
9f373c691a
Pathfinding refactoring
2020-07-11 21:16:04 +02:00
Montagna Marco
2a1c491c7e
Hairs done on GPU now
2020-07-07 07:32:33 +02:00
Montagna Marco
d6f45db5ec
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
2020-06-26 07:06:51 +02:00
Montagna Marco
235dab2f13
New FLOOR_INFO struct; Refactoring rooms part I
2020-06-26 07:06:18 +02:00
Woops
668fcaa71a
oops, uncommenting, commenting caused items underwater to spin
2020-06-21 22:02:23 -05:00
Nils Gaitzsch
c591a12fa1
Merge branch 'master' into flipeffect-pickups
...
# Conflicts:
# TR5Main/Game/effect.cpp
2020-06-20 13:48:55 +02:00
Woops
52b5cc7472
fixing
2020-06-20 06:35:13 -05:00
Nils Gaitzsch
d5dc365c06
Made g_Inventory a constant object.
...
Fixed shadow intensity
Fixed CameraViewConstantBuffer
2020-06-16 19:45:06 +02:00
Woops
040df20441
replace empty flipeffect 9, do_pickup
2020-06-15 00:32:58 -05:00
TokyoSU
9d6a3b20d1
Fix weapon not being updated when crouching
...
- caused by me in the first place, but i forgot this small detail :x
- Updated lara structure a bit for enum variables.
- Fixed some variable not using these enum (or using the wrong one !)
2020-06-05 14:01:22 +02:00
TokyoSU
8f11417654
Implemented Baboon
...
- Fixed AIObject not being initialized !
- Fixed ITEM_DEACTIVATED (cause im french and ITEM_DESACTIVATED is more appropriate)
2020-06-04 12:49:08 +02:00
TokyoSU
cbef59ab82
Fixed missing lasersight change :'(
2020-06-04 11:44:22 +02:00
TokyoSU
f061d1a76c
Fixed Tab, now using space
2020-06-04 11:33:49 +02:00
