Lwmte
|
48a9a1d52a
|
Merge branch 'master' into item_data
|
2021-09-09 11:10:25 +03:00 |
|
Lwmte
|
ba6c260b92
|
Further code organizing
|
2021-09-08 18:19:06 +03:00 |
|
Raildex
|
2ee57e5891
|
Renamed "generalPtr" of LaraInfo to "interactedItem"
All code that cast it to ITEM_INFO* was converted to a separate access into g_Level.Items
|
2021-09-05 11:20:51 +02:00 |
|
Raildex
|
b422cafc79
|
Merge branch 'master' into item_data
# Conflicts:
# TR5Main/Game/Lara/lara.cpp
# TR5Main/Game/Lara/lara_collide.cpp
# TR5Main/Game/Lara/lara_monkey.cpp
# TR5Main/Game/Lara/lara_struct.h
# TR5Main/Game/Lara/lara_tests.cpp
# TR5Main/Game/collide.h
# TR5Main/Game/control.h
# TR5Main/Game/effect.h
# TR5Main/Game/effect2.cpp
# TR5Main/Game/flipeffect.cpp
# TR5Main/Game/floordata.h
# TR5Main/Game/hair.cpp
# TR5Main/Game/health.cpp
# TR5Main/Game/items.cpp
# TR5Main/Game/newinv2.cpp
# TR5Main/Game/spotcam.cpp
# TR5Main/Objects/Effects/tr4_bubbles.cpp
# TR5Main/Objects/TR1/Entity/tr1_ape.cpp
# TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp
# TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp
# TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp
# TR5Main/Objects/TR2/Entity/tr2_shark.cpp
# TR5Main/Objects/TR2/Entity/tr2_spider.cpp
# TR5Main/Objects/TR2/Entity/tr2_yeti.cpp
# TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
# TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp
# TR5Main/Objects/TR3/Entity/tr3_monkey.cpp
# TR5Main/Objects/TR3/Entity/tr3_raptor.cpp
# TR5Main/Objects/TR3/Entity/tr3_scuba.cpp
# TR5Main/Objects/TR3/Entity/tr3_trex.cpp
# TR5Main/Objects/TR3/Vehicles/kayak.cpp
# TR5Main/Objects/TR3/Vehicles/minecart.cpp
# TR5Main/Objects/TR4/Entity/tr4_bat.cpp
# TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
# TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp
# TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
# TR5Main/Objects/TR4/Entity/tr4_dog.cpp
# TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp
# TR5Main/Objects/TR4/Entity/tr4_harpy.cpp
# TR5Main/Objects/TR4/Entity/tr4_mutant.cpp
# TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp
# TR5Main/Objects/TR4/Entity/tr4_troops.cpp
# TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp
# TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
# TR5Main/Objects/TR4/Vehicles/motorbike.cpp
# TR5Main/Objects/TR5/Entity/tr5_doberman.cpp
# TR5Main/Objects/TR5/Entity/tr5_imp.cpp
# TR5Main/Objects/TR5/Entity/tr5_larson.cpp
# TR5Main/Objects/TR5/Entity/tr5_lion.cpp
# TR5Main/Objects/TR5/Entity/tr5_reaper.cpp
# TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
# TR5Main/Objects/TR5/Object/tr5_rollingball.cpp
# TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp
# TR5Main/Renderer/Renderer11Draw2D.cpp
# TR5Main/Specific/input.cpp
# TR5Main/Specific/level.cpp
# TR5Main/TombEngine.vcxproj.filters
|
2021-08-31 18:20:23 +02:00 |
|
Raildex
|
be16255efc
|
Merge branch 'master' into item_data
# Conflicts:
# TR5Main/Objects/TR4/Entity/tr4_sas.cpp
# TR5Main/Objects/TR4/tr4_objects.cpp
|
2021-08-29 13:29:55 +02:00 |
|
Lwmte
|
4c8a2053ea
|
Merge branch 'master' into legacy_trigger_refactor
|
2021-08-29 09:16:39 +03:00 |
|
MontyTRC89
|
3ec19f557d
|
Fixed puzzles holes
|
2021-08-29 05:53:07 +02:00 |
|
Lwmte
|
0b7c3d4a20
|
Merge branch 'master' into legacy_trigger_refactor
|
2021-08-28 21:38:58 +03:00 |
|
Raildex
|
2621fa8f0d
|
Fixed More Include Hell
|
2021-08-28 13:27:58 +02:00 |
|
MontyTRC89
|
d0da243f73
|
Refactored switches
|
2021-08-28 06:37:22 +02:00 |
|
Lwmte
|
b8c3b67f10
|
Move collision and FX functions from effect.cpp
|
2021-08-26 15:54:52 +03:00 |
|
MontyTRC89
|
da2043b883
|
Fixed bug on align Lara position; Cleaning puzzle holes code;
|
2021-08-24 18:19:15 +02:00 |
|
hispidence
|
f6d1ae0bda
|
Restore original line now that the stack overflow is fixed.
|
2021-08-01 20:50:41 +01:00 |
|
Lwmte
|
48b020f5fb
|
Fix keyhole deadlock
|
2021-08-01 22:24:09 +03:00 |
|
Lwmte
|
66cac71f33
|
Fix puzzle holes. NOTE: Commented a line which caused stack overflow, needs fixing
|
2021-07-31 04:40:28 +03:00 |
|
hispidence
|
54e14ccb3f
|
Make some functions take a GAME_OBJECT_ID instead of a short. Make AIOBJECT use a GAME_OBJECT_ID instead of a short.
|
2021-07-11 16:55:20 +01:00 |
|
hispidence
|
10fe19f559
|
Cast to GAME_OBJECT_ID.
|
2021-07-10 17:46:45 +01:00 |
|
Trxye
|
c0ca04a806
|
clean up ring inventory code; fix KillItem();
|
2021-05-26 01:58:30 -05:00 |
|
Trxye
|
d7fa758df7
|
fix inventory drawing; implement inventory in game code;
|
2021-05-20 14:19:11 -05:00 |
|
Woops
|
59eec6ddc2
|
Refactor: move puzzle and keys out of pickup.cpp into their own file
|
2020-08-09 01:24:06 -05:00 |
|