Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-12 13:37:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
3046 commits 62 branches 10 tags 511 MiB
Commit graph

80 commits

Author SHA1 Message Date
Sezz
40c8e63cf6 Merge branch 'master' into lara_state_cleaning_etc 2021-12-09 02:28:10 +11:00
Sezz
a79c6df007 Refactor lara_flare.cpp 2021-12-09 00:48:55 +11:00
Sezz
933a3fa8b0 Minor UPV enhancements 2021-12-08 22:02:02 +11:00
Sezz
43cde72079 Merge branch 'master' into lara_state_cleaning_etc 2021-12-08 20:51:40 +11:00
Sezz
49f0c88251 Fix UPV mounting; cleanup upv.cpp 2021-12-08 15:27:46 +11:00
Sezz
dc45376fdf Merge branch 'master' into lara_state_cleaning_etc 2021-12-02 12:58:18 +11:00
Lwmte
313cf0a764 Minor cleanups 2021-12-01 18:12:04 +03:00
Sezz
d85eea8c1f Rename basic state functions; rename some state enum members; rename LG_NO_ARMS to LG_HANDS_FREE; move lara_as_gymnast() to lara_hang.cpp; minor corrections 2021-11-25 23:38:59 +11:00
Sezz
f30ae8839e Refactor lara_flare.cpp 2021-11-20 13:18:59 +11:00
Sezz
1ac1fec4e1 Remove LaraItem global usage in lara_flare.cpp + minor cleanup 2021-11-12 19:52:48 +11:00
Lwmte
8f51243ca4 First commit 2021-11-10 02:41:59 +03:00
Lwmte
6a5707f419 Merge branch 'master' into arbitrary_hanging_and_shimmying 2021-10-31 21:42:23 +03:00
Lwmte
8e42d77243 Move savegames to separate folder, organize savegame code 2021-10-31 21:36:51 +03:00
Lwmte
7bc95c7fee Merge branch 'master' into arbitrary_hanging_and_shimmying 2021-10-28 12:23:34 +03:00
Lwmte
f592f36a24 Merge branch 'master' into errors 2021-10-27 19:05:50 +03:00
Lwmte
38862dac8d Use enum class for collision enums 2021-10-27 09:48:31 +03:00
Lwmte
1b6eb6d035 Stabilize shimmying 2021-10-24 04:08:54 +03:00
Lwmte
c82c6f5b6f Move no quadrants flag into coll setup 2021-10-09 19:19:02 +03:00
Lwmte
ef0bcf950a Merge branch 'master' into errors 2021-10-08 16:47:59 +03:00
Lwmte
65f5c17cc9 Deduplicate GetCollisionInfo code in preparation for unconstrained probe angles 2021-10-07 12:34:16 +03:00
Lwmte
dacd55fdd4 Demagic UPV sound IDs 2021-10-06 19:54:04 +03:00
Stranger1992
3f016b5603 Fixing the hard coded sounds for the UPV so they point towards sounds that make sense. 2021-10-06 17:14:42 +01:00
Stranger1992
81822213bc Update upv.cpp 
Changed UPV Sound Effect to SFX_TR5_LARA_UNDERWATER_ENGINE (1807).
 2021-10-04 18:05:40 +01:00
Lwmte
8725b900b7 Update upv.cpp 2021-10-04 12:31:35 +03:00
Lwmte
35d736421c Fix UPV bugs 2021-10-04 12:28:05 +03:00
Troye
552352dd21 W1 2021-09-25 16:03:28 -05:00
Lwmte
971d1b203f Cleanup 2 2021-09-25 16:04:16 +03:00
Lwmte
e6fc5aba77 Cleanup 2021-09-25 16:00:30 +03:00
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
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Lwmte
add6629267 Swap BadHeightUp/Down 2021-09-19 17:48:32 +03:00
Lwmte
b3898b7940 Embed height data into COLL_INFO, fix issues with rolling under statics and statics submerged into water 2021-09-19 06:42:24 +03:00
Lwmte
5ae79a461e Remove legacy RoomBelow/Above helper funcs, fix door offset 2021-09-17 15:32:55 +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
4a551c0918 Move LOS stuff out of control.cpp 2021-09-15 17:20:42 +03:00
Lwmte
f79d6436a3 Remove optional TestTriggers argument 2021-09-15 16:58:53 +03:00
Lwmte
d8ab386840 Rename DeathIsPit to be more descriptive 2021-09-13 09:55:54 +03:00
Lwmte
2f3af7e3ea Simplify GetCollisionInfo arguments 2021-09-10 12:14:28 +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
ba6c260b92 Further code organizing 2021-09-08 18:19:06 +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
Raildex
8a330f1da0 Removed unnecessary constructor of ITEM_DATA 
Removed Debugging leftovers
 2021-08-30 17:50:11 +02: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