MontyTRC89
d5ea0becf1
Refactored doors in multiple files
2021-09-05 06:05:00 +02:00
Raildex
31ec83f9cc
Merge branch 'master' into item_data
...
# Conflicts:
# TR5Main/Game/items.cpp
2021-09-04 11:52:34 +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
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
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
MontyTRC89
0d7a04c861
Merge branch 'master' into item_data
2021-09-02 07:08:58 +02:00
MontyTRC89
7521a8a0c7
Decompiled ID_HORSEMAN and ID_HORSE (to finish states names)
2021-09-02 05:51:10 +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
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
Raildex
8a330f1da0
Removed unnecessary constructor of ITEM_DATA
...
Removed Debugging leftovers
2021-08-30 17:50:11 +02:00
Lwmte
6d9cf3c214
Fix namespace case
2021-08-30 18:03:21 +03:00
Lwmte
9669544577
Move trigger functions into separate file
2021-08-30 17:50:32 +03:00
Lwmte
21df1e84f1
Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug
2021-08-29 23:53:58 +03:00
Lwmte
15342f3259
Merge branch 'master' into legacy_trigger_refactor
2021-08-29 19:49:43 +03:00
Raildex
44c454318f
Cleaned up several buffers to use fixed arrays
...
Removed game_malloc
TODO: DOOR_DATA destructor crashes
2021-08-29 16:35:19 +02:00
Raildex
f7080f56c9
Integrated ITEM_DATA into ITEM_INFO
...
TODO: See what happens with ENEMY_JEEP
2021-08-29 16:11:03 +02:00
MontyTRC89
7954fb8d38
Placed some namespaces
2021-08-29 14:20:05 +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
Raildex
59987a69a7
Refactored several info types into separate files
2021-08-29 10:19:47 +02:00
Raildex
c6fcf8b248
Renamed creature.h to creature_info.h
2021-08-29 10:04:49 +02:00
Lwmte
4c8a2053ea
Merge branch 'master' into legacy_trigger_refactor
2021-08-29 09:16:39 +03:00
MontyTRC89
ee4e95dd08
Cleaned ID_AHMET
2021-08-29 08:10:29 +02:00
Lwmte
1037d74cd1
Simplify GetSwitchTrigger/GetKeyTrigger
2021-08-29 00:56:16 +03:00
Lwmte
ce1f4fad59
Fix idiocy
2021-08-29 00:00:15 +03:00
Lwmte
9f60b228a7
Manually fix merge conflicts
2021-08-28 21:43:47 +03:00
Lwmte
0b7c3d4a20
Merge branch 'master' into legacy_trigger_refactor
2021-08-28 21:38:58 +03:00
MontyTRC89
2b0624b166
Fixed ID_SAS_DRAG_BLOKE; Added namespaces to SAS functions;
2021-08-28 19:12:19 +02:00
Raildex
2621fa8f0d
Fixed More Include Hell
2021-08-28 13:27:58 +02:00
Raildex
dabbeb88db
Fixed Include Hell for Creature Info
2021-08-28 12:16:03 +02:00
Lwmte
e082d8d435
Directly use beetle flag and remove ClockworkBeetleFlag from Lara struct
2021-08-28 10:29:48 +03:00
MontyTRC89
5a9289f806
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine
...
# Conflicts:
# TR5Main/TombEngine.vcxproj
# TR5Main/TombEngine.vcxproj.filters
2021-08-28 06:45:36 +02:00
MontyTRC89
d0da243f73
Refactored switches
2021-08-28 06:37:22 +02:00
Lwmte
968df0ed59
Remove OnObject global
2021-08-27 19:29:18 +03:00
Lwmte
7d4fde9942
Cleanup a bit more
2021-08-26 19:55:34 +03:00
Lwmte
9331bcea04
Merge branch 'master' into legacy_trigger_refactor
2021-08-26 19:49:09 +03:00
Lwmte
886fece473
Cleanup sound code
2021-08-26 19:47:59 +03:00
Lwmte
5ace1a4c34
Rename effect.cpp to flipeffect.cpp to avoid confusions
2021-08-26 16:24:43 +03:00
Lwmte
b2831172af
Make flipeffect names consistent
2021-08-26 16:11:04 +03:00
Lwmte
b8c3b67f10
Move collision and FX functions from effect.cpp
2021-08-26 15:54:52 +03:00
Lwmte
465d282123
Rename DoObjectDynamics to DoProjectileDynamics
2021-08-26 14:13:29 +03:00
Lwmte
45b6724f92
Move and rename DoProperDetection to collide.cpp
2021-08-26 12:37:46 +03:00
Lwmte
1f68fd812b
Simplify TestTriggers by providing overloads
2021-08-26 12:12:05 +03:00
Lwmte
9b25b01f8a
Merge branch 'master' into legacy_trigger_refactor
2021-08-26 10:41:50 +03:00
Lwmte
d7c5487a38
Fix release build and resolve build warning about bad project name
2021-08-26 10:41:07 +03:00
Lwmte
c9de2c6aeb
Fix building
2021-08-26 10:31:58 +03:00
MontyTRC89
82898fe37b
Refactoring switches; Moved crowbar switch and underwater switches to separated files;
2021-08-26 05:46:10 +02:00
