Commit graph

178 commits

Author SHA1 Message Date
MontyTRC89
cf65010637 Fixed bug in GenericSphereBoxCollision(); Fixed ID_SPIKEY_BALL, ID_FLOOR_4BLADES, ID_CEILING_4BLADES; 2021-09-15 06:08:48 +02:00
MontyTRC
2efff94858
Merge pull request #318 from MontyTRC89/item_data
Item data
2021-09-10 05:01:45 +02:00
Lwmte
b23532090a Crawl under solid static meshes 2021-09-09 20:21:05 +03:00
Lwmte
4ea3338116 Fix merge conflicts 2021-09-09 11:25:03 +03:00
Lwmte
4186dfe685 Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Lwmte
7f5dceef0c Further organizing 2021-09-08 18:31:35 +03:00
Lwmte
9af21e3146 Further code organizing 2021-09-08 18:19:06 +03:00
Lwmte
2bee1df81a Move all effect source files to separate directory, rename effect2 to effects 2021-09-08 18:07:48 +03:00
Lwmte
dcb0ce198c More reasonable name for splat flag 2021-09-08 17:44:24 +03:00
Lwmte
9ec632f5d8 Add splat animation if static bounds are taller than Lara headroom 2021-09-08 16:14:13 +03:00
Lwmte
43fdc58235 Remove unused hitCeiling flag 2021-09-08 15:59:22 +03:00
Lwmte
f4307caa09 Update collide.cpp 2021-09-08 14:22:58 +03:00
Lwmte
df1d6559b9 Fix enum 2021-09-08 14:05:09 +03:00
Lwmte
5f2f9d5185 Generalize solid collision function, enum static flags 2021-09-08 14:02:32 +03:00
Lwmte
80b5036fdd Finalize 2021-09-08 13:39:29 +03:00
Lwmte
4db862dafb Add comments 2021-09-07 21:36:13 +03:00
Lwmte
073b2697e0 Convert some functions 2021-09-07 20:37:31 +03:00
Lwmte
3f659e9c53 Finally made it work 2021-09-07 19:54:35 +03:00
Lwmte
e026e30140 Update collide.cpp 2021-09-05 00:49:49 +03:00
Lwmte
4a94264e61 Update collide.cpp 2021-09-04 16:05:49 +03:00
Lwmte
31b10d37ad Update collide.cpp 2021-09-04 15:48:21 +03:00
Lwmte
7e881c3b19 Work 2021-09-04 15:43:25 +03:00
Nils
d08a1fa596 Merge branch 'master' into item_data
# Conflicts:
#	TR5Main/Game/items.cpp
2021-09-04 11:52:34 +02:00
Lwmte
8329ccecfc Work 2021-09-04 12:40:14 +03:00
MontyTRC89
45b176593e First commit 2021-09-04 07:59:00 +02:00
MontyTRC89
ea13ab0aaa Cleaned collision code; Cleaning AI code; Usin visibility for for statics culling; Fixed Lara crawling; 2021-09-04 07:53:21 +02:00
Nils
0af567b7fd 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
14e189db84 Add comments with previous function names 2021-09-02 22:40:33 +03:00
Lwmte
7e3e4856e0 Fix two collision bugs 2021-09-02 22:28:55 +03:00
Lwmte
fb65e68191 Remove broken CollideStaticObjects function
# Conflicts:
#	TR5Main/Game/collide.cpp
2021-09-02 19:50:10 +02:00
Lwmte
cccd7a048b Clarify function names
# Conflicts:
#	TR5Main/Game/collide.cpp
2021-09-02 19:49:07 +02:00
Lwmte
3c4213f5c9 Fix static collision in water 2021-09-01 14:23:58 +03:00
Lwmte
e879038220 Fix namespace case 2021-08-30 18:03:21 +03:00
Lwmte
e2e20a2497 Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug 2021-08-29 23:53:58 +03:00
Lwmte
672607c16b Remove OnObject global 2021-08-27 19:29:18 +03:00
Lwmte
5fee75b27f Fix grenades destroying environment and not doing damage on Lara 2021-08-27 16:30:03 +03:00
Lwmte
a974e4798c Fix incorrect height calc 2021-08-27 15:48:22 +03:00
Lwmte
dd3b6fa4e5 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
2c04b225c1 Cleanup collide.cpp a bit more 2021-08-26 14:58:06 +03:00
Lwmte
d5597dc35e Rename DoObjectDynamics to DoProjectileDynamics 2021-08-26 14:13:29 +03:00
Lwmte
0606941aef Remove more magic 2021-08-26 13:47:47 +03:00
Lwmte
bcf1fbc6d4 Remove magic numbers from GetCollisionInfo 2021-08-26 13:06:24 +03:00
Lwmte
6a10fab856 Move and rename DoProperDetection to collide.cpp 2021-08-26 12:37:46 +03:00
Lwmte
162d6c05db Remove GetTiltType, swap wrongly named TiltX/TiltZ variables (mistake by Core) 2021-08-26 11:39:08 +03:00
Lwmte
4b2f672298 Merge branch 'master' into legacy_trigger_refactor 2021-08-26 00:38:21 +03:00
Lwmte
c0cb6ae37c Organize COLL_INFO 2021-08-25 06:54:17 +03:00
Lwmte
f69f723a85 Further fixes 2021-08-25 06:33:15 +03:00
Lwmte
e35e6acf8e Cleanup and comment GetCollisionInfo 2021-08-25 05:45:10 +03:00
MontyTRC89
2f5ced6c4f Fixed bug on align Lara position; Cleaning puzzle holes code; 2021-08-24 18:19:15 +02:00
Lwmte
e0b47d629f Merge branch 'master' into legacy_trigger_refactor 2021-08-24 19:04:54 +03:00