mirror of
https://github.com/TombEngine/TombEngine.git
synced 2025-04-28 15:57:59 +03:00
Revert "Update animation bools and fix Settings.lua; use correct block in monkey idle state"
This reverts commit 8305a2581b
.
This commit is contained in:
parent
ff9dec662b
commit
e42538aa8d
7 changed files with 38 additions and 6 deletions
|
@ -1,7 +1,12 @@
|
|||
-- 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,10 +22,25 @@ settings.showDebugInfo = true;
|
|||
settings.errorMode = Flow.ErrorMode.WARN;
|
||||
Flow.SetSettings(settings);
|
||||
|
||||
<<<<<<< HEAD
|
||||
local anims = Flow.Animations.new();
|
||||
anims.crawlExtended = true;
|
||||
anims.crouchRoll = true;
|
||||
anims.crawlspaceSwandive = true;
|
||||
anims.monkeyTurn180 = true;
|
||||
anims.monkeyAutoJump = false;
|
||||
anims.oscillateHang = true;
|
||||
anims.pose = false;
|
||||
Flow.SetAnimations(anims);
|
||||
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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue