Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'state_cleaning_tier_2' into luarefactor

Browse source 
# 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
This commit is contained in:
MontyTRC89 2022-05-05 06:28:43 +02:00
commit 7587d3470c
637 changed files with 54779 additions and 59144 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Scripts/Settings.lua
View file

@ -1,7 +1,12 @@
-- TR5Main engine settings file
-- TombEngine settings file
-- Created by MontyTRC
<<<<<<< HEAD
-- Place in this Lua script all the engine settings for your game
-- WARNING: bad values could make your game unplayable, please follow with attention the reference guide
=======
-- Place all the engine settings for your game in this Lua script.
-- WARNING: Bad values could make your game unplayable; please follow reference guide attentively.
>>>>>>> state_cleaning_tier_2
local Flow = TEN.Flow
@ -17,6 +22,7 @@ settings.showDebugInfo = true;
settings.errorMode = Flow.ErrorMode.WARN;
Flow.SetSettings(settings);
<<<<<<< HEAD
local anims = Flow.Animations.new();
anims.crawlExtended = true;
anims.crouchRoll = true;
@ -26,3 +32,15 @@ anims.monkeyAutoJump = false;
anims.oscillateHang = true;
anims.pose = false;
Flow.SetAnimations(anims);
=======
local anims = Animations.new();
anims.hasPose = false;
anims.hasSlideExtended = false;
anims.hasSprintJump = true;
anims.hasMonkeyAutoJump = false;
anims.hasCrawlspaceDive = true;
anims.hasCrawlExtended = true;
anims.hasCrouchRoll = true;
anims.hasOverhangClimb = false;
SetAnimations(anims);
>>>>>>> state_cleaning_tier_2