Lwmte
080b295c42
Merge branch 'master' into coll_info_reorganize
2021-09-11 10:13:37 +03:00
Lwmte
37d648cfd0
Revert "Fix regressions"
...
This reverts commit 7faf1fb02a
2021-09-11 10:13:04 +03:00
Lwmte
742814c76f
Merge branch 'master' into coll_info_reorganize
2021-09-11 09:44:43 +03:00
Lwmte
7faf1fb02a
Fix regressions
2021-09-11 09:41:29 +03:00
Lwmte
bc5569967d
Merge branch 'master' into coll_info_reorganize
2021-09-11 09:35:04 +03:00
MontyTRC89
865202b33c
Merge branch 'doors_refactoring'
...
# Conflicts:
# TR5Main/Game/door.cpp
# TR5Main/Game/door.h
# TR5Main/Game/memory/malloc.cpp
# TR5Main/Objects/Generic/Switches/cog_switch.cpp
# TR5Main/Objects/Generic/Switches/crowbar_switch.cpp
# TR5Main/Objects/Generic/Switches/generic_switch.h
# TR5Main/Objects/Generic/Switches/turn_switch.cpp
# TR5Main/Objects/TR4/Object/tr4_obelisk.cpp
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/Specific/level.cpp
# TR5Main/TombEngine.vcxproj
# TR5Main/TombEngine.vcxproj.filters
2021-09-11 05:38:26 +02:00
Lwmte
16a25c04e6
Calculate tilt and slopes from new floordata
2021-09-10 18:13:40 +03:00
Lwmte
4186dfe685
Merge branch 'master' into item_data
2021-09-09 11:10:25 +03:00
Lwmte
7f5dceef0c
Further organizing
2021-09-08 18:31:35 +03:00
Lwmte
9af21e3146
Further code organizing
2021-09-08 18:19:06 +03:00
Lwmte
2bee1df81a
Move all effect source files to separate directory, rename effect2 to effects
2021-09-08 18:07:48 +03:00
MontyTRC
60e81f29d8
Merge pull request #328 from MontyTRC89/new_objects_collision
...
Solid statics collision
2021-09-08 16:44:01 +02:00
Lwmte
e8f6c1fd54
Replace all magic numbers with mesh flags
2021-09-08 15:01:19 +03:00
Troye
f9a5e01a15
use SECTOR instead of WALL_SHIFT
2021-09-08 03:01:32 -05:00
Nils
0af567b7fd
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
Nils
7f774d04b3
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
Troye
6aabe62297
revert to bitshits in Game folder; handle lack of inv objects;
2021-08-30 15:13:18 -05:00
Lwmte
e879038220
Fix namespace case
2021-08-30 18:03:21 +03:00
Lwmte
aae46a5f3f
Move some more stuff to trigger.cpp
2021-08-30 17:52:38 +03:00
Lwmte
d2f4576b27
Move trigger functions into separate file
2021-08-30 17:50:32 +03:00
Lwmte
56c71d1fe6
Separate volume code from TestTriggers, fix DoRayBox bounds
2021-08-30 15:35:00 +03:00
Lwmte
c04afb30fe
Fix copypaste bug
2021-08-30 11:02:33 +03:00
Lwmte
e2e20a2497
Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug
2021-08-29 23:53:58 +03:00
Nils
2ec9b40f8c
Cleaned up several buffers to use fixed arrays
...
Removed game_malloc
TODO: DOOR_DATA destructor crashes
2021-08-29 16:35:19 +02:00
Nils
15e869ee50
Renamed creature.h to creature_info.h
2021-08-29 10:04:49 +02:00
Lwmte
efa66ca8ff
Fix idiocy
2021-08-29 00:00:15 +03:00
Lwmte
1de60cfc1c
Merge branch 'master' into legacy_trigger_refactor
2021-08-28 21:38:58 +03:00
Nils
b23cfe231a
Fixed Include Hell for Creature Info
2021-08-28 12:16:03 +02:00
Lwmte
0b86ca1f67
Directly use beetle flag and remove ClockworkBeetleFlag from Lara struct
2021-08-28 10:29:48 +03:00
MontyTRC89
556b8b90a9
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
d3e6bfc7dd
Refactored switches
2021-08-28 06:37:22 +02:00
Lwmte
672607c16b
Remove OnObject global
2021-08-27 19:29:18 +03:00
Lwmte
7cfe471c26
Cleanup a bit more
2021-08-26 19:55:34 +03:00
Lwmte
d6a5e7b8c6
Merge branch 'master' into legacy_trigger_refactor
2021-08-26 19:49:09 +03:00
Lwmte
02d78da776
Cleanup sound code
2021-08-26 19:47:59 +03:00
Lwmte
31cb8408eb
Remove more magic
2021-08-26 19:00:50 +03:00
Lwmte
5e48c0350e
Rename effect.cpp to flipeffect.cpp to avoid confusions
2021-08-26 16:24:43 +03:00
Lwmte
dd3b6fa4e5
Move collision and FX functions from effect.cpp
2021-08-26 15:54:52 +03:00
Lwmte
932ccc40d1
Simplify TestTriggers by providing overloads
2021-08-26 12:12:05 +03:00
Lwmte
b3424428ae
Fix building
2021-08-26 10:31:58 +03:00
Lwmte
f69f723a85
Further fixes
2021-08-25 06:33:15 +03:00
Lwmte
e0b47d629f
Merge branch 'master' into legacy_trigger_refactor
2021-08-24 19:04:54 +03:00
hispidence
4f6f3b9adf
Remove more vestiges of old trigger system. Replace TO_LUA_SCRIPT with the enum that used to be there - TO_BODYBAG - so that the following enums still have their same values.
2021-08-23 22:05:58 +01:00
hispidence
a1d5deed99
Merge remote-tracking branch 'origin/master'
2021-08-23 02:03:20 +01:00
hispidence
ef9a74d5e0
Clean up GameLogicScript.
...
Add some new member functions, ResetLevelTables and GetLevelFunc. The former is called in FreeLevelScripts, which is now called in control.cpp.
Remove AddTrigger, as the LevelFuncs table takes care of triggers.
2021-08-23 02:02:47 +01:00
MontyTRC89
327a21489f
Refactoring ID_LITTLE_BEETLES
2021-08-22 06:08:02 +02:00
Lwmte
b7d014080b
COLL_RESULT conversion in progress (broken)
2021-08-22 01:39:14 +03:00
Lwmte
ef2ff5bf51
Completely get rid of TriggerIndex
2021-08-20 15:26:12 +03:00
Lwmte
218e9f685a
Replace all direct occurences of TestTriggers with TestTriggersAtXYZ and references to TriggerIndex global in structs
2021-08-20 14:13:06 +03:00
MontyTRC89
2e1ac44c08
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine
2021-08-20 05:26:07 +02:00
