Commit graph

182 commits

Author SHA1 Message Date
Lwmte
280c9fa28b Merge branch 'master' into coll_info_reorganize 2021-09-10 10:11:15 +03:00
MontyTRC89
6f0914e39e Merge pull request #318 from MontyTRC89/item_data
Item data
2021-09-10 05:01:45 +02:00
Lwmte
7ad5ef40f9 Small fixes 2021-09-10 00:49:45 +03:00
Lwmte
c9d4914e3d Simplify COLL_POSITION 2021-09-10 00:43:26 +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
9f3a824499 Crawl under solid static meshes 2021-09-09 20:21:05 +03:00
Lwmte
c81fcfe43e Fix merge conflicts 2021-09-09 11:25:03 +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
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
8b045542d2 Update collide.cpp 2021-09-08 14:22:58 +03:00
Lwmte
fcdda87297 Fix enum 2021-09-08 14:05:09 +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
6b0d063dda Add comments 2021-09-07 21:36:13 +03:00
Lwmte
e38b59c175 Convert some functions 2021-09-07 20:37:31 +03:00
Lwmte
d30f6351c6 Finally made it work 2021-09-07 19:54:35 +03:00
Lwmte
72e423cc67 Update collide.cpp 2021-09-05 00:49:49 +03:00
Lwmte
12fbb28e9b Update collide.cpp 2021-09-04 16:05:49 +03:00
Lwmte
6329e110c1 Update collide.cpp 2021-09-04 15:48:21 +03:00
Lwmte
afc7a6a2b2 Work 2021-09-04 15:43:25 +03:00
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
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
Lwmte
3bc7eae30a Fix static collision in water 2021-09-01 14:23:58 +03:00
Lwmte
6d9cf3c214 Fix namespace case 2021-08-30 18:03:21 +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
Lwmte
968df0ed59 Remove OnObject global 2021-08-27 19:29:18 +03:00
Lwmte
4f06d91ff6 Fix grenades destroying environment and not doing damage on Lara 2021-08-27 16:30:03 +03:00
Lwmte
414e22c7d4 Fix incorrect height calc 2021-08-27 15:48:22 +03:00
Lwmte
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
4d42bbeee5 Cleanup collide.cpp a bit more 2021-08-26 14:58:06 +03:00
Lwmte
465d282123 Rename DoObjectDynamics to DoProjectileDynamics 2021-08-26 14:13:29 +03:00
Lwmte
b42a7ba096 Remove more magic 2021-08-26 13:47:47 +03:00
Lwmte
c74fd2c3da Remove magic numbers from GetCollisionInfo 2021-08-26 13:06:24 +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
54d649899d Merge branch 'master' into legacy_trigger_refactor 2021-08-26 00:38:21 +03:00
Lwmte
3378c8791a Organize COLL_INFO 2021-08-25 06:54:17 +03:00