Merge branch 'testing', resolved conflicts

2021-03-27 20:45:36 +01:00
parent 2956fb6379 881359c4ac
commit 326c624210
9 changed files with 3230 additions and 55 deletions
@@ -230,6 +230,8 @@ defaultWorld = World
        ]
    , _selLocation = 0
    , _keyConfig = defaultKeyConfigSDL
+    , _varMovementSpeedModifier = 3
+    , _varMovementStrafeSpeedModifier = 3
    }
 youLight = 
 --    LS {_lsEff = \w _ p -> (logistic 1 1 1 (d p w * 0.01) )