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

39 commits

Author SHA1 Message Date
Lwmte
e05f0b89a2 Rename newinv2 to gui 2021-11-16 15:51:50 +03:00
Lwmte
dedb938b24 Tier 1 2021-11-16 14:38:04 +03:00
Lwmte
533d0bdfe2 Refactors 2021-11-03 03:49:57 +03:00
Lwmte
27c4dee8b2 Merge branch 'master' into errors 2021-10-28 11:28:24 +03:00
Lwmte
e99acea69e Decipher hex stuff 2021-10-27 19:00:30 +03:00
Troye
af287cdf6d InventoryClass; 2021-10-12 04:15:22 -05:00
Troye
acc4281555 purge ring inventory; 2021-10-12 00:26:46 -05: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
016be41f97 Move anim structs to animation.h 2021-09-19 18:29:25 +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
744325bea2 Revert "Fix regressions" 
This reverts commit c1fc33ab52.
 2021-09-11 10:13:04 +03:00
Lwmte
c1fc33ab52 Fix regressions 2021-09-11 09:41:29 +03:00
MontyTRC89
8db7df3868 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
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
Raildex
2ee57e5891 Renamed "generalPtr" of LaraInfo to "interactedItem" 
All code that cast it to ITEM_INFO* was converted to a separate access into g_Level.Items
 2021-09-05 11:20:51 +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
be16255efc Merge branch 'master' into item_data 
# Conflicts:
#	TR5Main/Objects/TR4/Entity/tr4_sas.cpp
#	TR5Main/Objects/TR4/tr4_objects.cpp
 2021-08-29 13:29:55 +02:00
Lwmte
4c8a2053ea Merge branch 'master' into legacy_trigger_refactor 2021-08-29 09:16:39 +03:00
MontyTRC89
3ec19f557d Fixed puzzles holes 2021-08-29 05:53:07 +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
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
MontyTRC89
da2043b883 Fixed bug on align Lara position; Cleaning puzzle holes code; 2021-08-24 18:19:15 +02:00
hispidence
f6d1ae0bda Restore original line now that the stack overflow is fixed. 2021-08-01 20:50:41 +01:00
Lwmte
48b020f5fb Fix keyhole deadlock 2021-08-01 22:24:09 +03:00
Lwmte
66cac71f33 Fix puzzle holes. NOTE: Commented a line which caused stack overflow, needs fixing 2021-07-31 04:40:28 +03:00
hispidence
54e14ccb3f Make some functions take a GAME_OBJECT_ID instead of a short. Make AIOBJECT use a GAME_OBJECT_ID instead of a short. 2021-07-11 16:55:20 +01:00
hispidence
10fe19f559 Cast to GAME_OBJECT_ID. 2021-07-10 17:46:45 +01:00
Trxye
c0ca04a806 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
Trxye
d7fa758df7 fix inventory drawing; implement inventory in game code; 2021-05-20 14:19:11 -05:00
Woops
59eec6ddc2 Refactor: move puzzle and keys out of pickup.cpp into their own file 2020-08-09 01:24:06 -05:00