Commit graph

122 commits

Author SHA1 Message Date
Stranger1992
74c7e89487 Revert "Updated scripts to load .ten files instead of .TRC"
This reverts commit c4b044c0b6.
2022-05-10 20:07:38 +01:00
Stranger1992
c4b044c0b6 Updated scripts to load .ten files instead of .TRC 2022-05-10 13:04:38 +01:00
Sezz
153e0a3d05 Update animation bools and fix Settings.lua; use correct block in monkey idle state 2022-05-06 01:47:54 +10:00
Sezz
e42538aa8d Revert "Update animation bools and fix Settings.lua; use correct block in monkey idle state"
This reverts commit 8305a2581b.
2022-05-06 01:44:15 +10:00
Sezz
8305a2581b Update animation bools and fix Settings.lua; use correct block in monkey idle state 2022-05-05 19:50:52 +10: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
Sezz
b975037b54 Disable overhang climbing in script 2022-04-15 17:40:51 +10:00
hispidence
e1f73b8daf Add Util script. 2022-04-02 17:52:39 +01:00
Sezz
395ec6052d Update animation enum; fix 180 jump roll inputs; fix kayak paddle hold inputs; cleanup 2022-04-02 15:50:40 +11:00
Sezz
682faf6375 Implement sprint jump functionality; fix tread left/right input bug 2022-04-02 00:30:22 +11:00
Sezz
c8d34bfccb Update animation script 2022-03-04 15:51:53 +11:00
Sezz
3c4b8428a2 Merge branch 'master' into state_cleaning_tier_2 2022-03-02 22:17:11 +11:00
hispidence
48e018f7fb Remove Enums.lua (it's now redundant), update Gameflow.lua and Settings.lua. 2022-02-14 23:10:29 +00:00
hispidence
1481984693 Cherry pick c219ce03af 2022-02-14 21:35:47 +00:00
Stranger1992
d00aa9b539 Spellcheck for Game Strings 2022-02-13 23:12:24 +00:00
hispidence
e2a40fe42e Fix up Gameflow.lua, Settings.lua and Strings.lua. 2022-02-13 20:38:55 +00:00
Lwmte
ad289af026 Update Settings.lua 2021-12-22 02:21:10 +03:00
Sezz
7c01d050a4 Address remaining PR #377 comments; fix pickups in crouch and crawl states; simplify step function 2021-12-10 22:31:34 +11:00
Sezz
ab42c8627b Remove unnecessary conditions in step tests; reset torso and head rotation before perorming a crawl vault 2021-12-02 23:45:19 +11:00
Sezz
03b0ea7027 Update Settings.lua 2021-12-02 19:24:24 +11:00
Lwmte
ca6d2eab59 Unify all crawl extra moves 2021-12-01 16:28:40 +03:00
Lwmte
59263279fe Provide scripts file into repo 2021-12-01 15:31:39 +03:00