Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-13 05:57:05 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
1341 commits 62 branches 10 tags 512 MiB
Commit graph

69 commits

Author SHA1 Message Date
asasas9500
128d409aa7 Merge branch 'master' into PushableOCB 2021-02-06 11:50:08 -03:00
KrysB4k
7f9363dbac Small fixes with TestBlockPull() 
- fixed typo in case WEST (was zAddLara, should be xAddLara)
- rearranged floor height check for Lara
 2021-02-05 14:21:24 +01:00
KrysB4k
cbe9b33ff4 Tiny fix 2021-02-04 02:01:29 +01:00
KrysB4k
406c309c56 Fix remaining pushable bugs 
- fix pushing pushblock from 1 click step
- fix pushing pushblock into non-floor pushable
- remove floor properties from pushblocks with height < 2
 2021-02-04 01:19:14 +01:00
KrysB4k
b85bf6cf33 Removed room check in PushableBlockCollision 
Fixes issue with (standable) pushblocks not being interactable from another room
 2021-02-01 19:12:22 +01:00
KrysB4k
4d54339423 Adjust calls to AddBridge and RemoveBridge in pushables 2021-02-01 17:29:33 +01:00
asasas9500
72d086d49b Fix body part; Fix lara_col_all4s() 2021-01-29 01:14:20 -03:00
asasas9500
571bf7d58b Fix raising block 2021-01-27 22:26:47 -03:00
asasas9500
decead6658 Merge branch 'PushableOCB' of https://github.com/MontyTRC89/TR5Main into PushableOCB 2021-01-27 01:12:04 -03:00
asasas9500
9c5bcb3b84 Reimplement virtual rooms into floordata 2021-01-27 01:04:31 -03:00
KrysB4k
2ac8a444ee Fix pushing pushables into bridges 
Swapped pushable_info function for a simple #define
 2021-01-18 13:41:59 +01: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
7bbb65581a Implement virtual rooms into floordata 2021-01-06 17:53:13 -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
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
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
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
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
asasas9500
e1ff9ba698 Merge branch 'master' into NewTRMath 2020-11-14 16:19:45 -03:00
asasas9500
e4ced0d520 Fix raising blocks height 2020-11-14 14:35:27 -03:00
Montagna Marco
880c4af49e Raising blocks now have automatic height and not hardcoded anymore 2020-11-14 16:07:11 +01:00
asasas9500
67396cfe43 Finish merge 2020-11-11 16:28:05 -03:00
asasas9500
b110c32199 Merge branch 'master' into NewTRMath 2020-11-11 16:09:33 -03:00
asasas9500
e45daf7d24 Separate bridge floor and ceiling; Fix pushables 2020-11-11 15:01:45 -03:00
Montagna Marco
ac4b8b9fb8 Fixed climbable pushables 2020-11-07 18:52:33 +01:00
asasas9500
9ccd83269b Fix compile 2020-11-04 12:07:53 -03:00
asasas9500
2df3f39d4c Merge branch 'master' into NewTRMath 2020-11-04 11:51:17 -03:00
Montagna Marco
56bc2dc39f Climbable pushables beta; AlterFloorHeight (onli for floor) 2020-11-01 07:51:11 +01:00
Woops
551bcd5ebe bitshifts be gone 2020-10-17 23:36:06 -05:00
Montagna Marco
743c0e12c3 Restored TR5 pushables 2020-10-17 17:04:39 +02:00
asasas9500
5bed19f999 Remove W2V_SHIFT, W2V_SCALE, WALL_SHIFT and NODE_SHIFT 2020-10-14 20:53:59 -03:00
Sezz
dda01d145f Pushables: substitute hardcoded floor values with constants, test functions return bool. 2020-10-07 02:55:17 +11:00
asasas9500
6fc9bd9890 Fix phd_sin() and phd_cos() 2020-10-05 22:24:57 -03:00
Montagna Marco
c87586a64a Working on climbable pushables 2020-09-07 20:01:28 +02:00
asasas9500
764f9a93de Merge branch 'master' into NoShifts 2020-08-25 20:28:18 -03:00
Woops
0a99a9e2a2 add comment 2020-08-24 18:39:50 -05:00
Woops
3d8bf45181 slightly better things 2020-08-24 18:19:58 -05:00
Woops
db8124dea2 better things 2020-08-24 18:01:12 -05:00