Commit graph

1650 commits

Author SHA1 Message Date
KrysB4k
2ac8a444ee Fix pushing pushables into bridges
Swapped pushable_info function for a simple #define
2021-01-18 13:41:59 +01:00
asasas9500
fbd4848a22 Fix no pathfinding 2021-01-17 20:29:37 -03:00
asasas9500
6eed76c058 Fix monkey swing 2021-01-17 17:54:52 -03:00
Trxye
50f42daae4 remove kayak hack 2021-01-17 14:46:08 -06:00
asasas9500
750409c372 Fix crawling 2021-01-17 15:56:48 -03:00
KrysB4k
936bce737a Merge remaining features of VirtualRooms 2021-01-16 18:38:16 +01:00
asasas9500
184427ea05 Merge branch 'VirtualRooms' into PushableOCB 2021-01-16 11:39:52 -03:00
asasas9500
f8e4ebce26 Revert changes to pushable block 2021-01-16 11:27:27 -03:00
asasas9500
95fe660864 Revert "Fix pushable collision bug"
This reverts commit 8eb40d79e5.
2021-01-16 11:05:14 -03:00
asasas9500
e0130a7a48 Revert "Fixed comment"
This reverts commit 8969fdfdef.
2021-01-16 11:04:50 -03:00
KrysB4k
8969fdfdef Fixed comment 2021-01-12 20:17:38 +01:00
KrysB4k
8eb40d79e5 Fix pushable collision bug
Remove bridge from pushable (stack) on movement start and add bridge from pushable (stack) on movement stop
2021-01-12 20:11:03 +01:00
asasas9500
dbdd10eaf4 Add ExplosionControl() 2021-01-08 17:49:55 -03:00
asasas9500
ff1d0db4f3 Fix line endings of new files 2021-01-07 23:48:30 -03:00
asasas9500
97ca6a122b Add InitialiseExplosion() 2021-01-07 23:32:46 -03:00
asasas9500
8f58cc16d7 Fix bridges inconsistency 2021-01-07 17:47:09 -03:00
asasas9500
12a3da6875 Make Lara aware of virtual rooms 2021-01-07 11:16:21 -03:00
asasas9500
7bbb65581a Implement virtual rooms into floordata 2021-01-06 17:53:13 -03:00
asasas9500
12743fd532 Simplify main floordata functions 2021-01-03 15:21:32 -03:00
KrysB4k
d1aed5c4b5 New pushblock movement code
Bounding box data is used to move pushable. Removed old code with itemFlags, which fixes pushable bug with coordinates near 32768
2020-12-31 06:50:16 +01:00
KrysB4k
ad9c593e23 Merge branch 'master' into PushableOCB 2020-12-31 03:25:12 +01:00
KrysB4k
5dd68d9ba0 Corrected GetBoundsAccurate()
Fixing Core's mistakes...
2020-12-31 03:20:09 +01:00
KrysB4k
cf1db753da Updates to pushables
Introduced PUSHABLE_INFO struct, which is stored in item->data of pushable.

Tried to implement as many TRNG pushable OCBs as I could.
2020-12-30 02:12:14 +01:00
MontyTRC89
1d4e69ba36 Tested, cleaned and fixed ID_SCORPION and ID_SMALL_SCORPION 2020-12-26 14:44:05 +01:00
KrysB4k
e5a59a1419 Removed mistakes with previous commit 2020-12-25 01:36:28 +01:00
KrysB4k
a6a9050d4a Revert "Pushables: Fix error in stack height code, use bbox Y1 value for non-rigid pushables"
This reverts commit 21977d5eba.
2020-12-25 01:31:17 +01:00
KrysB4k
21977d5eba Pushables: Fix error in stack height code, use bbox Y1 value for non-rigid pushables
Y1 value of pushable's bounding box is now used in computing block height
2020-12-25 01:30:24 +01:00
KrysB4k
6d4604af32 Proper collision for stacked pushables
Total height is calculated for pushable stacks and used for evaluation in TestBlockPush() and TestBlockPull()
2020-12-24 03:53:36 +01:00
asasas9500
6444365346 Fix bomb 2020-12-23 11:04:21 -03:00
KrysB4k
1315d81985 Remove UpdateLaraRoom() from ItemPushLara(): fixes kayak jump bug
UpdateLaraRoom() seems not needed. Removing it fixes the jumping bug with water vehicles and other objects
2020-12-22 19:32:37 +01:00
MontyTRC
76352cd534
Merge pull request #247 from MontyTRC89/LineEndings
Fix line endings
2020-12-22 07:45:38 +01:00
asasas9500
d4c6cc4a97 Fix line endings 2020-12-21 13:16:29 -03:00
KrysB4k
658289f603 Stackable pushables 2020-12-21 04:13:14 +01:00
KrysB4k
fe65351aa8 Pushables: parse CollidedItems array for objects with floor procedures 2020-12-20 19:31:07 +01:00
asasas9500
d45f69ac0b Fix stacked bridges 2020-12-20 14:04:27 -03:00
asasas9500
dfcd40463a Revert collision vectors 2020-12-20 00:00:18 -03:00
asasas9500
91f0bb20f7 Revert move angle relative to Lara rotation 2020-12-19 23:34:52 -03:00
KrysB4k
8f6b428942 Removed duplicate function GetFloorAndTestTriggers, fix pushblock issues
GetFloorAndItemTriggers() was removed in favor of TestTriggersAtXYZ() from switch.cpp, which does the same. All calls to GetFloorAndItemTriggers were replaced with TestTriggersAtXYZ.

Pushables pulling bug was fixed in TestBlockPull(). PushableBlockControl() now calls ItemNewRoom() to signal change of room membership of pushable.
2020-12-19 23:02:55 +01:00
MontyTRC89
efc5d1e09d Fixed ID_SPHINX; Fixed heavy triggers; 2020-12-10 15:22:18 +01:00
MontyTRC89
9acfb498f4 Fixed ID_BAT (but see notes in tr4_bat.cpp) 2020-12-01 18:35:21 +01:00
MontyTRC89
0c747b4e6d Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-12-01 07:08:04 +01:00
Montagna Marco
602b9fb50c Fixed CreatureAnimation(); Improved ID_CROCODILE; 2020-11-29 06:56:37 +01:00
Montagna Marco
20c90603b0 Fixed serious bug in CreatureAIInfo(); Improved ID_CROCODILE; 2020-11-28 07:27:35 +01:00
Nils
f28abeea16 Increased Room Stack Size to 512 2020-11-26 20:41:07 +01:00
Woops
852d6679af centaur stuff 2020-11-16 15:42:12 -06:00
Woops
3660ce5a3f fix TR1 torso, port centaur 2020-11-16 02:33:04 -06:00
Woops
1219cd7ce2 fix bacon 2020-11-16 01:17:29 -06:00
Woops
74b016a4e5 fix ape 2020-11-15 12:28:45 -06:00
MontyTRC
79959cd5f5
Merge pull request #241 from MontyTRC89/NewTRMath
New tr math
2020-11-14 21:25:09 +01:00
asasas9500
e1ff9ba698 Merge branch 'master' into NewTRMath 2020-11-14 16:19:45 -03:00