Commit graph

8102 commits

Author SHA1 Message Date
Lwmte
fcdda87297 Fix enum 2021-09-08 14:05:09 +03:00
Lwmte
24ad8bffef Generalize solid collision function, enum static flags 2021-09-08 14:02:32 +03:00
Lwmte
b1829d5ef9 Finalize 2021-09-08 13:39:29 +03:00
MontyTRC89
3f28ca6be0 Added turn switch setup code 2021-09-08 10:03:43 +02:00
Troye
f5c03cf1e2 use SECTOR instead of WALL_SHIFT 2021-09-08 03:01:32 -05:00
MontyTRC89
f43e7b863b Fixed crowbar switch 2021-09-08 06:10:38 +02:00
Lwmte
6b0d063dda Add comments 2021-09-07 21:36:13 +03:00
Lwmte
e38b59c175 Convert some functions 2021-09-07 20:37:31 +03:00
Lwmte
d30f6351c6 Finally made it work 2021-09-07 19:54:35 +03:00
MontyTRC89
887d509233 Fixed pushpull and kick doors 2021-09-07 06:04:09 +02:00
MontyTRC89
bba8de53e4 Fixed cog switch and raisable door 2021-09-06 05:41:03 +02:00
MontyTRC89
139d777cb2 Removed TR5 doors code; Added OCB for underwater switches; Small fixes to doors; 2021-09-06 05:27:27 +02:00
Raildex
f62f900fb0 Added new Tightrope behaviour
You can use Left and Right to control lara's balance
Lara will gradually lose balance
When lara stops, her balance regenerates
2021-09-05 14:49:00 +02: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
eb5c23bd89 Merge branch 'master' into item_data 2021-09-05 10:08:23 +02:00
MontyTRC89
d5ea0becf1 Refactored doors in multiple files 2021-09-05 06:05:00 +02:00
Lwmte
72e423cc67 Update collide.cpp 2021-09-05 00:49:49 +03:00
Lwmte
12fbb28e9b Update collide.cpp 2021-09-04 16:05:49 +03:00
Lwmte
6329e110c1 Update collide.cpp 2021-09-04 15:48:21 +03:00
Lwmte
986ee1d510 Fix climbing 2021-09-04 15:43:37 +03:00
Lwmte
afc7a6a2b2 Work 2021-09-04 15:43:25 +03:00
Raildex
31ec83f9cc Merge branch 'master' into item_data
# Conflicts:
#	TR5Main/Game/items.cpp
2021-09-04 11:52:34 +02:00
Lwmte
b7cb2f4937 Work 2021-09-04 12:40:14 +03:00
MontyTRC89
c4e7dc811c First commit 2021-09-04 07:59:00 +02:00
MontyTRC89
cea3608a25 Cleaned collision code; Cleaning AI code; Usin visibility for for statics culling; Fixed Lara crawling; 2021-09-04 07:53:21 +02:00
Raildex
85790c9ae0 Fixed EnemyJeep TestTriggers call
Renamed constants for priority system
2021-09-03 13:02:35 +02:00
Raildex
a9ec28d9e1 Fixed EnemyJeep by using a dummy item info 2021-09-03 12:42:06 +02:00
Raildex
21bc5a04ba Added provisional LOT priority 2021-09-03 11:36:38 +02:00
Raildex
dce3f72d99 Removed BaddieSlots
ActiveCreatures now contains pointers to CREATURE_INFOs of items instead
Every Item with Creature Info now contains their own path finding data.
Fixed OoB issues with XZ_GET_SECTOR
2021-09-03 09:37:42 +02:00
Lwmte
efb7b71d3a Add comments with previous function names 2021-09-02 22:40:33 +03:00
Lwmte
71ff4588b9 Fix two collision bugs 2021-09-02 22:28:55 +03:00
Lwmte
445e062c03 Remove broken CollideStaticObjects function
# Conflicts:
#	TR5Main/Game/collide.cpp
2021-09-02 19:50:10 +02:00
Lwmte
522b41d1d6 Clarify function names
# Conflicts:
#	TR5Main/Game/collide.cpp
2021-09-02 19:49:07 +02:00
Raildex
0c5b92adf8 Fixed Door Crash 2021-09-02 17:20:19 +02:00
MontyTRC89
0d7a04c861 Merge branch 'master' into item_data 2021-09-02 07:08:58 +02:00
MontyTRC89
5f7eee613f Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-09-02 05:51:17 +02:00
MontyTRC89
7521a8a0c7 Decompiled ID_HORSEMAN and ID_HORSE (to finish states names) 2021-09-02 05:51:10 +02:00
Lwmte
3bc7eae30a Fix static collision in water 2021-09-01 14:23:58 +03:00
Raildex
3749952391 Fixed stupid hair 2021-09-01 05:53:08 +02:00
Raildex
4242f346c9 Fixed Crashing Inventory 2021-08-31 18:24:32 +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
hispidence
88c31503ca Add this comment to remind myself to think about stuff when implementing loading/saving. 2021-08-31 13:25:42 +01:00
MontyTRC89
053deaa302 Fixed ID_AHMET firing death; Decompiled missing code form TriggerFireFlame(); 2021-08-31 12:59:46 +02:00
MontyTRC89
c603bd8312 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-31 05:20:05 +02:00
MontyTRC89
5fbc2252e4 Fixed TR4 dog 2021-08-31 05:19:11 +02:00
Troye
84cc6d9c7f revert to bitshits in Game folder; handle lack of inv objects; 2021-08-30 15:13:18 -05:00
hispidence
1e33c83f20 Update compiled docs. 2021-08-30 18:46:48 +01:00
hispidence
af4fa26a2c Merge branch 'master' into displaystrings 2021-08-30 18:44:21 +01:00
hispidence
70cc036605 Make SetLevelFunc and GetLevelFunc only store the function in m_levelFuncs.
Store the function in m_levelFuncs instead of the table itself.
2021-08-30 18:21:42 +01:00
Raildex
8a330f1da0 Removed unnecessary constructor of ITEM_DATA
Removed Debugging leftovers
2021-08-30 17:50:11 +02:00