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
1945 commits 62 branches 10 tags 511 MiB
Commit graph

62 commits

Author SHA1 Message Date
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
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
asasas9500
6be29e6c9c Fix extra move in Senet 2021-05-28 23:25:07 -03:00
asasas9500
7ef797ed87 Fix beetle 2021-05-28 17:48:21 -03:00
asasas9500
3247694c07 Fix beetle rotation 2021-05-28 17:17:00 -03:00
Trxye
e41623d3be fix level select; fix pause menu audio bug; fix clockwork beetle hand pos; 2021-05-28 00:57:53 -05:00
Trxye
e3ba7234e7 fix ClockworkBeetleControl(); 2021-05-27 18:35:31 -05:00
Trxye
d6bf00d110 correct UseClockworkBeetle(); 2021-05-27 16:15:16 -05:00
Trxye
a6de3f6141 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 16:08:09 -05:00
Trxye
3edfe48af6 decompile clockwork beetle; 2021-05-27 16:07:57 -05:00
MontyTRC89
6ed2dfd28d Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 05:33:17 +02:00
MontyTRC89
b2f102ae63 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
asasas9500
e0d5cd4c09 Improve Semerkhet strategy 2021-05-25 20:10:59 -03:00
Trxye
a999bcd3a8 fix _0x0040FAE0(); 2021-05-25 12:56:35 -05:00
asasas9500
c1fb3b0422 Fix Senet 2021-05-24 23:57:09 -03:00
asasas9500
784745f945 Fix MakeMove() 2021-05-24 23:02:08 -03:00
asasas9500
858d9a3512 Fix line endings 2021-05-24 18:56:23 -03:00
Trxye
848a3ef5b5 SenetControl(); add senet things to tr4_objects.cpp 2021-05-24 16:04:13 -05:00
asasas9500
686ec4a1ec Add InitialiseGamePiece() 2021-05-24 17:22:42 -03:00
Trxye
abd2c2c8a6 ControlGodHead(); 2021-05-24 14:14:04 -05:00
Trxye
33f82e4548 GameStixCollision(); 2021-05-24 13:48:29 -05:00
asasas9500
5f906a9325 Add MakeMove() 2021-05-24 15:35:22 -03:00