Lwmte
|
7bc95c7fee
|
Merge branch 'master' into arbitrary_hanging_and_shimmying
|
2021-10-28 12:23:34 +03:00 |
|
Lwmte
|
998add5815
|
Don't fall off the monkey if next sector isn't monkey
|
2021-10-28 03:45:18 +03:00 |
|
Lwmte
|
ef0bcf950a
|
Merge branch 'master' into errors
|
2021-10-08 16:47:59 +03:00 |
|
Troye
|
09de3c560f
|
Don't fall off monkeyswing while turning
|
2021-10-05 11:54:26 -05:00 |
|
Troye
|
552352dd21
|
W1
|
2021-09-25 16:03:28 -05:00 |
|
Lwmte
|
e6fc5aba77
|
Cleanup
|
2021-09-25 16:00:30 +03:00 |
|
Raildex
|
2b0b1ff282
|
Added newlines
|
2021-09-25 11:27:47 +02:00 |
|
Raildex
|
7b070e75ad
|
Fixed duplicated ITEM_INFO definition
|
2021-09-24 07:53:42 +02:00 |
|
Lwmte
|
cefc60c7ea
|
Move around some files
|
2021-09-19 23:41:26 +03:00 |
|
Lwmte
|
add6629267
|
Swap BadHeightUp/Down
|
2021-09-19 17:48:32 +03:00 |
|
Lwmte
|
b3898b7940
|
Embed height data into COLL_INFO, fix issues with rolling under statics and statics submerged into water
|
2021-09-19 06:42:24 +03:00 |
|
Lwmte
|
7852f2fa8e
|
Make order to lara_tests naming
|
2021-09-14 00:30:44 +03:00 |
|
Lwmte
|
2f3af7e3ea
|
Simplify GetCollisionInfo arguments
|
2021-09-10 12:14:28 +03:00 |
|
Lwmte
|
a016b4244e
|
Demagic monkey collision height
|
2021-09-10 11:08:20 +03:00 |
|
Lwmte
|
280c9fa28b
|
Merge branch 'master' into coll_info_reorganize
|
2021-09-10 10:11:15 +03:00 |
|
Lwmte
|
3cc0c21946
|
Demagic some fields
|
2021-09-10 01:19:15 +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 |
|
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 |
|
Lwmte
|
c74fd2c3da
|
Remove magic numbers from GetCollisionInfo
|
2021-08-26 13:06:24 +03:00 |
|
Lwmte
|
3378c8791a
|
Organize COLL_INFO
|
2021-08-25 06:54:17 +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 |
|
Troye
|
88407761b1
|
clean up larainfo; add anim bools'
|
2021-07-08 14:15:14 -05:00 |
|
asasas9500
|
6eb1a5e963
|
Merge branch 'master' into PushableOCB
|
2021-02-06 11:50:08 -03:00 |
|
asasas9500
|
700c1b5907
|
Remove function markers
|
2021-02-03 01:50:59 -03:00 |
|
asasas9500
|
f1fa0b39f7
|
Fix monkey swing
|
2021-01-17 17:54:52 -03:00 |
|
asasas9500
|
1693bf741d
|
Revert move angle relative to Lara rotation
|
2020-12-19 23:34:52 -03:00 |
|
Woops
|
7c6e081929
|
Lara refactor: move sliding to lara_slide, move deathslide to lara_objects, add file descriptions
|
2020-08-14 04:08:10 -05:00 |
|
Woops
|
e0b15a29c4
|
Lara refactor: move monkeyswing functions to lara_monkey
|
2020-08-09 19:18:29 -05:00 |
|