Sezz
|
b85b62c3d7
|
WIP improved leaning for Lara.
|
2021-09-26 12:23:58 +10:00 |
|
Lwmte
|
971d1b203f
|
Cleanup 2
|
2021-09-25 16:04:16 +03:00 |
|
Lwmte
|
e6fc5aba77
|
Cleanup
|
2021-09-25 16:00:30 +03:00 |
|
Lwmte
|
b7cf7be08c
|
Merge branch 'master' into item_info_include_fix
|
2021-09-25 15:59:51 +03:00 |
|
Lwmte
|
7432020691
|
Fix stucking on low-headroom ceiling slants
|
2021-09-25 13:35:10 +03:00 |
|
Lwmte
|
3f4ef4fd9f
|
A helper code to fix qwop
|
2021-09-25 13:00:14 +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
|
016be41f97
|
Move anim structs to animation.h
|
2021-09-19 18:29:25 +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
|
e790f47d27
|
Unhack GetCollisionInfo a bit
|
2021-09-19 04:11:55 +03:00 |
|
Lwmte
|
cb9cc584b7
|
Update lara_basic.cpp
|
2021-09-18 03:24:03 +03:00 |
|
Lwmte
|
5a806552e3
|
Update lara_basic.cpp
|
2021-09-18 03:06:21 +03:00 |
|
Lwmte
|
fe5c1cea3d
|
Update lara_basic.cpp
|
2021-09-18 01:56:06 +03:00 |
|
Lwmte
|
859dab58a9
|
Reorder lara_as_stop to avoid lockups
|
2021-09-18 00:36:28 +03:00 |
|
Lwmte
|
015815c5d3
|
Fix embedding into diagonal walls and steps, fix Lara freeze on triangle slopes
|
2021-09-17 22:55:09 +03:00 |
|
Lwmte
|
8d86c2e97d
|
Rename draw.cpp to animation.cpp which makes more sense, some more edits
|
2021-09-16 05:06:03 +03:00 |
|
Lwmte
|
ededdc0c1d
|
Fix jumping into objects
|
2021-09-14 11:09:29 +03:00 |
|
Lwmte
|
4851214aa4
|
TestLaraWall
|
2021-09-14 00:41:11 +03:00 |
|
Lwmte
|
bb06f17fe2
|
Fix jump delay
|
2021-09-14 00:35:10 +03:00 |
|
Lwmte
|
7852f2fa8e
|
Make order to lara_tests naming
|
2021-09-14 00:30:44 +03:00 |
|
KrysB4k
|
7ff79f8da1
|
Removed remnants of bad ideas
Removed SplitFloor and SplitCeiling completely from affected source files
|
2021-09-13 20:19:33 +02:00 |
|
Lwmte
|
d8ab386840
|
Rename DeathIsPit to be more descriptive
|
2021-09-13 09:55:54 +03:00 |
|
Lwmte
|
233b35f3cc
|
Remove global
|
2021-09-13 09:19:35 +03:00 |
|
Lwmte
|
47ecaae5b0
|
Merge branch 'master' into coll_info_reorganize
|
2021-09-11 10:13:37 +03:00 |
|
Lwmte
|
744325bea2
|
Revert "Fix regressions"
This reverts commit c1fc33ab52.
|
2021-09-11 10:13:04 +03:00 |
|
Lwmte
|
6372443766
|
Merge branch 'master' into coll_info_reorganize
|
2021-09-11 09:44:43 +03:00 |
|
Lwmte
|
c1fc33ab52
|
Fix regressions
|
2021-09-11 09:41:29 +03:00 |
|
Lwmte
|
cbf22aa649
|
Merge branch 'master' into coll_info_reorganize
|
2021-09-11 09:35:04 +03:00 |
|
MontyTRC89
|
8db7df3868
|
Merge branch 'doors_refactoring'
# Conflicts:
# TR5Main/Game/door.cpp
# TR5Main/Game/door.h
# TR5Main/Game/memory/malloc.cpp
# TR5Main/Objects/Generic/Switches/cog_switch.cpp
# TR5Main/Objects/Generic/Switches/crowbar_switch.cpp
# TR5Main/Objects/Generic/Switches/generic_switch.h
# TR5Main/Objects/Generic/Switches/turn_switch.cpp
# TR5Main/Objects/TR4/Object/tr4_obelisk.cpp
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/Specific/level.cpp
# TR5Main/TombEngine.vcxproj
# TR5Main/TombEngine.vcxproj.filters
|
2021-09-11 05:38:26 +02:00 |
|
Lwmte
|
80cfc1739a
|
Demagic stepup height
|
2021-09-10 14:24:51 +03:00 |
|
Lwmte
|
2f3af7e3ea
|
Simplify GetCollisionInfo arguments
|
2021-09-10 12:14:28 +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
|
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
|
ba6c260b92
|
Further code organizing
|
2021-09-08 18:19:06 +03:00 |
|
Lwmte
|
7cd4645c6f
|
Merge branch 'new_objects_collision'
|
2021-09-08 17:46:30 +03:00 |
|
Lwmte
|
76a0365f4f
|
More reasonable name for splat flag
|
2021-09-08 17:44:24 +03:00 |
|
MontyTRC89
|
714e0a5ca2
|
Merge pull request #328 from MontyTRC89/new_objects_collision
Solid statics collision
|
2021-09-08 16:44:01 +02:00 |
|
Lwmte
|
3b45f66463
|
Add splat animation if static bounds are taller than Lara headroom
|
2021-09-08 16:14:13 +03:00 |
|
Lwmte
|
15bd790230
|
Remove unused hitCeiling flag
|
2021-09-08 15:59:22 +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 |
|
Troye
|
84cc6d9c7f
|
revert to bitshits in Game folder; handle lack of inv objects;
|
2021-08-30 15:13:18 -05: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
|
2621fa8f0d
|
Fixed More Include Hell
|
2021-08-28 13:27:58 +02:00 |
|