Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-03 02:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
2650 commits 65 branches 10 tags 488 MiB
Commit graph

140 commits

Author SHA1 Message Date
MontyTRC89
5a378b213f Fixing ropes and added debug ropes drawing 2021-09-28 13:01:28 +02:00
Troye
552352dd21 W1 2021-09-25 16:03:28 -05: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
add6629267 Swap BadHeightUp/Down 2021-09-19 17:48:32 +03:00
Lwmte
10bf3288a0 Fix climbing out of water 2021-09-19 07:38:15 +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
7fd525e436 Fix water 2021-09-18 01:32:48 +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
d8aa65260f Make Lara targetable again 2021-09-16 03:56:04 +03:00
Lwmte
1d0ceb0ff4 Fix more stuff 2021-09-16 01:12:19 +03:00
Lwmte
4d8c219811 Simplify flipeffect call 2021-09-15 17:49:01 +03:00
Lwmte
f79d6436a3 Remove optional TestTriggers argument 2021-09-15 16:58:53 +03:00
Lwmte
bb445660e7 Add safety checks for flipeffects 2021-09-15 14:45:20 +03:00
Lwmte
e289644e87 Move flipeffect global to filpeffect.cpp 2021-09-15 11:38:55 +03:00
Lwmte
e61c2fc324 Fix wade depth 2021-09-14 15:30:28 +03:00
Lwmte
d8ab386840 Rename DeathIsPit to be more descriptive 2021-09-13 09:55:54 +03:00
Lwmte
280c9fa28b Merge branch 'master' into coll_info_reorganize 2021-09-10 10:11:15 +03:00
Lwmte
3cc0c21946 Demagic some fields 2021-09-10 01:19: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
MontyTRC89
714e0a5ca2 Merge pull request #328 from MontyTRC89/new_objects_collision 
Solid statics collision
 2021-09-08 16:44:01 +02:00
MontyTRC89
1ee650487b Merge pull request #323 from MontyTRC89/new_tightrope 
Added new Tightrope behaviour
 2021-09-08 16:43:18 +02:00
MontyTRC89
e06a79ffc9 Merge branch 'master' into bitshifts_2 2021-09-08 16:20:28 +02:00
Lwmte
3b45f66463 Add splat animation if static bounds are taller than Lara headroom 2021-09-08 16:14:13 +03:00
Raildex
f62f900fb0 Added new Tightrope behaviour 
You can use Left and Right to control lara's balance
Lara will gradually lose balance
When lara stops, her balance regenerates
 2021-09-05 14:49:00 +02:00
Raildex
31ec83f9cc Merge branch 'master' into item_data 
# Conflicts:
#	TR5Main/Game/items.cpp
 2021-09-04 11:52:34 +02:00
Lwmte
445e062c03 Remove broken CollideStaticObjects function 
# Conflicts:
#	TR5Main/Game/collide.cpp
 2021-09-02 19:50: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
Troye
84cc6d9c7f revert to bitshits in Game folder; handle lack of inv objects; 2021-08-30 15:13:18 -05:00
Lwmte
6d9cf3c214 Fix namespace case 2021-08-30 18:03:21 +03:00
Lwmte
81c6e1f770 Separate volume code from TestTriggers, fix DoRayBox bounds 2021-08-30 15:35:00 +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
Raildex
2621fa8f0d Fixed More Include Hell 2021-08-28 13:27:58 +02:00
Lwmte
d06084fc1b Update lara.cpp 2021-08-26 19:55:52 +03:00
Lwmte
5ace1a4c34 Rename effect.cpp to flipeffect.cpp to avoid confusions 2021-08-26 16:24:43 +03:00
Lwmte
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
c74fd2c3da Remove magic numbers from GetCollisionInfo 2021-08-26 13:06:24 +03:00
Lwmte
1f68fd812b Simplify TestTriggers by providing overloads 2021-08-26 12:12:05 +03:00
Lwmte
ec9479860f Merge branch 'master' into legacy_trigger_refactor 2021-08-24 19:04:54 +03:00
Lwmte
d394bcc39f Completely get rid of TriggerIndex 2021-08-20 15:26:12 +03:00
Lwmte
1828ddaeab Replace all direct occurences of TestTriggers with TestTriggersAtXYZ and references to TriggerIndex global in structs 2021-08-20 14:13:06 +03:00
MontyTRC89
eebb8dfbba Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-20 05:26:07 +02:00
MontyTRC89
0ed8181cda Merge branch 'master' of https://github.com/MontyTRC89/TombEngine; Renamed namespaces; 
# Conflicts:
#	TR5Main/TR5Main.vcxproj.user
 2021-08-20 05:25:51 +02:00
Lwmte
48aefdeee6 First commit 2021-08-20 02:01:50 +03:00
Lwmte
19a9b45e1d Add RefreshFloorGlobals hack to temporarily fix issues with monkeyswing and possibly other states 2021-08-19 18:43:52 +03:00