TombEngine/TR5Main/Game
Raildex 31ec83f9cc Merge branch 'master' into item_data
# Conflicts:
#	TR5Main/Game/items.cpp
2021-09-04 11:52:34 +02:00
..
control Removed BaddieSlots 2021-09-03 09:37:42 +02:00
debug Clean up files, fix build type for cso file 2021-08-19 12:28:39 +03:00
itemdata Removed BaddieSlots 2021-09-03 09:37:42 +02:00
Lara Merge branch 'master' into item_data 2021-09-04 11:52:34 +02:00
memory Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
particle Fix namespace case 2021-08-30 18:03:21 +03:00
pickup Change waterskin add/remove behaviour. 2021-08-08 23:42:30 +01:00
box.cpp Merge branch 'master' into item_data 2021-09-04 11:52:34 +02:00
Box.h Removed BaddieSlots 2021-09-03 09:37:42 +02:00
bubble.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
bubble.h Disable all bubbles when the game unloads to avoid crashing 2021-06-06 18:14:13 -04:00
camera.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
camera.h Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug 2021-08-29 23:53:58 +03:00
chaffFX.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
chaffFX.h Added new SparkParticle 2020-06-15 16:36:52 +02:00
collide.cpp Merge branch 'master' into item_data 2021-09-04 11:52:34 +02:00
collide.h Merge branch 'master' into item_data 2021-09-04 11:52:34 +02:00
control.cpp Removed BaddieSlots 2021-09-03 09:37:42 +02:00
control.h Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
creature_info.h Added provisional LOT priority 2021-09-03 11:36:38 +02:00
debris.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
debris.h Fix namespace case 2021-08-30 18:03:21 +03:00
door.cpp Merge branch 'master' into item_data 2021-09-04 11:52:34 +02:00
door.h Refactored several info types into separate files 2021-08-29 10:19:47 +02:00
door_data.h Integrated ITEM_DATA into ITEM_INFO 2021-08-29 16:11:03 +02:00
draw.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
draw.h Fixed More Include Hell 2021-08-28 13:27:58 +02:00
drip.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
drip.h Fix namespace case 2021-08-30 18:03:21 +03:00
effect2.cpp Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
effect2.h Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
explosion.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
explosion.h Fix namespace case 2021-08-30 18:03:21 +03:00
flipeffect.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
flipeffect.h Rename effect.cpp to flipeffect.cpp to avoid confusions 2021-08-26 16:24:43 +03:00
flmtorch.cpp Clarify function names 2021-09-02 19:49:07 +02:00
flmtorch.h Fix line endings 2020-12-21 13:16:29 -03:00
floordata.cpp Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
floordata.h Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
footprint.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
footprint.h Fix namespace case 2021-08-30 18:03:21 +03:00
gameflow.cpp Fix line endings 2020-12-21 13:16:29 -03:00
gameflow.h Remove 'typedef' from enums and structs. This was required in C, but in C++ all it does is generate thousands of warnings. 2021-07-18 15:22:15 +01:00
groundfx.h New project format (#206) 2020-05-27 09:21:20 +02:00
hair.cpp Merge branch 'master' into item_data 2021-09-02 07:08:58 +02:00
hair.h Fix line endings 2020-12-21 13:16:29 -03:00
health.cpp Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
health.h Remove 'typedef' from enums and structs. This was required in C, but in C++ all it does is generate thousands of warnings. 2021-07-18 15:22:15 +01:00
inventory.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
inventory.h clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
item.h Integrated ITEM_DATA into ITEM_INFO 2021-08-29 16:11:03 +02:00
items.cpp Merge branch 'master' into item_data 2021-09-04 11:52:34 +02:00
items.h Cleaned up several buffers to use fixed arrays 2021-08-29 16:35:19 +02:00
lightning.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
lot.cpp Added provisional LOT priority 2021-09-03 11:36:38 +02:00
lot.h Removed BaddieSlots 2021-09-03 09:37:42 +02:00
misc.cpp Renamed creature.h to creature_info.h 2021-08-29 10:04:49 +02:00
misc.h Fix line endings 2020-12-21 13:16:29 -03:00
missile.cpp Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
missile.h Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
newinv2.cpp Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
newinv2.h Make it explicit that item_options is a 64-bit int. 2021-08-11 01:29:38 +01:00
objects.cpp Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
objects.h Fixed More Include Hell 2021-08-28 13:27:58 +02:00
people.cpp Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
people.h Fix line endings 2020-12-21 13:16:29 -03:00
phd_global.h Fixed More Include Hell 2021-08-28 13:27:58 +02:00
pickup.cpp Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
pickup.h Fixed More Include Hell 2021-08-28 13:27:58 +02:00
prng.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
prng.h Fix namespace case 2021-08-30 18:03:21 +03:00
puzzles_keys.cpp Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
puzzles_keys.h Fixed More Include Hell 2021-08-28 13:27:58 +02:00
room.h Separate volume code from TestTriggers, fix DoRayBox bounds 2021-08-30 15:35:00 +03:00
roomvector.h Integrated ITEM_DATA into ITEM_INFO 2021-08-29 16:11:03 +02:00
rope.cpp Fixed More Include Hell 2021-08-28 13:27:58 +02:00
rope.h Fix line endings 2020-12-21 13:16:29 -03:00
savegame.cpp Merge branch 'master' into item_data 2021-08-31 18:20:23 +02:00
savegame.h Remove 'typedef' from enums and structs. This was required in C, but in C++ all it does is generate thousands of warnings. 2021-07-18 15:22:15 +01:00
smoke.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
smoke.h Fix namespace case 2021-08-30 18:03:21 +03:00
sound.cpp Fix trolling 2021-08-29 20:01:28 +03:00
sound.h Fixed More Include Hell 2021-08-28 13:27:58 +02:00
spark.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
spark.h Fix namespace case 2021-08-30 18:03:21 +03:00
sphere.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
sphere.h Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug 2021-08-29 23:53:58 +03:00
spotcam.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
spotcam.h Fix #286 2021-07-31 03:47:56 +03:00
switch.cpp Manually fix merge conflicts 2021-08-28 21:43:47 +03:00
switch.h Fixed More Include Hell 2021-08-28 13:27:58 +02:00
text.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
text.h Fix line endings 2020-12-21 13:16:29 -03:00
tomb4fx.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
tomb4fx.h Fixed More Include Hell 2021-08-28 13:27:58 +02:00
traps.cpp Clarify function names 2021-09-02 19:49:07 +02:00
traps.h Fixed More Include Hell 2021-08-28 13:27:58 +02:00
trmath.cpp Fix namespace case 2021-08-30 18:03:21 +03:00
trmath.h Separate volume code from TestTriggers, fix DoRayBox bounds 2021-08-30 15:35:00 +03:00