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

82 commits

Author SHA1 Message Date
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
Lwmte
e99acea69e Decipher hex stuff 2021-10-27 19:00:30 +03:00
Lwmte
ef0bcf950a Merge branch 'master' into errors 2021-10-08 16:47:59 +03:00
Lwmte
2e5a68f3d7 Fix Lara double damage 2021-10-02 19:52:37 +03: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
MontyTRC89
4b0d76ed95 Refactored flame emitters, Lara burn and lightning bolts; 2021-09-22 05:51:25 +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
f79d6436a3 Remove optional TestTriggers argument 2021-09-15 16:58:53 +03:00
Lwmte
1284d34f68 Implement basic flash, fix func names 2021-09-15 14:24:03 +03:00
Lwmte
b8bb8562a3 Merge branch 'master' into sky_fix 2021-09-13 09:50:25 +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
280c9fa28b Merge branch 'master' into coll_info_reorganize 2021-09-10 10:11:15 +03:00
MontyTRC89
9c169a87f2 Decompiled ID_OBELISK 2021-09-10 05:30:07 +02: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
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
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
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
f7080f56c9 Integrated ITEM_DATA into ITEM_INFO 
TODO: See what happens with ENEMY_JEEP
 2021-08-29 16:11:03 +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
ee4e95dd08 Cleaned ID_AHMET 2021-08-29 08:10:29 +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
Lwmte
e082d8d435 Directly use beetle flag and remove ClockworkBeetleFlag from Lara struct 2021-08-28 10:29:48 +03: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
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
hispidence
10fe19f559 Cast to GAME_OBJECT_ID. 2021-07-10 17:46:45 +01:00
MontyTRC89
255393b589 Added FROM_DEGREES function; Added quantity param to PickedUpObject(); LUA scripting refactoring WIP; 2021-06-29 05:00:15 +02:00
Trxye
fda0e1ac3d fix compile 2021-06-10 11:36:34 -05:00
Trxye
e2b0178cb8 InitialiseObelisk(); some of ObeliskControl() 2021-06-09 22:48:18 -05:00
wolfcheese
3b198afaef Beetle's room number was not updating due to low height; added small adjustment to its GetFloor() 2021-06-08 16:04:43 -04:00
Trxye
f0a3f4d801 fix pickups 2021-05-30 13:18:39 -05:00
Trxye
8a414c2c84 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-28 21:45:09 -05:00
Trxye
8e40531a49 fix clockwork beetle going only north; 2021-05-28 21:44:43 -05:00