From 7dd636a301ddcc33e9543ef73d1ab3cf586f67b6 Mon Sep 17 00:00:00 2001 From: ChrisBlair Date: Tue, 18 Feb 2020 20:10:21 -0500 Subject: [PATCH 01/26] Create Features.md --- Features.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Features.md diff --git a/Features.md b/Features.md new file mode 100644 index 000000000..6d7fe4c14 --- /dev/null +++ b/Features.md @@ -0,0 +1,9 @@ +Feature 1: Movement refinements +User Story A: +Task 1: +Feature 2: Settings refinements: menu appearance and functionality changes +User Story A: +Task 1: +Feature 3: Settings refinements: in-game changes +User Story A: +Task 1: From 0249ab2a83ee1b320b0b8ddc967f171eff1d7b8b Mon Sep 17 00:00:00 2001 From: MatthewHemmelgarn37 <60760580+MatthewHemmelgarn37@users.noreply.github.com> Date: Thu, 20 Feb 2020 18:53:13 -0500 Subject: [PATCH 02/26] Create requirements.md --- requirements.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 requirements.md diff --git a/requirements.md b/requirements.md new file mode 100644 index 000000000..953407a11 --- /dev/null +++ b/requirements.md @@ -0,0 +1,8 @@ +# Requirements for Spring 2020 "Software Engineering" Craft project at Wright State University + +##Overview + +##References + +##Functional Requirements + From 729774dcb87cbaf80d1e149e6532eb60fa918cc8 Mon Sep 17 00:00:00 2001 From: MatthewHemmelgarn37 <60760580+MatthewHemmelgarn37@users.noreply.github.com> Date: Thu, 20 Feb 2020 18:54:09 -0500 Subject: [PATCH 03/26] Update requirements.md --- requirements.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.md b/requirements.md index 953407a11..889954000 100644 --- a/requirements.md +++ b/requirements.md @@ -1,8 +1,8 @@ # Requirements for Spring 2020 "Software Engineering" Craft project at Wright State University -##Overview +## Overview -##References +## References -##Functional Requirements +## Functional Requirements From 28afe653be57ab6b226301c0b5f13390bc841f41 Mon Sep 17 00:00:00 2001 From: MatthewHemmelgarn37 <60760580+MatthewHemmelgarn37@users.noreply.github.com> Date: Thu, 20 Feb 2020 18:55:42 -0500 Subject: [PATCH 04/26] Update Features.md --- Features.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Features.md b/Features.md index 6d7fe4c14..4b43309fd 100644 --- a/Features.md +++ b/Features.md @@ -1,9 +1,9 @@ -Feature 1: Movement refinements -User Story A: -Task 1: -Feature 2: Settings refinements: menu appearance and functionality changes -User Story A: -Task 1: -Feature 3: Settings refinements: in-game changes -User Story A: -Task 1: +## Feature 1: Movement refinements +### User Story A: +#### Task 1: +## Feature 2: Settings refinements: menu appearance and functionality changes +### User Story A: +#### Task 1: +## Feature 3: Settings refinements: in-game changes +### User Story A: +#### Task 1: From a165f0b32738a32bf715d1bb3b4586ba9fd95e18 Mon Sep 17 00:00:00 2001 From: MatthewHemmelgarn37 <60760580+MatthewHemmelgarn37@users.noreply.github.com> Date: Thu, 2 Apr 2020 20:52:44 -0400 Subject: [PATCH 05/26] Delete requirements.md --- requirements.md | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 requirements.md diff --git a/requirements.md b/requirements.md deleted file mode 100644 index 889954000..000000000 --- a/requirements.md +++ /dev/null @@ -1,8 +0,0 @@ -# Requirements for Spring 2020 "Software Engineering" Craft project at Wright State University - -## Overview - -## References - -## Functional Requirements - From db13a3f049f7d2157daf3eb4fd13cb386066272e Mon Sep 17 00:00:00 2001 From: MatthewHemmelgarn37 <60760580+MatthewHemmelgarn37@users.noreply.github.com> Date: Thu, 2 Apr 2020 21:06:38 -0400 Subject: [PATCH 06/26] Update Features.md --- Features.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Features.md b/Features.md index 4b43309fd..f935495a1 100644 --- a/Features.md +++ b/Features.md @@ -1,9 +1,10 @@ ## Feature 1: Movement refinements -### User Story A: -#### Task 1: -## Feature 2: Settings refinements: menu appearance and functionality changes -### User Story A: -#### Task 1: -## Feature 3: Settings refinements: in-game changes -### User Story A: -#### Task 1: +### User Story A: As a user, I want to be able to sprint so that I can move around the map more quickly. +#### Task 1: Update the function that handles movement, so that when Q is held down, movement speed is increased. +#### Task 2: Restrict this increase to be only in the forward direction when on the ground and in all direstions when flying. +### User Story B: As a user, I want to be able to change movement speed manually so that I can customize my experience. +#### Task 1: Add a new command that takes a value input that is used to change the movement speed. +### User Story C: As a user, I want to be able to change jump manually so that I can customize my experience. +#### Task 1: Add a new command that takes a value input that is used to change the jump height. +### User Story D: As a user, I want to be able to change fall speed manually so that I can customize my experience. +#### Task 1: Add a new command that takes a value input that is used to change the fall speed. From dce8ff055b358df63488766e9775bf9a7f65371e Mon Sep 17 00:00:00 2001 From: ChrisBlair Date: Thu, 9 Apr 2020 13:56:19 -0400 Subject: [PATCH 07/26] Update Features.md --- Features.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Features.md b/Features.md index f935495a1..dd80a2f2b 100644 --- a/Features.md +++ b/Features.md @@ -8,3 +8,6 @@ #### Task 1: Add a new command that takes a value input that is used to change the jump height. ### User Story D: As a user, I want to be able to change fall speed manually so that I can customize my experience. #### Task 1: Add a new command that takes a value input that is used to change the fall speed. +## Feature 2: Graphical Enhancements +### User Story E: As a user, I want to be able to change the settings to display alternative textures on common blocks. +#### Task 1: Update the settings and create altered texture files such that they can be toggled on or off. From f61abc15789451343722d14fad0a88edb9f290a1 Mon Sep 17 00:00:00 2001 From: MatthewHemmelgarn37 <60760580+MatthewHemmelgarn37@users.noreply.github.com> Date: Thu, 9 Apr 2020 16:33:35 -0400 Subject: [PATCH 08/26] Update Features.md --- Features.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Features.md b/Features.md index dd80a2f2b..9a344fc3f 100644 --- a/Features.md +++ b/Features.md @@ -8,6 +8,9 @@ #### Task 1: Add a new command that takes a value input that is used to change the jump height. ### User Story D: As a user, I want to be able to change fall speed manually so that I can customize my experience. #### Task 1: Add a new command that takes a value input that is used to change the fall speed. +### User Story E: As a user, I want to be able to play a minigame where everytime I jump I jump higher than last time. +#### Task 1: Add a command to turn on and off the minigame +#### Task 2: Change movement functionality so that when the minigame is on jump height is increased incrementally everytime the player jumps ## Feature 2: Graphical Enhancements ### User Story E: As a user, I want to be able to change the settings to display alternative textures on common blocks. #### Task 1: Update the settings and create altered texture files such that they can be toggled on or off. From e8c058ada6f61efead8e756036b5e072f079e8d5 Mon Sep 17 00:00:00 2001 From: ChrisBlair Date: Sat, 11 Apr 2020 14:05:39 -0400 Subject: [PATCH 09/26] Update Features.md --- Features.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Features.md b/Features.md index 9a344fc3f..777fe6500 100644 --- a/Features.md +++ b/Features.md @@ -12,5 +12,5 @@ #### Task 1: Add a command to turn on and off the minigame #### Task 2: Change movement functionality so that when the minigame is on jump height is increased incrementally everytime the player jumps ## Feature 2: Graphical Enhancements -### User Story E: As a user, I want to be able to change the settings to display alternative textures on common blocks. +### User Story F: As a user, I want to be able to change the settings to display alternative textures on common blocks. #### Task 1: Update the settings and create altered texture files such that they can be toggled on or off. From ab1813cbc60953fd3b6372d34af5af2ccba5e214 Mon Sep 17 00:00:00 2001 From: Eyongherok <60763811+Eyongherok@users.noreply.github.com> Date: Sat, 11 Apr 2020 14:18:40 -0400 Subject: [PATCH 10/26] Update Features.md --- Features.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Features.md b/Features.md index 777fe6500..4de99b7d2 100644 --- a/Features.md +++ b/Features.md @@ -14,3 +14,4 @@ ## Feature 2: Graphical Enhancements ### User Story F: As a user, I want to be able to change the settings to display alternative textures on common blocks. #### Task 1: Update the settings and create altered texture files such that they can be toggled on or off. +### user story G: As a user, I want to be able to change the light setting so when you press the up key it gets lighter and when you press the down key it gets darker. From 4146ffcf6086fe7afa79aaed024c7919a9a39471 Mon Sep 17 00:00:00 2001 From: Eyongherok <60763811+Eyongherok@users.noreply.github.com> Date: Sat, 11 Apr 2020 14:19:05 -0400 Subject: [PATCH 11/26] Update Features.md --- Features.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Features.md b/Features.md index 4de99b7d2..a4d68fd1c 100644 --- a/Features.md +++ b/Features.md @@ -14,4 +14,4 @@ ## Feature 2: Graphical Enhancements ### User Story F: As a user, I want to be able to change the settings to display alternative textures on common blocks. #### Task 1: Update the settings and create altered texture files such that they can be toggled on or off. -### user story G: As a user, I want to be able to change the light setting so when you press the up key it gets lighter and when you press the down key it gets darker. +### User story G: As a user, I want to be able to change the light setting so when you press the up key it gets lighter and when you press the down key it gets darker. From dd8fff2c2d865e4dd4a8d5c6e6df666361c0891a Mon Sep 17 00:00:00 2001 From: MatthewHemmelgarn37 <60760580+MatthewHemmelgarn37@users.noreply.github.com> Date: Fri, 1 May 2020 17:16:06 -0400 Subject: [PATCH 12/26] Update Features.md --- Features.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Features.md b/Features.md index a4d68fd1c..568f1c7a3 100644 --- a/Features.md +++ b/Features.md @@ -11,6 +11,9 @@ ### User Story E: As a user, I want to be able to play a minigame where everytime I jump I jump higher than last time. #### Task 1: Add a command to turn on and off the minigame #### Task 2: Change movement functionality so that when the minigame is on jump height is increased incrementally everytime the player jumps +### User Story F: As a user, I want to be able to play a modified version of jump game that also increases my speed. +#### Task 1: Add a command to turn on and off the minigame +#### Task 2: Change movement functionality so that when the minigame is on speed is increased incrementally everytime the player jumps ## Feature 2: Graphical Enhancements ### User Story F: As a user, I want to be able to change the settings to display alternative textures on common blocks. #### Task 1: Update the settings and create altered texture files such that they can be toggled on or off. From cbd92b1747f3af12b6bf74a75da0f63950cee68b Mon Sep 17 00:00:00 2001 From: MatthewHemmelgarn37 <60760580+MatthewHemmelgarn37@users.noreply.github.com> Date: Fri, 1 May 2020 17:21:44 -0400 Subject: [PATCH 13/26] Create testResults.md --- testResults.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 testResults.md diff --git a/testResults.md b/testResults.md new file mode 100644 index 000000000..725b4bcd9 --- /dev/null +++ b/testResults.md @@ -0,0 +1 @@ +We are working with Craft, so testing the functionality of changes can't be documented without recording video of each test. From 00f7086af8ab8b0ed4aa7dbba44fbd3b508a695e Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Fri, 1 May 2020 22:44:38 -0400 Subject: [PATCH 14/26] inverted left and right --- src/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.h b/src/config.h index 599bbc181..a4b2cf8a6 100644 --- a/src/config.h +++ b/src/config.h @@ -29,8 +29,8 @@ // key bindings #define CRAFT_KEY_FORWARD 'W' #define CRAFT_KEY_BACKWARD 'S' -#define CRAFT_KEY_LEFT 'A' -#define CRAFT_KEY_RIGHT 'D' +#define CRAFT_KEY_LEFT 'D' +#define CRAFT_KEY_RIGHT 'A' #define CRAFT_KEY_JUMP GLFW_KEY_SPACE #define CRAFT_KEY_FLY GLFW_KEY_TAB #define CRAFT_KEY_OBSERVE 'O' From 73fdd52561c1415b4f9ef6ab78f278e4c44aa9cf Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Fri, 1 May 2020 23:33:57 -0400 Subject: [PATCH 15/26] use Z for left and C for right --- src/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.h b/src/config.h index a4b2cf8a6..ef416bfc3 100644 --- a/src/config.h +++ b/src/config.h @@ -29,8 +29,8 @@ // key bindings #define CRAFT_KEY_FORWARD 'W' #define CRAFT_KEY_BACKWARD 'S' -#define CRAFT_KEY_LEFT 'D' -#define CRAFT_KEY_RIGHT 'A' +#define CRAFT_KEY_LEFT 'Z' +#define CRAFT_KEY_RIGHT 'C' #define CRAFT_KEY_JUMP GLFW_KEY_SPACE #define CRAFT_KEY_FLY GLFW_KEY_TAB #define CRAFT_KEY_OBSERVE 'O' From 6f147a11b3cb672a9f7ad9f89211cdf599359435 Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Sat, 2 May 2020 04:28:49 -0400 Subject: [PATCH 16/26] change left and right direction to normal --- src/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.h b/src/config.h index ef416bfc3..a4b2cf8a6 100644 --- a/src/config.h +++ b/src/config.h @@ -29,8 +29,8 @@ // key bindings #define CRAFT_KEY_FORWARD 'W' #define CRAFT_KEY_BACKWARD 'S' -#define CRAFT_KEY_LEFT 'Z' -#define CRAFT_KEY_RIGHT 'C' +#define CRAFT_KEY_LEFT 'D' +#define CRAFT_KEY_RIGHT 'A' #define CRAFT_KEY_JUMP GLFW_KEY_SPACE #define CRAFT_KEY_FLY GLFW_KEY_TAB #define CRAFT_KEY_OBSERVE 'O' From dbb0ed73b48dd5b4bf47147ade03fd45960c1aef Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Sat, 2 May 2020 04:43:10 -0400 Subject: [PATCH 17/26] let N go forward and N go backward --- src/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.h b/src/config.h index a4b2cf8a6..58759e903 100644 --- a/src/config.h +++ b/src/config.h @@ -27,8 +27,8 @@ #define SHOW_PLAYER_NAMES 1 // key bindings -#define CRAFT_KEY_FORWARD 'W' -#define CRAFT_KEY_BACKWARD 'S' +#define CRAFT_KEY_FORWARD 'N' +#define CRAFT_KEY_BACKWARD 'M' #define CRAFT_KEY_LEFT 'D' #define CRAFT_KEY_RIGHT 'A' #define CRAFT_KEY_JUMP GLFW_KEY_SPACE From 78a8e9f7e56c32b2ab3e4cdd443ec490de288a58 Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Sat, 2 May 2020 04:47:01 -0400 Subject: [PATCH 18/26] change left and right or the north and south keys back to normal --- src/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.h b/src/config.h index 58759e903..a4b2cf8a6 100644 --- a/src/config.h +++ b/src/config.h @@ -27,8 +27,8 @@ #define SHOW_PLAYER_NAMES 1 // key bindings -#define CRAFT_KEY_FORWARD 'N' -#define CRAFT_KEY_BACKWARD 'M' +#define CRAFT_KEY_FORWARD 'W' +#define CRAFT_KEY_BACKWARD 'S' #define CRAFT_KEY_LEFT 'D' #define CRAFT_KEY_RIGHT 'A' #define CRAFT_KEY_JUMP GLFW_KEY_SPACE From b7c04c1b61daa2b3139e046ad274c531332fbab9 Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Sat, 2 May 2020 04:50:49 -0400 Subject: [PATCH 19/26] shorten the day length --- src/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index a4b2cf8a6..530434a57 100644 --- a/src/config.h +++ b/src/config.h @@ -11,7 +11,7 @@ #define MAX_MESSAGES 4 #define DB_PATH "craft.db" #define USE_CACHE 1 -#define DAY_LENGTH 600 +#define DAY_LENGTH 5 #define INVERT_MOUSE 0 // rendering options From cf0c6a7102a2574ef81aba12c57ec0704a4b67ef Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Sat, 2 May 2020 04:56:34 -0400 Subject: [PATCH 20/26] shorten daylight time to 10 second --- src/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index 530434a57..55c08969c 100644 --- a/src/config.h +++ b/src/config.h @@ -11,7 +11,7 @@ #define MAX_MESSAGES 4 #define DB_PATH "craft.db" #define USE_CACHE 1 -#define DAY_LENGTH 5 +#define DAY_LENGTH 20 #define INVERT_MOUSE 0 // rendering options From b1dfdad60b9a71b7372e677347c286510bd29de2 Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Sat, 2 May 2020 04:59:34 -0400 Subject: [PATCH 21/26] increase the daylight period to 900 second --- src/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index 55c08969c..a3ac6e4b6 100644 --- a/src/config.h +++ b/src/config.h @@ -11,7 +11,7 @@ #define MAX_MESSAGES 4 #define DB_PATH "craft.db" #define USE_CACHE 1 -#define DAY_LENGTH 20 +#define DAY_LENGTH 900 #define INVERT_MOUSE 0 // rendering options From 910f5c114c7eae5cd0d5c91593cba2a181de623a Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Sat, 2 May 2020 05:03:02 -0400 Subject: [PATCH 22/26] change the daylength period back to the default --- src/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index a3ac6e4b6..a4b2cf8a6 100644 --- a/src/config.h +++ b/src/config.h @@ -11,7 +11,7 @@ #define MAX_MESSAGES 4 #define DB_PATH "craft.db" #define USE_CACHE 1 -#define DAY_LENGTH 900 +#define DAY_LENGTH 600 #define INVERT_MOUSE 0 // rendering options From cd6a85369ee2da01187849374f3ca8643256943f Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Sat, 2 May 2020 05:07:10 -0400 Subject: [PATCH 23/26] Increase the cloud rendering --- src/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index a4b2cf8a6..19da0cf94 100644 --- a/src/config.h +++ b/src/config.h @@ -17,7 +17,7 @@ // rendering options #define SHOW_LIGHTS 1 #define SHOW_PLANTS 1 -#define SHOW_CLOUDS 1 +#define SHOW_CLOUDS 3 #define SHOW_TREES 1 #define SHOW_ITEM 1 #define SHOW_CROSSHAIRS 1 From 4bea9ac517bbe6d582a54983e3dc396e62b0af01 Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Sat, 2 May 2020 05:22:48 -0400 Subject: [PATCH 24/26] change the cloud rendering back to default --- src/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index 19da0cf94..9c9361ae2 100644 --- a/src/config.h +++ b/src/config.h @@ -17,7 +17,7 @@ // rendering options #define SHOW_LIGHTS 1 #define SHOW_PLANTS 1 -#define SHOW_CLOUDS 3 +#define SHOW_CLOUDS 20 #define SHOW_TREES 1 #define SHOW_ITEM 1 #define SHOW_CROSSHAIRS 1 From ab961ed6b1a36b0f6caa4cd0d1b35879c48eaa2e Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Sat, 2 May 2020 05:24:06 -0400 Subject: [PATCH 25/26] change the cloud rendering back to default --- src/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index 9c9361ae2..a4b2cf8a6 100644 --- a/src/config.h +++ b/src/config.h @@ -17,7 +17,7 @@ // rendering options #define SHOW_LIGHTS 1 #define SHOW_PLANTS 1 -#define SHOW_CLOUDS 20 +#define SHOW_CLOUDS 1 #define SHOW_TREES 1 #define SHOW_ITEM 1 #define SHOW_CROSSHAIRS 1 From 74f6e363a8a8084ad00e6b73125ddea412de2124 Mon Sep 17 00:00:00 2001 From: Brandon Eyongherok Date: Sat, 2 May 2020 05:28:06 -0400 Subject: [PATCH 26/26] increase the screen width --- src/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index a4b2cf8a6..9ae64dfd8 100644 --- a/src/config.h +++ b/src/config.h @@ -4,7 +4,7 @@ // app parameters #define DEBUG 0 #define FULLSCREEN 0 -#define WINDOW_WIDTH 1024 +#define WINDOW_WIDTH 1099 #define WINDOW_HEIGHT 768 #define VSYNC 1 #define SCROLL_THRESHOLD 0.1