Merge branch 'master' of harrygodden.com:/home/fishladder

Former-commit-id: 2224e74bdfc8e19a2de99645246daf671d4323b4

diff --git a/build.sh.REMOVED.git-id b/build.sh.REMOVED.git-id
index 631f4f06e6dd9ea99964bded88499939f243e865..0256e1e0c439a8ec6a7cdb92f574bf311fc5d3a8 100644 (file)
--- a/build.sh.REMOVED.git-id
+++ b/build.sh.REMOVED.git-id
@@ -1 +1 @@
-e078ea626139a4a35881b860da40cc2a83d316b2
\ No newline at end of file
+2ce525a1cac803535b4d038cb65e2df3d356047c
\ No newline at end of file

diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id
index 52e2522b9a222ceb95d591f5bb8ca73ea210192d..410d1d3b0bd1e2ef599787a87e6e5308a505be0d 100644 (file)
--- a/fishladder.c.REMOVED.git-id
+++ b/fishladder.c.REMOVED.git-id
@@ -1 +1 @@
-bc755e80cf915b3bedfe93fef527f92b3e1b460e
\ No newline at end of file
+ec571afe730d8fc0376cc5f62d849abee106948c
\ No newline at end of file

diff --git a/vg/config.h b/vg/config.h
index d8a9246903c912532a933b6cb51c5e4fb25cf93e..a5938f10a9dbf1a73ad551b4dfa77abba62fbb3e 100644 (file)
--- a/vg/config.h
+++ b/vg/config.h
@@ -5,7 +5,7 @@ static struct button_binding vg_button_binds[] =
        { .name = "primary", .bind = GLFW_MOUSE_BUTTON_LEFT },
        { .name = "secondary", .bind = GLFW_MOUSE_BUTTON_RIGHT },
        { .name = "noclip",     .bind = GLFW_KEY_V, },
-       { .name = "jump",       .bind = GLFW_KEY_SPACE }
+       { .name = "go",                 .bind = GLFW_KEY_SPACE }
 };
 
 static struct axis_binding vg_axis_binds[] =