Raildex
2b0b1ff282
Added newlines
2021-09-25 11:27:47 +02:00
Raildex
7b070e75ad
Fixed duplicated ITEM_INFO definition
2021-09-24 07:53:42 +02:00
MontyTRC89
6cf4db33f1
Merge branch 'entities_fixings'
...
# Conflicts:
# TR5Main/Game/item.h
# TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp
# TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp
# TR5Main/Objects/TR4/Trap/tr4_blade.cpp
# TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
# TR5Main/Objects/TR4/Trap/tr4_mine.cpp
# TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp
# TR5Main/TombEngine.vcxproj.filters
2021-09-20 06:15:39 +02:00
MontyTRC89
8ccccf083b
Cleaned ID_MAPPER, ID_ELEMENT_PUZZLE and ID_MINE
2021-09-20 05:50:47 +02:00
Lwmte
cefc60c7ea
Move around some files
2021-09-19 23:41:26 +03:00
Lwmte
8d86c2e97d
Rename draw.cpp to animation.cpp which makes more sense, some more edits
2021-09-16 05:06:03 +03:00
Lwmte
280c9fa28b
Merge branch 'master' into coll_info_reorganize
2021-09-10 10:11:15 +03:00
Lwmte
1df38ae15a
Rename settings to setup
2021-09-10 00:20:59 +03:00
Lwmte
1efe0a9f09
Reorganize COLL_INFO
2021-09-10 00:18:47 +03:00
Lwmte
48a9a1d52a
Merge branch 'master' into item_data
2021-09-09 11:10:25 +03:00
Lwmte
3fe6211e4e
Further organizing
2021-09-08 18:31:35 +03:00
Lwmte
f293735d11
Move all effect source files to separate directory, rename effect2 to effects
2021-09-08 18:07:48 +03:00
Raildex
31ec83f9cc
Merge branch 'master' into item_data
...
# Conflicts:
# TR5Main/Game/items.cpp
2021-09-04 11:52:34 +02:00
Lwmte
522b41d1d6
Clarify function names
...
# Conflicts:
# TR5Main/Game/collide.cpp
2021-09-02 19:49:07 +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
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
7d4fde9942
Cleanup a bit more
2021-08-26 19:55:34 +03:00
Lwmte
1f68fd812b
Simplify TestTriggers by providing overloads
2021-08-26 12:12:05 +03:00
MontyTRC89
b2f102ae63
Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall;
2021-05-26 06:04:32 +02:00
KrysB4k
735e73f1ea
Removed duplicate function GetFloorAndTestTriggers, fix pushblock issues
...
GetFloorAndItemTriggers() was removed in favor of TestTriggersAtXYZ() from switch.cpp, which does the same. All calls to GetFloorAndItemTriggers were replaced with TestTriggersAtXYZ.
Pushables pulling bug was fixed in TestBlockPull(). PushableBlockControl() now calls ItemNewRoom() to signal change of room membership of pushable.
2020-12-19 23:02:55 +01:00
Woops
e42f9ca80e
bitshifts be gone
2020-10-17 23:36:06 -05:00
MontyTRC89
f923f514ec
First ID_VON_CROY implementation; Added friendly to ITEM_INFO;
2020-08-29 09:39:10 +02:00
MontyTRC89
d85e683629
Decompiled ID_ELEMENT_PUZZLE
2020-08-21 10:56:03 +02:00
