Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-06 19:01:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
2131 commits 65 branches 10 tags 504 MiB
Commit graph

2131 commits

This branch
This branch
All branches
Author SHA1 Message Date
Raildex
31ec83f9cc Merge branch 'master' into item_data 
# Conflicts:
#	TR5Main/Game/items.cpp
 2021-09-04 11:52:34 +02:00
Lwmte
b7cb2f4937 Work 2021-09-04 12:40:14 +03:00
MontyTRC89
c4e7dc811c First commit 2021-09-04 07:59:00 +02:00
MontyTRC89
cea3608a25 Cleaned collision code; Cleaning AI code; Usin visibility for for statics culling; Fixed Lara crawling; 2021-09-04 07:53:21 +02:00
Raildex
85790c9ae0 Fixed EnemyJeep TestTriggers call 
Renamed constants for priority system
 2021-09-03 13:02:35 +02:00
Raildex
a9ec28d9e1 Fixed EnemyJeep by using a dummy item info 2021-09-03 12:42:06 +02:00
Raildex
21bc5a04ba Added provisional LOT priority 2021-09-03 11:36:38 +02:00
Raildex
dce3f72d99 Removed BaddieSlots 
ActiveCreatures now contains pointers to CREATURE_INFOs of items instead
Every Item with Creature Info now contains their own path finding data.
Fixed OoB issues with XZ_GET_SECTOR
 2021-09-03 09:37:42 +02:00
Lwmte
efb7b71d3a Add comments with previous function names 2021-09-02 22:40:33 +03:00
Lwmte
71ff4588b9 Fix two collision bugs 2021-09-02 22:28:55 +03:00
Lwmte
445e062c03 Remove broken CollideStaticObjects function 
# Conflicts:
#	TR5Main/Game/collide.cpp
 2021-09-02 19:50:10 +02:00
Lwmte
522b41d1d6 Clarify function names 
# Conflicts:
#	TR5Main/Game/collide.cpp
 2021-09-02 19:49:07 +02:00
Raildex
0c5b92adf8 Fixed Door Crash 2021-09-02 17:20:19 +02:00
MontyTRC89
0d7a04c861 Merge branch 'master' into item_data 2021-09-02 07:08:58 +02:00
MontyTRC89
5f7eee613f Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-09-02 05:51:17 +02:00
MontyTRC89
7521a8a0c7 Decompiled ID_HORSEMAN and ID_HORSE (to finish states names) 2021-09-02 05:51:10 +02:00
Lwmte
3bc7eae30a Fix static collision in water 2021-09-01 14:23:58 +03:00
Raildex
3749952391 Fixed stupid hair 2021-09-01 05:53:08 +02:00
Raildex
4242f346c9 Fixed Crashing Inventory 2021-08-31 18:24:32 +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
hispidence
88c31503ca Add this comment to remind myself to think about stuff when implementing loading/saving. 2021-08-31 13:25:42 +01:00
MontyTRC89
053deaa302 Fixed ID_AHMET firing death; Decompiled missing code form TriggerFireFlame(); 2021-08-31 12:59:46 +02:00
MontyTRC89
c603bd8312 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-31 05:20:05 +02:00
MontyTRC89
5fbc2252e4 Fixed TR4 dog 2021-08-31 05:19:11 +02:00
Troye
84cc6d9c7f revert to bitshits in Game folder; handle lack of inv objects; 2021-08-30 15:13:18 -05:00
hispidence
1e33c83f20 Update compiled docs. 2021-08-30 18:46:48 +01:00
hispidence
af4fa26a2c Merge branch 'master' into displaystrings 2021-08-30 18:44:21 +01:00
hispidence
70cc036605 Make SetLevelFunc and GetLevelFunc only store the function in m_levelFuncs. 
Store the function in m_levelFuncs instead of the table itself.
 2021-08-30 18:21:42 +01:00
Raildex
8a330f1da0 Removed unnecessary constructor of ITEM_DATA 
Removed Debugging leftovers
 2021-08-30 17:50:11 +02:00
Raildex
e7f2632c99 Fixed Door crashes by doing a simple copy of the floor data instead of memcpy 
Using resize() insteaad of clear() for vectors in LEVEL to force a deallocation
 2021-08-30 17:28:26 +02:00
Lwmte
6d9cf3c214 Fix namespace case 2021-08-30 18:03:21 +03:00
Lwmte
d8434b62ec Move some more stuff to trigger.cpp 2021-08-30 17:52:38 +03:00
Lwmte
9669544577 Move trigger functions into separate file 2021-08-30 17:50:32 +03:00
Lwmte
556f5e858d Add volumes for flyby cams (with heavy flag) 2021-08-30 16:13:27 +03:00
Lwmte
81c6e1f770 Separate volume code from TestTriggers, fix DoRayBox bounds 2021-08-30 15:35:00 +03:00
Lwmte
7e1141bcc4 Fix copypaste bug 2021-08-30 11:02:33 +03:00
MontyTRC89
9bb64d4682 Merge pull request #311 from MontyTRC89/legacy_trigger_refactor 
Floordata convenience improvements and de-corefication
 2021-08-30 09:51:06 +02:00
Lwmte
b48c9d4483 More cleanup 2021-08-30 10:34:20 +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
hispidence
b5d8fe06ad Fix wrong function name. 2021-08-29 21:08:20 +01:00
hispidence
375e8012aa Add hopefully-temporary constexpr so that if I have to multiply by a pretend resolution at least it's not via magic numbers. 2021-08-29 21:08:07 +01:00
hispidence
a2303d022f Add the functions/properties SetPos, GetPos, col and key to DisplayString. 
Add documentation too.
 2021-08-29 20:28:40 +01:00
hispidence
fa5a6fd443 Add DisplayString "flags" and "translated" support, as well as some things I forgot to commit earlier. 2021-08-29 20:25:54 +01:00
hispidence
9a1831bc8f Remove PrintString; it has been "replaced" with DisplayString/AddString. 2021-08-29 20:11:29 +01:00
hispidence
8c1e290683 Rename AddDisplayString to SetDisplayString. Make it call insert_or_assign instead of just insert. 
Add GetDisplayString and assorted types/static functions.
 2021-08-29 20:09:59 +01:00
hispidence
3d1f2abd0b Add ScreenToPercent and PercentToScreen. 2021-08-29 20:03:51 +01:00
Lwmte
5fde174058 Merge branch 'master' into legacy_trigger_refactor 2021-08-29 20:18:41 +03:00
Lwmte
716f88b05f Fix trolling 2021-08-29 20:01:28 +03:00
Lwmte
15342f3259 Merge branch 'master' into legacy_trigger_refactor 2021-08-29 19:49:43 +03:00
hispidence
dde17f88cd Make MakeReadOnlyTable give the metatable its own metatable with an __index metamethod which raises an error (for now) when you use a variable that doesn't exist. 2021-08-29 17:07:19 +01:00