Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23

2023-08-20 12:18:50 -06:00 · 2023-08-20 12:18:50 -06:00 · d62d10e7e0
commit d62d10e7e0
parent 2c5a328665 16d31becb5
8 changed files with 3 additions and 3 deletions
--- a/blends/giant.blend
+++ b/blends/giant.blend
--- a/blends/giant.blend1
+++ b/blends/giant.blend1
--- a/godot/Models/grape_animations/pickup.res
+++ b/godot/Models/grape_animations/pickup.res
--- a/godot/Models/grape_animations/upper_body_holding.res
+++ b/godot/Models/grape_animations/upper_body_holding.res
--- a/godot/Models/grape_animations/upper_body_idle.res.res
+++ b/godot/Models/grape_animations/upper_body_idle.res.res
--- a/godot/Models/grape_animations/walk.res
+++ b/godot/Models/grape_animations/walk.res
--- a/godot/Models/grape_man.glb
+++ b/godot/Models/grape_man.glb
--- a/godot/Player.gd
+++ b/godot/Player.gd
@ -1,7 +1,7 @@
 extends CharacterBody3D


-const SPEED = 0.5
+const SPEED = 0.4
 const JUMP_VELOCITY = 4.5
@export var horiz_sens = 0.25
@export var vert_sens = 0.25