Nils
|
01bf1881b3
|
Fixed duplicated ITEM_INFO definition
|
2021-09-24 07:53:42 +02:00 |
|
Lwmte
|
afa0504c6c
|
Move around some files
|
2021-09-19 23:41:26 +03:00 |
|
Lwmte
|
a5848984f7
|
Move anim structs to animation.h
|
2021-09-19 18:29:25 +03:00 |
|
Lwmte
|
f8c2fc3895
|
Swap BadHeightUp/Down
|
2021-09-19 17:48:32 +03:00 |
|
Lwmte
|
6b7d805abb
|
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
|
db65488979
|
Unhack GetCollisionInfo a bit
|
2021-09-19 04:11:55 +03:00 |
|
Lwmte
|
8671e25d92
|
Update lara_basic.cpp
|
2021-09-18 03:24:03 +03:00 |
|
Lwmte
|
9538b5fecf
|
Update lara_basic.cpp
|
2021-09-18 03:06:21 +03:00 |
|
Lwmte
|
ef572cdd9d
|
Update lara_basic.cpp
|
2021-09-18 01:56:06 +03:00 |
|
Lwmte
|
c0b6753b5b
|
Reorder lara_as_stop to avoid lockups
|
2021-09-18 00:36:28 +03:00 |
|
Lwmte
|
5cfbc3a487
|
Fix embedding into diagonal walls and steps, fix Lara freeze on triangle slopes
|
2021-09-17 22:55:09 +03:00 |
|
Lwmte
|
99ab563ee7
|
Rename draw.cpp to animation.cpp which makes more sense, some more edits
|
2021-09-16 05:06:03 +03:00 |
|
Lwmte
|
82df41d333
|
Fix jumping into objects
|
2021-09-14 11:09:29 +03:00 |
|
Lwmte
|
9846fff93a
|
TestLaraWall
|
2021-09-14 00:41:11 +03:00 |
|
Lwmte
|
54e28f668a
|
Fix jump delay
|
2021-09-14 00:35:10 +03:00 |
|
Lwmte
|
75b6f61baa
|
Make order to lara_tests naming
|
2021-09-14 00:30:44 +03:00 |
|
KrysB4k
|
00bb7b29f3
|
Removed remnants of bad ideas
Removed SplitFloor and SplitCeiling completely from affected source files
|
2021-09-13 20:19:33 +02:00 |
|
Lwmte
|
c226821bc6
|
Rename DeathIsPit to be more descriptive
|
2021-09-13 09:55:54 +03:00 |
|
Lwmte
|
38123d850d
|
Remove global
|
2021-09-13 09:19:35 +03:00 |
|
Lwmte
|
080b295c42
|
Merge branch 'master' into coll_info_reorganize
|
2021-09-11 10:13:37 +03:00 |
|
Lwmte
|
37d648cfd0
|
Revert "Fix regressions"
This reverts commit 7faf1fb02a.
|
2021-09-11 10:13:04 +03:00 |
|
Lwmte
|
742814c76f
|
Merge branch 'master' into coll_info_reorganize
|
2021-09-11 09:44:43 +03:00 |
|
Lwmte
|
7faf1fb02a
|
Fix regressions
|
2021-09-11 09:41:29 +03:00 |
|
Lwmte
|
bc5569967d
|
Merge branch 'master' into coll_info_reorganize
|
2021-09-11 09:35:04 +03:00 |
|
MontyTRC89
|
865202b33c
|
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
|
c96fbcff53
|
Demagic stepup height
|
2021-09-10 14:24:51 +03:00 |
|
Lwmte
|
7fe7d7edd3
|
Simplify GetCollisionInfo arguments
|
2021-09-10 12:14:28 +03:00 |
|
Lwmte
|
e509290192
|
Merge branch 'master' into coll_info_reorganize
|
2021-09-10 10:11:15 +03:00 |
|
Lwmte
|
e41e7eb502
|
Demagic some fields
|
2021-09-10 01:19:15 +03:00 |
|
Lwmte
|
8136b41f42
|
Simplify COLL_POSITION
|
2021-09-10 00:43:26 +03:00 |
|
Lwmte
|
8728405870
|
Rename settings to setup
|
2021-09-10 00:20:59 +03:00 |
|
Lwmte
|
26957e806e
|
Reorganize COLL_INFO
|
2021-09-10 00:18:47 +03:00 |
|
Lwmte
|
4186dfe685
|
Merge branch 'master' into item_data
|
2021-09-09 11:10:25 +03:00 |
|
Lwmte
|
9af21e3146
|
Further code organizing
|
2021-09-08 18:19:06 +03:00 |
|
Lwmte
|
05194dd6a2
|
Merge branch 'new_objects_collision'
|
2021-09-08 17:46:30 +03:00 |
|
Lwmte
|
dcb0ce198c
|
More reasonable name for splat flag
|
2021-09-08 17:44:24 +03:00 |
|
MontyTRC
|
60e81f29d8
|
Merge pull request #328 from MontyTRC89/new_objects_collision
Solid statics collision
|
2021-09-08 16:44:01 +02:00 |
|
Lwmte
|
9ec632f5d8
|
Add splat animation if static bounds are taller than Lara headroom
|
2021-09-08 16:14:13 +03:00 |
|
Lwmte
|
43fdc58235
|
Remove unused hitCeiling flag
|
2021-09-08 15:59:22 +03:00 |
|
Nils
|
7f774d04b3
|
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
|
6aabe62297
|
revert to bitshits in Game folder; handle lack of inv objects;
|
2021-08-30 15:13:18 -05:00 |
|
Lwmte
|
e2e20a2497
|
Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug
|
2021-08-29 23:53:58 +03:00 |
|
Nils
|
58eda862e3
|
Fixed More Include Hell
|
2021-08-28 13:27:58 +02:00 |
|
Lwmte
|
0606941aef
|
Remove more magic
|
2021-08-26 13:47:47 +03:00 |
|
Lwmte
|
bcf1fbc6d4
|
Remove magic numbers from GetCollisionInfo
|
2021-08-26 13:06:24 +03:00 |
|
Lwmte
|
c0cb6ae37c
|
Organize COLL_INFO
|
2021-08-25 06:54:17 +03:00 |
|
Lwmte
|
0b8ca4fa54
|
Replace all remaining occurences of coll globals
|
2021-08-24 16:54:26 +03:00 |
|
Troye
|
1cf0aef90d
|
Add more anims to NewAnims; Fix lean
|
2021-07-09 19:41:56 -05:00 |
|
wolfcheese
|
015f9d7cc1
|
Prevent crouching from overriding lasersight
|
2021-06-09 18:28:25 -04:00 |
|
Trxye
|
9728282c14
|
comment feet hanging
|
2021-06-02 13:24:17 -05:00 |
|