From: hgn Date: Sat, 24 Jul 2021 12:53:23 +0000 (+0100) Subject: Merge branch 'master' of harrygodden.com:/home/fishladder X-Git-Url: https://harrygodden.com/git/?a=commitdiff_plain;h=ff65fd676c2b4c79b8eb205cdd7ae9349be0c1a7;hp=fa8d1d33585ff149d36c0419d65c2079305df440;p=vg.git 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 631f4f0..0256e1e 100644 --- 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 52e2522..410d1d3 100644 --- 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 d8a9246..a5938f1 100644 --- 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[] =