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
|
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
|
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
|
2621fa8f0d
|
Fixed More Include Hell
|
2021-08-28 13:27:58 +02:00 |
|
Lwmte
|
b8c3b67f10
|
Move collision and FX functions from effect.cpp
|
2021-08-26 15:54:52 +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
|
f65ec91756
|
Rearrange headers so generic_bridge.h sees g_Level.
|
2021-07-23 21:41:44 +01:00 |
|
wolfcheese
|
afeb234ebe
|
Missed these from the previous commit
|
2021-06-15 19:52:39 -04:00 |
|
wolfcheese
|
d83cd56a50
|
Cleaned up code for generic trapdoors
|
2021-06-12 16:39:13 -04:00 |
|
wolfcheese
|
48ccbe0d8a
|
Added bridge collision to trapdoor
|
2021-06-11 12:07:09 -04:00 |
|
asasas9500
|
4b480d8057
|
Reimplement virtual rooms into floordata
|
2021-01-27 01:04:31 -03:00 |
|
asasas9500
|
2917bd9997
|
Implement virtual rooms into floordata
|
2021-01-06 17:53:13 -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
|
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
|
543ec74272
|
Improve new floordata static functions; Rework bridges
|
2020-11-10 22:31:29 -03:00 |
|
Woops
|
17e9ce886a
|
removing more bitshifts
|
2020-10-17 13:23:01 -05:00 |
|
asasas9500
|
7218086a0f
|
Fix phd_sin() and phd_cos()
|
2020-10-05 22:24:57 -03:00 |
|
asasas9500
|
fbb3cb6c9e
|
Move trapdoor to generic objects folder
|
2020-09-29 09:53:36 -03:00 |
|
asasas9500
|
c252205ca6
|
Add more bridge slots; Allow optional floor and ceiling overriding
|
2020-09-28 21:01:16 -03:00 |
|
asasas9500
|
26a4b39b43
|
Fix bridges; Fix script IDs
|
2020-09-28 10:04:44 -03:00 |
|
asasas9500
|
c305d0bdc9
|
Commit new files
|
2020-09-27 20:48:01 -03:00 |
|