Commit graph

37 commits

Author SHA1 Message Date
Lwmte
015815c5d3 Fix embedding into diagonal walls and steps, fix Lara freeze on triangle slopes 2021-09-17 22:55:09 +03:00
Lwmte
e6a0760202 Fix clamp bugs 2021-09-17 15:46:52 +03:00
Lwmte
5ae79a461e Remove legacy RoomBelow/Above helper funcs, fix door offset 2021-09-17 15:32:55 +03:00
Lwmte
dc6d87d26d Fix CheckNoColTriangle functions 2021-09-13 00:23:55 +03:00
Lwmte
bbf93167e0 Remove skyRoom/pitRoom 2021-09-11 23:50:54 +03:00
Lwmte
2867ca0bee Calculate tilt and slopes from new floordata 2021-09-10 18:13:40 +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
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
Raildex
f7080f56c9 Integrated ITEM_DATA into ITEM_INFO
TODO: See what happens with ENEMY_JEEP
2021-08-29 16:11:03 +02: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
MontyTRC89
9d0f90df97 Merge remote-tracking branch 'origin/TwoBlockPlatformsBroken' 2021-06-05 05:35:46 +02:00
wolfcheese
d7bdf9a7b2 ceiling sector plane fixes 2021-06-04 10:13:59 -04:00
wolfcheese
952b27f932 Fixed plane selection for split ceilings 2021-06-03 23:19:38 -04:00
asasas9500
5541f21bd0 Fix two blocks platform 2021-06-02 16:59:30 -03:00
asasas9500
69c3fb9e4d Fix clamping; Fix portals 2021-01-27 15:46:58 -03:00
asasas9500
4b480d8057 Reimplement virtual rooms into floordata 2021-01-27 01:04:31 -03:00
asasas9500
8ac4a1fa48 Fix bridges inconsistency 2021-01-07 17:47:09 -03:00
asasas9500
358e9e42fd Make Lara aware of virtual rooms 2021-01-07 11:16:21 -03:00
asasas9500
2917bd9997 Implement virtual rooms into floordata 2021-01-06 17:53:13 -03:00
asasas9500
7a2c3c5404 Simplify main floordata functions 2021-01-03 15:21:32 -03:00
asasas9500
10a3d9167a Fix line endings 2020-12-21 13:16:29 -03:00
asasas9500
23a841a3da Fix stacked bridges 2020-12-20 14:04:27 -03:00
asasas9500
82d9dc4bea Separate bridge floor and ceiling; Fix pushables 2020-11-11 15:01:45 -03:00
asasas9500
543ec74272 Improve new floordata static functions; Rework bridges 2020-11-10 22:31:29 -03:00
asasas9500
2d42506c14 Fix new floordata smartness 2020-10-14 20:01:20 -03:00
asasas9500
c252205ca6 Add more bridge slots; Allow optional floor and ceiling overriding 2020-09-28 21:01:16 -03:00
asasas9500
f88f2db915 Improve GetRoom() 2020-09-22 23:38:48 -03:00
asasas9500
5f025c9cb5 Add support for bridges 2020-09-21 23:59:57 -03:00
asasas9500
55e8224165 Fix wall portals 2020-09-20 23:16:21 -03:00
asasas9500
4476d12b5c Fix first bugs in new floordata 2020-09-19 20:09:57 -03:00
asasas9500
8c32187061 Finish new floordata 2020-09-19 01:29:52 -03:00
asasas9500
44326541be Implement new floordata 2020-09-18 23:11:04 -03:00
asasas9500
04b1d7536e Add more floordata functions 2020-09-17 00:08:10 -03:00
asasas9500
d954da48d2 Add new floordata functions 2020-09-15 11:01:24 -03:00
asasas9500
dbdba8d2df New floordata prototype 2020-09-14 00:19:05 -03:00