Lwmte
280c9fa28b
Merge branch 'master' into coll_info_reorganize
2021-09-10 10:11:15 +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
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
Raildex
2ee57e5891
Renamed "generalPtr" of LaraInfo to "interactedItem"
...
All code that cast it to ITEM_INFO* was converted to a separate access into g_Level.Items
2021-09-05 11:20:51 +02:00
Raildex
31ec83f9cc
Merge branch 'master' into item_data
...
# Conflicts:
# TR5Main/Game/items.cpp
2021-09-04 11:52:34 +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
522b41d1d6
Clarify function names
...
# Conflicts:
# TR5Main/Game/collide.cpp
2021-09-02 19:49:07 +02:00
Raildex
b422cafc79
Merge branch 'master' into item_data
...
# Conflicts:
# TR5Main/Game/Lara/lara.cpp
# TR5Main/Game/Lara/lara_collide.cpp
# TR5Main/Game/Lara/lara_monkey.cpp
# TR5Main/Game/Lara/lara_struct.h
# TR5Main/Game/Lara/lara_tests.cpp
# TR5Main/Game/collide.h
# TR5Main/Game/control.h
# TR5Main/Game/effect.h
# TR5Main/Game/effect2.cpp
# TR5Main/Game/flipeffect.cpp
# TR5Main/Game/floordata.h
# TR5Main/Game/hair.cpp
# TR5Main/Game/health.cpp
# TR5Main/Game/items.cpp
# TR5Main/Game/newinv2.cpp
# TR5Main/Game/spotcam.cpp
# TR5Main/Objects/Effects/tr4_bubbles.cpp
# TR5Main/Objects/TR1/Entity/tr1_ape.cpp
# TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp
# TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp
# TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp
# TR5Main/Objects/TR2/Entity/tr2_shark.cpp
# TR5Main/Objects/TR2/Entity/tr2_spider.cpp
# TR5Main/Objects/TR2/Entity/tr2_yeti.cpp
# TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
# TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp
# TR5Main/Objects/TR3/Entity/tr3_monkey.cpp
# TR5Main/Objects/TR3/Entity/tr3_raptor.cpp
# TR5Main/Objects/TR3/Entity/tr3_scuba.cpp
# TR5Main/Objects/TR3/Entity/tr3_trex.cpp
# TR5Main/Objects/TR3/Vehicles/kayak.cpp
# TR5Main/Objects/TR3/Vehicles/minecart.cpp
# TR5Main/Objects/TR4/Entity/tr4_bat.cpp
# TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
# TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp
# TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
# TR5Main/Objects/TR4/Entity/tr4_dog.cpp
# TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp
# TR5Main/Objects/TR4/Entity/tr4_harpy.cpp
# TR5Main/Objects/TR4/Entity/tr4_mutant.cpp
# TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp
# TR5Main/Objects/TR4/Entity/tr4_troops.cpp
# TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp
# TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
# TR5Main/Objects/TR4/Vehicles/motorbike.cpp
# TR5Main/Objects/TR5/Entity/tr5_doberman.cpp
# TR5Main/Objects/TR5/Entity/tr5_imp.cpp
# TR5Main/Objects/TR5/Entity/tr5_larson.cpp
# TR5Main/Objects/TR5/Entity/tr5_lion.cpp
# TR5Main/Objects/TR5/Entity/tr5_reaper.cpp
# TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
# TR5Main/Objects/TR5/Object/tr5_rollingball.cpp
# TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp
# TR5Main/Renderer/Renderer11Draw2D.cpp
# TR5Main/Specific/input.cpp
# TR5Main/Specific/level.cpp
# TR5Main/TombEngine.vcxproj.filters
2021-08-31 18:20:23 +02: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
Raildex
f7080f56c9
Integrated ITEM_DATA into ITEM_INFO
...
TODO: See what happens with ENEMY_JEEP
2021-08-29 16:11:03 +02:00
Raildex
2621fa8f0d
Fixed More Include Hell
2021-08-28 13:27:58 +02:00
Lwmte
968df0ed59
Remove OnObject global
2021-08-27 19:29:18 +03:00
Lwmte
7d4fde9942
Cleanup a bit more
2021-08-26 19:55:34 +03:00
Lwmte
5ace1a4c34
Rename effect.cpp to flipeffect.cpp to avoid confusions
2021-08-26 16:24:43 +03:00
Lwmte
b2831172af
Make flipeffect names consistent
2021-08-26 16:11:04 +03:00
Lwmte
b8c3b67f10
Move collision and FX functions from effect.cpp
2021-08-26 15:54:52 +03:00
Lwmte
1f68fd812b
Simplify TestTriggers by providing overloads
2021-08-26 12:12:05 +03:00
Lwmte
3378c8791a
Organize COLL_INFO
2021-08-25 06:54:17 +03:00
Lwmte
ec9479860f
Merge branch 'master' into legacy_trigger_refactor
2021-08-24 19:04:54 +03:00
Lwmte
70626854f0
Replace all remaining occurences of coll globals
2021-08-24 16:54:26 +03:00
Lwmte
1828ddaeab
Replace all direct occurences of TestTriggers with TestTriggersAtXYZ and references to TriggerIndex global in structs
2021-08-20 14:13:06 +03:00
MontyTRC89
0ed8181cda
Merge branch 'master' of https://github.com/MontyTRC89/TombEngine ; Renamed namespaces;
...
# Conflicts:
# TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
hispidence
53b971c033
Remove 'typedef' from enums and structs. This was required in C, but in C++ all it does is generate thousands of warnings.
2021-07-18 15:22:15 +01:00
MontyTRC89
a4d3ec9d26
Switched audio tracks from int index to string; Added Tracks.lua loading support;
2021-06-26 07:36:54 +02:00
asasas9500
f5d5070373
Improve expanding platform
2021-06-17 20:13:28 -03:00
wolfcheese
8da8973f19
Added checks to raising block, pushable block, floor and ceiling trapdoors to prevent crashing upon load
2021-06-15 19:48:30 -04:00
wolfcheese
4301289df4
Updates to expanding platform
2021-06-15 10:43:13 -04:00
wolfcheese
b9e9971a35
Added height check to expanding_platform based on its animation
2021-06-13 11:34:46 -04:00
wolfcheese
077766d662
Twoblockplatform ceiling adjusted to allow tall blocks to enter underneath. GetCollidingObjects no longer finds objects under the colliding item's floor
2021-06-07 12:03:53 -04:00
MontyTRC89
95b4ee4ca0
Fixed ID_ROLLINGBALL
2021-06-05 06:03:12 +02:00
asasas9500
5541f21bd0
Fix two blocks platform
2021-06-02 16:59:30 -03:00
MontyTRC89
b2f146922d
Fixed ID_MUMMY init; Bugged 2 blocks platform;
2021-06-01 13:02:05 +02:00
MontyTRC89
b2f102ae63
Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall;
2021-05-26 06:04:32 +02:00
asasas9500
6eb1a5e963
Merge branch 'master' into PushableOCB
2021-02-06 11:50:08 -03:00
KrysB4k
cf3b4a327e
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
81fcbc377e
Tiny fix
2021-02-04 02:01:29 +01:00
KrysB4k
04d6023abb
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
4044552c94
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
9bee5d49ed
Adjust calls to AddBridge and RemoveBridge in pushables
2021-02-01 17:29:33 +01:00
asasas9500
393e6a4b27
Fix body part; Fix lara_col_all4s()
2021-01-29 01:14:20 -03:00
asasas9500
7f7db2a31d
Fix raising block
2021-01-27 22:26:47 -03:00
asasas9500
bfd35bbfc4
Merge branch 'PushableOCB' of https://github.com/MontyTRC89/TR5Main into PushableOCB
2021-01-27 01:12:04 -03:00
asasas9500
4b480d8057
Reimplement virtual rooms into floordata
2021-01-27 01:04:31 -03:00
KrysB4k
6901faae3d
Fix pushing pushables into bridges
...
Swapped pushable_info function for a simple #define
2021-01-18 13:41:59 +01:00
