Lwmte
798b54680e
Replace usage of legacy average floor/ceiling values
2021-09-14 14:38:59 +03: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
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
b2831172af
Make flipeffect names consistent
2021-08-26 16:11:04 +03: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
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
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
KrysB4k
dfdc351fe3
Merge remaining features of VirtualRooms
2021-01-16 18:38:16 +01:00
asasas9500
7604d2e1c3
Merge branch 'VirtualRooms' into PushableOCB
2021-01-16 11:39:52 -03:00
asasas9500
2917bd9997
Implement virtual rooms into floordata
2021-01-06 17:53:13 -03:00
KrysB4k
19e6277232
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
d0143c87b4
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
asasas9500
8167f6b0f4
Finish merge
2020-11-11 16:28:05 -03:00
asasas9500
8ec8decc59
Merge branch 'master' into NewTRMath
2020-11-11 16:09:33 -03:00
asasas9500
82d9dc4bea
Separate bridge floor and ceiling; Fix pushables
2020-11-11 15:01:45 -03:00
asasas9500
af70caae1f
Fix compile
2020-11-04 12:07:53 -03:00
Sezz
6a5de1fb73
Pushables: substitute hardcoded floor values with constants, test functions return bool.
2020-10-07 02:55:17 +11:00
TokyoSU
b615a98c46
(Broken) Deleted Global Folder
...
- No more enums.h, constants.h, macro.h, etc...
- moved all structure in types.h to there respective file.
2020-05-30 15:55:23 +02:00
TokyoSU
cd1d5f5482
Refactor include and moving some structure to right file
...
- started moving structure out of types.h.
- fixed ExtraAnim using 0 instead of -1.
- changed void(*)(); to function<> for lara routines.
- changed short(*)() effect to function<> for CreatureEffect/CreatureEffect2.
- renamed guardian to laserhead.
- moved some structure to their right place.
- renamed TYPE_ZONE to ZoneTypeEnum.
- fixed zoneType not using ZoneTypeEnum as variable.
- fixed LOT.zone not using ZoneEnumType.
- changed "variable : 1" to bool in some structure.
- implemented @krys new collision structure and improved it a bit (but commented for "later")
- level need #pragma pack(push, 1) #pragma pack(pop) to work (for structure), else it crash at LoadTexturesInfos().
Co-Authored-By: krys <krys@users.noreply.github.com>
2020-05-28 15:17:34 +02:00
TokyoSU
963706c3af
Partially finished Entity Folder Refactoring
...
- Less Compile Time
- ObjectInfo now use std::function.
- added isPickup and isPuzzleHole in ObjectInfo.
- Renamed EVIL_LARA to LARA_DOPPELGANGER (DOPPELGANGER in xml)
- Removed TR1 Larson/Pierre and TR1 Raptor.
2020-05-27 19:07:34 +02:00
