Commit graph

31 commits

Author SHA1 Message Date
MontyTRC89
f1e7c6fbfc All files under the same project; Renamed TR5Main to TombEngine; Cleaned repository; 2022-05-08 06:52:04 +02:00
MontyTRC89
8eebabd91d Renamed FLOOR_INFO to FloorInfo; Renamed OBJECT_INFO to ObjectInfo; 2022-05-05 07:12:26 +02:00
MontyTRC89
23964da7bf Renamed ITEM_INFO to ItemInfo 2022-05-05 07:08:14 +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
MontyTRC89
6383cf3ce0 Added scissor test; Ported original function for collecting rooms to draw; Using scissor test for clipping not visible rooms; 2022-04-09 06:22:29 +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
Sezz
352fb81082 Merge branch 'master' into state_cleaning_tier_2 2022-03-19 23:17:33 +11:00
Sezz
280e625227 Revert "Fix flare bug and escape a calamity; cleanup"
This reverts commit c40b9f635f.
2022-03-19 23:05:40 +11:00
Sezz
c40b9f635f Fix flare bug and escape a calamity; cleanup 2022-03-18 21:13:48 +00:00
Sezz
8091b18bd2 Fix flare bug and escape a calamity; cleanup 2022-03-18 20:48:39 +11: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
65885df9a2 Cleanup 2022-03-06 19:35:59 +11:00
Sezz
3a8596f0bf CreatureInfo cleanup; LOTInfo cleanup; move some ITEM_INFO members into CreatureInfo; cleanup 2022-03-06 18:59:04 +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
cd8cabf4e0 Refactor minecart.cpp; cleanup 2022-02-23 14:40:08 +11:00
Sezz
4dc462b7f6 Refactor rubberboat.cpp 2022-02-22 23:22:43 +11:00
Sezz
cd4fd91776 Refactor quad.cpp; cleanup 2022-02-20 00:43:58 +11:00
Sezz
388a586357 Remove unnecessary casts in lara_two_guns.cpp; refactor biggun.cpp; cleanup 2022-02-19 13:01:19 +11:00
Sezz
b6dbd5d362 Cleanup 2022-02-12 16:25:59 +11:00
hispidence
782ad93810 More (ScriptInterface)Flow -> (ScriptInterface)FlowHandler for consistency. 2022-02-10 18:37:17 +00:00
hispidence
dc11d354b2 Cleanup. Add file references, clean up some todos, register GameScriptSkyLayer::GetColor, remove an unused function, change some includes that for some reason didn't stop it from compiling beforehand. 2022-02-10 18:35:17 +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
Sezz
ed6ac2d7bc Rename ITEM_INFO members to comply with conventions 2022-02-09 16:55:46 +11:00
MontyTRC89
5091d363b5 Converted function names in renderer to PascalCase 2022-02-03 05:20:13 +01:00
MontyTRC89
dffa0e3a55 Refactored debris drawing 2022-02-02 05:10:16 +01:00
MontyTRC89
bdde390302 Cleaning renderer code 2022-01-29 05:55:09 +01:00
MontyTRC89
7a956274b8 Code cleaning; Moved fade stuff to camera code; 2022-01-25 05:42:41 +01:00
Renamed from TR5Main/Renderer/Render11Helper.cpp (Browse further)