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

32 commits

Author SHA1 Message Date
Sezz
93e62d3e64 Update extra velocity handling; snap to floor height upon entering slope state; cleanup 2022-03-14 01:20:51 +11:00
Sezz
85df2ed1b1 ITEM_INFO cleanup; rename some structs to comply with TEN conventions; LaraInfo cleanup 2022-03-13 02:04:24 +11:00
Sezz
683c830259 WIP slope experiments; LaraInfo cleanup; cleanup 2022-03-08 18:22:14 +11:00
Sezz
c2fb6cd159 Generic object file cleanup 2022-02-24 14:22:30 +11:00
Sezz
1e0f82b2c3 More LaraItem cleanup; update savegame schema; convert HandStatus and WaterStatus structs to enum class 2022-02-11 01:31:54 +11:00
Sezz
5bba1df285 More LaraInfo cleanup; update savegame schema 2022-02-10 01:38:32 +11:00
Sezz
ed6ac2d7bc Rename ITEM_INFO members to comply with conventions 2022-02-09 16:55:46 +11:00
Sezz
8e3d7cfa4c Begin tidying LaraInfo; cleanup tr4_senet.cpp; update savegame schema 2022-02-08 20:45:21 +11:00
Sezz
be08902a5c Tentatively rename animation-related ITEM_INFO members 2022-02-02 20:16:16 +11:00
Lwmte
8f4ba68f30 Reorganize includes tier 3 2021-12-24 03:32:19 +03:00
Lwmte
2101d3e65f Reorganize includes tier 2 2021-12-22 16:23:57 +03:00
Lwmte
2671ca453b Collide code reorganizing (#393) 
* Tier 1

* Tier 2

* Remove old GetRoomList implementation and use CollectConnectedRooms one

* Tier 3

* Tier 4

* Tier 5

* Tier 6

* Tier 7

Co-authored-by: Lwmte <initiator@nm.ru>
 2021-12-19 05:24:12 +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
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
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
MontyTRC89
887d509233 Fixed pushpull and kick doors 2021-09-07 06:04:09 +02: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
Lwmte
9669544577 Move trigger functions into separate file 2021-08-30 17:50:32 +03:00
Raildex
f7080f56c9 Integrated ITEM_DATA into ITEM_INFO 
TODO: See what happens with ENEMY_JEEP
 2021-08-29 16:11:03 +02:00
Lwmte
1037d74cd1 Simplify GetSwitchTrigger/GetKeyTrigger 2021-08-29 00:56:16 +03:00
Lwmte
9f60b228a7 Manually fix merge conflicts 2021-08-28 21:43:47 +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
MontyTRC89
82898fe37b Refactoring switches; Moved crowbar switch and underwater switches to separated files; 2021-08-26 05:46:10 +02:00
MontyTRC89
a12247a287 Refactoring switches; Fixed ID_JUMP_SWITCH and ID_LEVER_SWITCH; 2021-08-25 09:42:17 +02:00