Commit graph

214 commits

Author SHA1 Message Date
Nils
01bf1881b3 Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
Lwmte
16e83cfc3d Clarify more 2021-09-20 02:14:44 +03:00
Lwmte
5d7fa0564b Remove magic tri split checks 2021-09-20 01:42:49 +03:00
Lwmte
f04a979141 Fix merge 2021-09-20 01:11:22 +03:00
Lwmte
c3b69e0373 Merge branch 'master' into coll_info_reorganize 2021-09-19 23:47:31 +03:00
Lwmte
f8c2fc3895 Swap BadHeightUp/Down 2021-09-19 17:48:32 +03:00
Lwmte
6b7d805abb Embed height data into COLL_INFO, fix issues with rolling under statics and statics submerged into water 2021-09-19 06:42:24 +03:00
Lwmte
db65488979 Unhack GetCollisionInfo a bit 2021-09-19 04:11:55 +03:00
Lwmte
5cfbc3a487 Fix embedding into diagonal walls and steps, fix Lara freeze on triangle slopes 2021-09-17 22:55:09 +03:00
Lwmte
7b242a533c Rename some functions 2021-09-17 16:07:53 +03:00
Lwmte
9e4ff5c56e Remove legacy RoomBelow/Above helper funcs, fix door offset 2021-09-17 15:32:55 +03:00
MontyTRC89
a46be2c322 Fixed GenericSphereBoxCollision(); Fixed ID_BIRD_BLADE and ID_PLOUGH; 2021-09-17 06:01:15 +02:00
Lwmte
99ab563ee7 Rename draw.cpp to animation.cpp which makes more sense, some more edits 2021-09-16 05:06:03 +03:00
Lwmte
dc5893639f Make Lara targetable again 2021-09-16 03:56:04 +03:00
Lwmte
2dab494bfa Move LOS stuff out of control.cpp 2021-09-15 17:20:42 +03:00
Lwmte
4a7c9e842e Merge branch 'master' into coll_info_reorganize 2021-09-15 14:38:05 +03:00
MontyTRC89
cf65010637 Fixed bug in GenericSphereBoxCollision(); Fixed ID_SPIKEY_BALL, ID_FLOOR_4BLADES, ID_CEILING_4BLADES; 2021-09-15 06:08:48 +02:00
Lwmte
9f1e6e7a0b Replace usage of legacy average floor/ceiling values 2021-09-14 14:38:59 +03:00
Lwmte
76bc9ccc64 Fix GetOrthogonalIntersect 2021-09-14 03:03:31 +03:00
Lwmte
40b4d8e51e Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type 2021-09-13 23:15:02 +03:00
KrysB4k
00bb7b29f3 Removed remnants of bad ideas
Removed SplitFloor and SplitCeiling completely from affected source files
2021-09-13 20:19:33 +02:00
Lwmte
1df2234c4e Demagic NO_LOS_ITEM 2021-09-13 10:22:00 +03:00
Lwmte
1c71af2be4 Deint collide.cpp 2021-09-13 10:15:53 +03:00
Lwmte
c226821bc6 Rename DeathIsPit to be more descriptive 2021-09-13 09:55:54 +03:00
Lwmte
77ef567be4 CheckNoColFloorTriangle enum 2021-09-13 03:20:53 +03:00
Lwmte
50030b9f51 Rename remaining legacy fields in FLOOR_INFO 2021-09-13 02:51:52 +03:00
Lwmte
9e4f5e858b Remove unused skeleton trigger type 2021-09-13 01:18:06 +03:00
Lwmte
191f0171ca Fix position correctors 2021-09-13 01:06:52 +03:00
Lwmte
0fd07f11dc Remove skyRoom/pitRoom 2021-09-11 23:50:54 +03:00
Lwmte
55287a99da Remove all floordata legacy code 2021-09-11 22:41:25 +03:00
Lwmte
16a25c04e6 Calculate tilt and slopes from new floordata 2021-09-10 18:13:40 +03:00
Lwmte
7fe7d7edd3 Simplify GetCollisionInfo arguments 2021-09-10 12:14:28 +03:00
Lwmte
e509290192 Merge branch 'master' into coll_info_reorganize 2021-09-10 10:11:15 +03:00
MontyTRC
2efff94858
Merge pull request #318 from MontyTRC89/item_data
Item data
2021-09-10 05:01:45 +02:00
Lwmte
6cee87c7fd Small fixes 2021-09-10 00:49:45 +03:00
Lwmte
8136b41f42 Simplify COLL_POSITION 2021-09-10 00:43:26 +03:00
Lwmte
8728405870 Rename settings to setup 2021-09-10 00:20:59 +03:00
Lwmte
26957e806e Reorganize COLL_INFO 2021-09-10 00:18:47 +03: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