MontyTRC89
|
f1e7c6fbfc
|
All files under the same project; Renamed TR5Main to TombEngine; Cleaned repository;
|
2022-05-08 06:52:04 +02:00 |
|
MontyTRC89
|
7587d3470c
|
Merge branch 'state_cleaning_tier_2' into luarefactor
# Conflicts:
# .gitignore
# Common/Game/collision/collide_room.h
# Common/Game/control/control.h
# Common/Game/items.h
# Common/Specific/phd_global.h
# Common/Specific/trmath.h
# Scripting/src/TEN/Flow/Animations/Animations.h
# Scripting/src/TEN/Flow/FlowHandler.cpp
# Scripts/Settings.lua
# TR5Main/Game/Lara/lara.cpp
# TR5Main/Game/Lara/lara_basic.cpp
# TR5Main/Game/Lara/lara_cheat.cpp
# TR5Main/Game/Lara/lara_collide.cpp
# TR5Main/Game/Lara/lara_crawl.cpp
# TR5Main/Game/Lara/lara_helpers.cpp
# TR5Main/Game/Lara/lara_jump.cpp
# TR5Main/Game/Lara/lara_monkey.cpp
# TR5Main/Game/Lara/lara_swim.cpp
# TR5Main/Game/Lara/lara_tests.cpp
# TR5Main/Game/animation.cpp
# TR5Main/Game/camera.cpp
# TR5Main/Game/collision/collide_item.cpp
# TR5Main/Game/collision/collide_room.cpp
# TR5Main/Game/collision/floordata.cpp
# TR5Main/Game/control/control.cpp
# TR5Main/Game/control/los.cpp
# TR5Main/Game/control/volume.cpp
# TR5Main/Game/effects/hair.cpp
# TR5Main/Game/gui.cpp
# TR5Main/Game/health.cpp
# TR5Main/Game/items.cpp
# TR5Main/Game/room.cpp
# TR5Main/Game/savegame.cpp
# TR5Main/Renderer/ConstantBuffers/MiscBuffer.h
# TR5Main/Renderer/RenderPipelineState/RenderPipelineState.cpp
# TR5Main/Renderer/RenderPipelineState/RenderPipelineState.h
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/Renderer/Renderer11Frame.cpp
# TR5Main/Renderer/Renderer11Helper.cpp
# TR5Main/Renderer/Renderer11Lara.cpp
# TR5Main/Renderer/Renderer11PostProcess.cpp
# TR5Main/Renderer/Renderer11Settings.cpp
# TR5Main/Renderer/Renderer11String.cpp
# TR5Main/Renderer/RendererSprites.h
# TR5Main/Scripting/GameLogicScript.cpp
# TR5Main/Scripting/GameScriptAnimations.cpp
# TR5Main/Scripting/GameScriptItemInfo.cpp
# TR5Main/Scripting/GameScriptItemInfo.h
# TR5Main/Scripting/GameScriptMeshInfo.cpp
# TR5Main/Scripting/GameScriptPosition.cpp
# TR5Main/Specific/input.cpp
# TR5Main/Specific/level.cpp
# TR5Main/Specific/savegame/flatbuffers/ten_savegame_generated.h
# TR5Main/TombEngine.vcxproj.filters
# common/game/collision/collide_item.h
|
2022-05-05 06:28:43 +02:00 |
|
MontyTRC89
|
0704a92b55
|
Merge branch 'renderer_refactor' into luarefactor
# Conflicts:
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/Shaders/DX11_AmbientCubeMap.fx
# TR5Main/Shaders/DX11_FinalPass.fx
# TR5Main/Shaders/DX11_Hairs.fx
# TR5Main/Shaders/DX11_Inventory.fx
# TR5Main/Shaders/DX11_Items.fx
# TR5Main/Shaders/DX11_Rooms.fx
# TR5Main/Shaders/DX11_ShadowMap.fx
# TR5Main/Shaders/DX11_Sky.fx
# TR5Main/Shaders/DX11_Solid.fx
# TR5Main/Shaders/DX11_Sprites.fx
# TR5Main/Shaders/DX11_Statics.fx
# TR5Main/Specific/level.cpp
# TR5Main/Specific/winmain.cpp
# TR5Main/TombEngine.vcxproj
# TR5Main/TombEngine.vcxproj.filters
|
2022-04-17 06:06:47 +02:00 |
|
Sezz
|
503c158977
|
Refactor vector/position structs
|
2022-03-31 23:55:54 +11:00 |
|
Sezz
|
10a4e072e3
|
Revert "Tentatively refactor PHD_3DPOS"
This reverts commit 850ab149af.
|
2022-03-31 21:17:06 +11:00 |
|
Sezz
|
850ab149af
|
Tentatively refactor PHD_3DPOS
|
2022-03-31 21:14:27 +11:00 |
|
MontyTRC89
|
5ad767c6a9
|
Merge branch 'master' into renderer_refactor
|
2022-03-24 05:35:51 +01:00 |
|
Sezz
|
85df2ed1b1
|
ITEM_INFO cleanup; rename some structs to comply with TEN conventions; LaraInfo cleanup
|
2022-03-13 02:04:24 +11:00 |
|
Sezz
|
ba724f0cec
|
Cleanup
|
2022-03-10 02:27:11 +11:00 |
|
Sezz
|
59fe5e419a
|
Finish LaraInfo cleanup; general cleanup; update savegame schema
|
2022-03-10 00:29:28 +11:00 |
|
Sezz
|
b5ccf0c405
|
Lara weapon struct cleanup; general cleanup
|
2022-03-09 20:37:26 +11:00 |
|
Sezz
|
6978cb94f0
|
Refactor poison effect on Lara; LaraInfo cleanup; general cleanup; update savegame schema
|
2022-03-09 17:04:19 +11:00 |
|
Sezz
|
b4cd7d3091
|
Cleanup
|
2022-02-28 21:02:19 +11:00 |
|
MontyTRC89
|
a89eb8ec26
|
Restored setup dialog; Refactored screen resolution handling; Removed refresh rate;
|
2022-02-25 05:53:20 +01:00 |
|
Sezz
|
b18d6e24f7
|
LaraInfo cleanup; update savegame schema
|
2022-02-15 21:25:24 +11:00 |
|
Sezz
|
5713906b20
|
Refactor Lara weapon files
|
2022-02-15 17:34:17 +11:00 |
|
Sezz
|
cdb8eb5927
|
Merge branch 'master' into state_cleaning_tier_2
|
2022-02-13 20:23:09 +11:00 |
|
hispidence
|
a8f1d3b3be
|
Compile fixes. Don't be alarmed at the removal of the save vectors, they weren't connected to anything yet.
|
2022-02-10 18:35:16 +00:00 |
|
hispidence
|
a66b6cc230
|
More compile fixes. I decided to worry about getters/setters later and just allow public members to continue to be public for now.
|
2022-02-10 18:35:15 +00:00 |
|
hispidence
|
1e31dc52d5
|
More compile fixes.
|
2022-02-10 18:34:34 +00:00 |
|
Sezz
|
1e0f82b2c3
|
More LaraItem cleanup; update savegame schema; convert HandStatus and WaterStatus structs to enum class
|
2022-02-11 01:31:54 +11:00 |
|
Sezz
|
5bba1df285
|
More LaraInfo cleanup; update savegame schema
|
2022-02-10 01:38:32 +11:00 |
|
Sezz
|
ed6ac2d7bc
|
Rename ITEM_INFO members to comply with conventions
|
2022-02-09 16:55:46 +11:00 |
|
Sezz
|
8e3d7cfa4c
|
Begin tidying LaraInfo; cleanup tr4_senet.cpp; update savegame schema
|
2022-02-08 20:45:21 +11:00 |
|
hispidence
|
841c9fadbd
|
Offset selected level by +1 to account for 0 being the title level.
|
2022-02-06 20:02:11 +00:00 |
|
MontyTRC89
|
5091d363b5
|
Converted function names in renderer to PascalCase
|
2022-02-03 05:20:13 +01:00 |
|
Sezz
|
be08902a5c
|
Tentatively rename animation-related ITEM_INFO members
|
2022-02-02 20:16:16 +11:00 |
|
Sezz
|
953742964e
|
Rename IN_DUCK to IN_CROUCH for consistency
|
2022-02-02 18:32:52 +11:00 |
|
Sezz
|
95363e3719
|
Rename LaraInfo members; cleanup
|
2022-01-03 17:01:07 +11:00 |
|
Lwmte
|
8f4ba68f30
|
Reorganize includes tier 3
|
2021-12-24 03:32:19 +03:00 |
|
Lwmte
|
2101d3e65f
|
Reorganize includes tier 2
|
2021-12-22 16:23:57 +03:00 |
|
Sezz
|
dc45376fdf
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-12-02 12:58:18 +11:00 |
|
Lwmte
|
313cf0a764
|
Minor cleanups
|
2021-12-01 18:12:04 +03:00 |
|
Sezz
|
d85eea8c1f
|
Rename basic state functions; rename some state enum members; rename LG_NO_ARMS to LG_HANDS_FREE; move lara_as_gymnast() to lara_hang.cpp; minor corrections
|
2021-11-25 23:38:59 +11:00 |
|
Sezz
|
a036810db9
|
Refactor lara_fire.cpp
|
2021-11-20 15:39:05 +11:00 |
|
Lwmte
|
54007a136c
|
Fix issues with control configuration
|
2021-11-16 16:45:44 +03:00 |
|
Lwmte
|
e05f0b89a2
|
Rename newinv2 to gui
|
2021-11-16 15:51:50 +03:00 |
|