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

134 commits

Author SHA1 Message Date
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
76a0365f4f More reasonable name for splat flag 2021-09-08 17:44:24 +03:00
Lwmte
3b45f66463 Add splat animation if static bounds are taller than Lara headroom 2021-09-08 16:14:13 +03:00
Lwmte
15bd790230 Remove unused hitCeiling flag 2021-09-08 15:59:22 +03:00
Lwmte
24ad8bffef Generalize solid collision function, enum static flags 2021-09-08 14:02:32 +03:00
Lwmte
b1829d5ef9 Finalize 2021-09-08 13:39:29 +03:00
Lwmte
e38b59c175 Convert some functions 2021-09-07 20:37:31 +03:00
Raildex
31ec83f9cc Merge branch 'master' into item_data 
# Conflicts:
#	TR5Main/Game/items.cpp
 2021-09-04 11:52:34 +02:00
MontyTRC89
c4e7dc811c First commit 2021-09-04 07:59:00 +02: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
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
b48c9d4483 More cleanup 2021-08-30 10:34:20 +03:00
Raildex
2621fa8f0d Fixed More Include Hell 2021-08-28 13:27:58 +02:00
Lwmte
933f9d8cf0 Remove more magic 2021-08-26 19:00:50 +03:00
Lwmte
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
465d282123 Rename DoObjectDynamics to DoProjectileDynamics 2021-08-26 14:13:29 +03:00
Lwmte
45b6724f92 Move and rename DoProperDetection to collide.cpp 2021-08-26 12:37:46 +03:00
Lwmte
12d8650176 Remove GetTiltType, swap wrongly named TiltX/TiltZ variables (mistake by Core) 2021-08-26 11:39:08 +03:00
Lwmte
3378c8791a Organize COLL_INFO 2021-08-25 06:54:17 +03:00
Lwmte
edfb6d72d1 Further fixes 2021-08-25 06:33:15 +03:00
Lwmte
867f16f467 Cleanup and comment GetCollisionInfo 2021-08-25 05:45:10 +03:00
Lwmte
70626854f0 Replace all remaining occurences of coll globals 2021-08-24 16:54:26 +03:00
Lwmte
2756a65095 COLL_RESULT conversion in progress (broken) 2021-08-22 01:39:14 +03:00
Lwmte
d394bcc39f Completely get rid of TriggerIndex 2021-08-20 15:26:12 +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
Lwmte
19a9b45e1d Add RefreshFloorGlobals hack to temporarily fix issues with monkeyswing and possibly other states 2021-08-19 18:43:52 +03:00
MontyTRC89
5c39ead909 Fixed ID_SAS; Fixed serious bugs with CreatureActive(); Fixed grenades;' 2021-04-29 06:26:30 +02:00
asasas9500
12ebf162ad Delete leftover code 2021-02-07 01:20:50 -03:00
asasas9500
358e9e42fd Make Lara aware of virtual rooms 2021-01-07 11:16:21 -03:00
asasas9500
10a3d9167a Fix line endings 2020-12-21 13:16:29 -03:00
asasas9500
b7d1ad3f35 Revert collision vectors 2020-12-20 00:00:18 -03:00
asasas9500
c411689790 Merge branch 'DiagonalCollisions' into NoShifts 2020-08-07 16:43:29 -03:00
KrysB4k
ed13777ac2 Merge branch 'master' into DiagonalCollisions 2020-07-26 10:51:06 +02:00
MontyTRC89
689ec226e7 Frames refactoring 2020-07-25 18:02:35 +02:00
asasas9500
2fd6addea6 Fix namespace 2020-06-21 14:31:35 -03:00
asasas9500
4d65439c2d Merge branch 'DiagonalCollisions' into NoShifts 2020-06-09 12:09:00 -03:00
KrysB4k
5ed8cf6b8a Revert "Added ChocolateFans functions" 
This reverts commit 4760288101.
 2020-06-09 16:26:14 +02:00
KrysB4k
4760288101 Added ChocolateFans functions 
SnapToDiagonal() and SnapToQuadrant replace the angle switchcases in some of Lara's anim collision functions
 2020-06-08 16:29:03 +02:00
KrysB4k
b99c3ea6e1 Merge branch 'master' into DiagonalCollisions 2020-06-07 20:32:00 +02:00
TokyoSU
663e5b7fa6 Refactored Crocodile 
- Refactored the bat a bit.
- Improved crocodile code style.
- Fixed crocodile attack range.
- Fixed crocodile water/land transition.
- Fixed crocodile not aligning to floor rotation.
- Simplified CalcItemToFloorRotation() and added a description to inform and warn the user.
 2020-06-07 09:30:14 +02:00
KrysB4k
f7e6850627 Added GetOrthogonalIntersect() 
GetOrthogonalIntersect() replaces bloated dir switch case in functions like TestLaraVault() and similar
 2020-06-07 02:49:38 +02:00
asasas9500
d9fcc87f12 Move COLL_TYPE, HEIGHT_TYPES, HEADINGS and OCTANTS to control.h 2020-06-06 19:05:54 -03:00
asasas9500
35fe5cd78f Merge branch 'master' into NoShifts 2020-06-06 18:37:21 -03:00
KrysB4k
dda527bb90 Merge branch 'master' into DiagonalCollisions 2020-06-06 23:17:16 +02:00
asasas9500
a3fadb109c Create RotateBoundingBox() 2020-06-06 17:55:05 -03:00
asasas9500
92fdb556c6 Merge branch 'DiagonalCollisions' into NoShifts 2020-06-06 16:00:44 -03:00
asasas9500
c49c98d21b Move COLL_TYPE, HEIGHT_TYPES and HEADINGS to collide.h; Create OCTANTS, SnapToQuadrant(), GetQuadrant(), SnapToDiagonal() and GetOctant() 2020-06-06 15:48:38 -03:00
KrysB4k
475effbe25 Add GetDiagonalIntersect() 
GetDiagonalIntersect() returns Vector2 with x and z coordinates aligned to diagonal, offset by LARA_RAD
 2020-06-06 20:37:19 +02:00