Lwmte
b6e0131053
Fix merge
2021-09-14 12:14:33 +03:00
Lwmte
7d17cce5df
Merge branch 'coll_info_reorganize' into sky_fix
2021-09-14 12:08:05 +03:00
Lwmte
083776ab78
Move sky out of renderer
2021-09-14 12:05:36 +03:00
Lwmte
b235db5ac0
Merge branch 'master' into coll_info_reorganize
2021-09-14 08:48:36 +03:00
MontyTRC
4f527f9b9b
Merge branch 'master' into displaystrings
2021-09-14 05:11:43 +02:00
Lwmte
1d5c841bf3
Use different sprites for left/right foot
2021-09-14 01:22:08 +03:00
Lwmte
40b4d8e51e
Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type
2021-09-13 23:15:02 +03:00
Lwmte
0340071cb3
Move FireCrossbowFromLasersight to lara_one_gun.cpp
2021-09-13 11:43:36 +03:00
Lwmte
63c215bea7
Move PlaySoundTrack to sound code
2021-09-13 11:16:48 +03:00
Lwmte
1df2234c4e
Demagic NO_LOS_ITEM
2021-09-13 10:22:00 +03:00
Lwmte
8fadb92950
Merge branch 'master' into sky_fix
2021-09-13 09:50:25 +03:00
Lwmte
77ef567be4
CheckNoColFloorTriangle enum
2021-09-13 03:20:53 +03:00
Lwmte
50030b9f51
Rename remaining legacy fields in FLOOR_INFO
2021-09-13 02:51:52 +03:00
Lwmte
202bf42a12
Rename box
2021-09-13 02:46:48 +03:00
Lwmte
9554f8741a
Rename some legacy fields, restore footsteps
2021-09-13 02:07:42 +03:00
Lwmte
4ff29416e1
Fix CheckNoColTriangle functions
2021-09-13 00:23:55 +03:00
Lwmte
0fd07f11dc
Remove skyRoom/pitRoom
2021-09-11 23:50:54 +03:00
Lwmte
c67290bc30
Update control.cpp
2021-09-11 22:55:40 +03:00
Lwmte
55287a99da
Remove all floordata legacy code
2021-09-11 22:41:25 +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
fa9f75cadf
Merge branch 'static_mesh_fixes' into sky_fix
2021-09-10 18:43:12 +03:00
Lwmte
cddff14e21
Merge branch 'coll_info_reorganize' into static_mesh_fixes
2021-09-10 18:29:41 +03:00
Lwmte
16a25c04e6
Calculate tilt and slopes from new floordata
2021-09-10 18:13:40 +03:00
Lwmte
eecdb638af
Merge branch 'master' into sky_fix
2021-09-10 14:04:00 +03:00
Lwmte
8d2292c2c8
Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type
2021-09-10 13:49:45 +03:00
Lwmte
ff6b52b754
Move all sky stuff to renderer
2021-09-09 13:30:49 +03:00
Lwmte
4186dfe685
Merge branch 'master' into item_data
2021-09-09 11:10:25 +03:00
Lwmte
7f5dceef0c
Further organizing
2021-09-08 18:31:35 +03:00
Lwmte
9af21e3146
Further code organizing
2021-09-08 18:19:06 +03:00
Lwmte
2bee1df81a
Move all effect source files to separate directory, rename effect2 to effects
2021-09-08 18:07:48 +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
e8f6c1fd54
Replace all magic numbers with mesh flags
2021-09-08 15:01:19 +03:00
Troye
f9a5e01a15
use SECTOR instead of WALL_SHIFT
2021-09-08 03:01:32 -05:00
Nils
0af567b7fd
Removed BaddieSlots
...
ActiveCreatures now contains pointers to CREATURE_INFOs of items instead
Every Item with Creature Info now contains their own path finding data.
Fixed OoB issues with XZ_GET_SECTOR
2021-09-03 09:37:42 +02: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
hispidence
62ca97839d
Merge branch 'master' into displaystrings
2021-08-30 18:44:21 +01:00
Lwmte
e879038220
Fix namespace case
2021-08-30 18:03:21 +03:00
Lwmte
aae46a5f3f
Move some more stuff to trigger.cpp
2021-08-30 17:52:38 +03:00
Lwmte
d2f4576b27
Move trigger functions into separate file
2021-08-30 17:50:32 +03:00
Lwmte
56c71d1fe6
Separate volume code from TestTriggers, fix DoRayBox bounds
2021-08-30 15:35:00 +03:00
Lwmte
c04afb30fe
Fix copypaste bug
2021-08-30 11:02:33 +03: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
hispidence
b7354c16f7
Add hopefully-temporary constexpr so that if I have to multiply by a pretend resolution at least it's not via magic numbers.
2021-08-29 21:08:07 +01:00
Nils
2ec9b40f8c
Cleaned up several buffers to use fixed arrays
...
Removed game_malloc
TODO: DOOR_DATA destructor crashes
2021-08-29 16:35:19 +02:00
