Lwmte
8d86c2e97d
Rename draw.cpp to animation.cpp which makes more sense, some more edits
2021-09-16 05:06:03 +03:00
Lwmte
1d0ceb0ff4
Fix more stuff
2021-09-16 01:12:19 +03:00
Lwmte
68923228dd
Remove unused globals and move others from control.cpp to needed source files
2021-09-15 21:09:09 +03:00
Lwmte
d272d44d29
Remove reading of avg floor/height values
2021-09-14 14:46:19 +03:00
Lwmte
798b54680e
Replace usage of legacy average floor/ceiling values
2021-09-14 14:38:59 +03:00
Lwmte
17ff197dc7
Merge branch 'coll_info_reorganize' into sky_fix
2021-09-14 12:08:05 +03:00
Lwmte
a2dd7e52e5
Merge branch 'master' into coll_info_reorganize
2021-09-14 08:48:36 +03:00
MontyTRC89
88de21198a
Merge branch 'master' into displaystrings
2021-09-14 05:11:43 +02:00
Lwmte
eb2f33217c
Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type
2021-09-13 23:15:02 +03:00
Lwmte
b8bb8562a3
Merge branch 'master' into sky_fix
2021-09-13 09:50:25 +03:00
Lwmte
dc6c3fa72d
Rename remaining legacy fields in FLOOR_INFO
2021-09-13 02:51:52 +03:00
Lwmte
28aeceac98
Rename box
2021-09-13 02:46:48 +03:00
Lwmte
a8e128bc0b
Rename some legacy fields, restore footsteps
2021-09-13 02:07:42 +03:00
Lwmte
bbf93167e0
Remove skyRoom/pitRoom
2021-09-11 23:50:54 +03:00
Lwmte
aad027c675
Re-enable TR1-2 moving camera
2021-09-11 18:59:14 +03:00
Lwmte
744325bea2
Revert "Fix regressions"
...
This reverts commit c1fc33ab52
2021-09-11 10:13:04 +03:00
Lwmte
c1fc33ab52
Fix regressions
2021-09-11 09:41:29 +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
86d585263e
Merge branch 'static_mesh_fixes' into sky_fix
2021-09-10 18:43:12 +03:00
Lwmte
42a6e45bca
Merge branch 'master' into sky_fix
2021-09-10 14:04:00 +03:00
Lwmte
f8d9edeb81
Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type
2021-09-10 13:49:45 +03:00
Lwmte
62e4f2cdc5
Rename MiscTextures to SkyTexture
2021-09-09 13:39:25 +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
MontyTRC89
139d777cb2
Removed TR5 doors code; Added OCB for underwater switches; Small fixes to doors;
2021-09-06 05:27:27 +02:00
MontyTRC89
d5ea0becf1
Refactored doors in multiple files
2021-09-05 06:05:00 +02:00
Raildex
dce3f72d99
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
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
hispidence
af4fa26a2c
Merge branch 'master' into displaystrings
2021-08-30 18:44:21 +01:00
Raildex
e7f2632c99
Fixed Door crashes by doing a simple copy of the floor data instead of memcpy
...
Using resize() insteaad of clear() for vectors in LEVEL to force a deallocation
2021-08-30 17:28:26 +02:00
Lwmte
6d9cf3c214
Fix namespace case
2021-08-30 18:03:21 +03:00
Raildex
44c454318f
Cleaned up several buffers to use fixed arrays
...
Removed game_malloc
TODO: DOOR_DATA destructor crashes
2021-08-29 16:35:19 +02:00
Raildex
2621fa8f0d
Fixed More Include Hell
2021-08-28 13:27:58 +02:00
hispidence
6cf9120415
AddLuaName* -> AddName
2021-08-27 18:49:14 +01:00
Lwmte
ec9479860f
Merge branch 'master' into legacy_trigger_refactor
2021-08-24 19:04:54 +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
Lwmte
48aefdeee6
First commit
2021-08-20 02:01:50 +03:00
hispidence
9df901ec1f
Remove ResetHub; as it's almost certainly going to be made obsolete with the new scripts and save game rework.
2021-08-09 00:07:08 +01:00
Lwmte
f9831ee892
Add support for sphere volumes
2021-08-05 15:46:03 +03:00
Lwmte
316102fa33
Update level.cpp
2021-08-05 14:51:15 +03:00
Lwmte
95d5f5853e
Fix GetSpheres some more, fix cameras/sinks/AI objects/sound sources not cleaning on reload
2021-08-03 13:23:51 +03:00
Lwmte
57937f1d15
Fix several silly mistakes with std::vector
2021-08-03 01:30:44 +03:00
Lwmte
5563bbf990
Add refraction vertex attribute, separate attribs into separate normalized float values
2021-07-31 18:51:38 +03:00
Lwmte
f099fc69b4
Implement per-vertex effects for rooms and objects
2021-07-30 20:55:03 +03:00
hispidence
831a0f7e8e
Change mesh loading to use emplace_back.
...
Change some remaining vector::back calls to use the already-existing references.
2021-07-24 19:14:23 +01:00
hispidence
8c85446365
Clean up a load of warnings and possible errors:
...
Fix buffer from char*[255] to char[255]. This also allows us to avoid the C-style cast to char const *.
Remove original push_back call to g_Level.SoundSources which I left in by accident.
Use string constructor which takes pointer to first char and pointer to last char + 1. This removes the need to zero the memory (the calls were generating warnings about accessing buffer[256] when buffer is only 255 elements) and also gets rid of warning C6054 about string possibly not being zero-terminated.
Change calls to push_back and back with an emplace_back. Aside from being shorter and slightly more efficient, it gets rid of warning C26444 (about creating local variables with no name).
2021-07-24 19:08:17 +01:00
hispidence
783d344185
Add SOUND_SOURCE_INFO and AI_OBJECT names when loading in the level data. Implement remaining functions on the GameLogicScript side.
2021-07-24 12:45:33 +01:00
hispidence
f9ae0046c6
Add AddLuaNameSink, RemoveLuaNameSink, and GetSinkByName.
...
Make a template that all GetXByName member functions work off, to reduce copypasted functions.
For consistency, rename RemoveLuaName and AddLuaName to RemoveLuaNameItem and AddLuaNameItem.
Fix some documentation comments, order function documentation into sections.
2021-07-23 16:02:30 +01:00
hispidence
171d427d77
Change ReadRooms to push back the ROOM_INFO to g_Level.Rooms first, and then working on the reference. This means that the MESH_INFO reference that gets added to the mesh-name table correctly refers to the copy that sits in the vector of an element of g_Level.Rooms and not a local copy that goes out of scope before the end of the function. It also makes loading about 50ms faster.
2021-07-23 02:41:39 +01:00
hispidence
a94893516b
Call AddLuaNameCamera when loading a level to add a reference to the camera to the name-camera map.
2021-07-23 02:12:12 +01:00
