From fb10663ec55d2e1f456173359e7a4cb404b780c3 Mon Sep 17 00:00:00 2001 From: shawnspears Date: Sat, 8 Oct 2022 13:32:47 -0700 Subject: [PATCH 1/9] Add new greeting --- game/src/constants.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game/src/constants.js b/game/src/constants.js index e9efdf0..e4c128f 100644 --- a/game/src/constants.js +++ b/game/src/constants.js @@ -5,5 +5,6 @@ const greetings = [ 'It\'s a bird!', 'It\'s a plane!', '1000% more Cube!', - 'A Whole New Dimension!' + 'A Whole New Dimension!', + 'Totally cubular man!' ]; From 201aca5946c0faa5501fd480df4935c55bdc36d0 Mon Sep 17 00:00:00 2001 From: senth30 Date: Sat, 8 Oct 2022 13:37:24 -0700 Subject: [PATCH 2/9] First commit --- game/src/constants.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game/src/constants.js b/game/src/constants.js index e9efdf0..3a7882c 100644 --- a/game/src/constants.js +++ b/game/src/constants.js @@ -5,5 +5,6 @@ const greetings = [ 'It\'s a bird!', 'It\'s a plane!', '1000% more Cube!', - 'A Whole New Dimension!' + 'A Whole New Dimension!', + 'Hello, Open Source!' ]; From 6c09ded1b0ac0db8497d9b51438c4f159cafea9f Mon Sep 17 00:00:00 2001 From: Sean Koenig <56701039+DataCascadia@users.noreply.github.com> Date: Sat, 8 Oct 2022 13:40:29 -0700 Subject: [PATCH 3/9] Try a larger instructionsText.height to .9 --- game/src/mainmenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/src/mainmenu.js b/game/src/mainmenu.js index 55f0a2c..6e171b4 100644 --- a/game/src/mainmenu.js +++ b/game/src/mainmenu.js @@ -108,7 +108,7 @@ class MainMenu extends GameObject { this.greetingText.verticalAlignment = BABYLON.GUI.TextBlock.VERTICAL_ALIGNMENT_TOP; this.greetingText.horizontalAlignment = BABYLON.GUI.TextBlock.HORIZONTAL_ALIGNMENT_CENTER; this.greetingText.width = .5; - this.greetingText.height = .7; + this.greetingText.height = .9; this.instructionsText = new BABYLON.GUI.TextBlock(); this.instructionsText.text = "press any key to play"; From 6ee25a3f85db0b074c87a9d467f6eae5d3f2822a Mon Sep 17 00:00:00 2001 From: Randy Ramli Date: Sat, 8 Oct 2022 13:44:33 -0700 Subject: [PATCH 4/9] add new greetings --- game/src/constants.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game/src/constants.js b/game/src/constants.js index e9efdf0..65e1f39 100644 --- a/game/src/constants.js +++ b/game/src/constants.js @@ -5,5 +5,6 @@ const greetings = [ 'It\'s a bird!', 'It\'s a plane!', '1000% more Cube!', - 'A Whole New Dimension!' + 'A Whole New Dimension!', + 'Hello Dolly' ]; From a635e030693b3e76b00a8ff1d94ea126032ad1be Mon Sep 17 00:00:00 2001 From: Sean Koenig <56701039+DataCascadia@users.noreply.github.com> Date: Sat, 8 Oct 2022 13:50:40 -0700 Subject: [PATCH 5/9] Make greetingText.height 1.5 to avoid conflict --- game/src/mainmenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/src/mainmenu.js b/game/src/mainmenu.js index 6e171b4..f84a0fc 100644 --- a/game/src/mainmenu.js +++ b/game/src/mainmenu.js @@ -108,7 +108,7 @@ class MainMenu extends GameObject { this.greetingText.verticalAlignment = BABYLON.GUI.TextBlock.VERTICAL_ALIGNMENT_TOP; this.greetingText.horizontalAlignment = BABYLON.GUI.TextBlock.HORIZONTAL_ALIGNMENT_CENTER; this.greetingText.width = .5; - this.greetingText.height = .9; + this.greetingText.height = 1.5; this.instructionsText = new BABYLON.GUI.TextBlock(); this.instructionsText.text = "press any key to play"; From 2054e5b3651a8842673200b411481a2b46206609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E9=9B=A8=E5=BF=83?= Date: Sat, 8 Oct 2022 13:54:04 -0700 Subject: [PATCH 6/9] change a line --- game/src/constants.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game/src/constants.js b/game/src/constants.js index e9efdf0..1ef7a21 100644 --- a/game/src/constants.js +++ b/game/src/constants.js @@ -5,5 +5,6 @@ const greetings = [ 'It\'s a bird!', 'It\'s a plane!', '1000% more Cube!', - 'A Whole New Dimension!' + 'A Whole New Dimension!', + 'Hello!!!' ]; From 07a970b9d94a27729dc1c231e7fc3ea4aa448bff Mon Sep 17 00:00:00 2001 From: Sean Koenig <56701039+DataCascadia@users.noreply.github.com> Date: Sat, 8 Oct 2022 13:56:42 -0700 Subject: [PATCH 7/9] No greeting --- game/src/mainmenu.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/game/src/mainmenu.js b/game/src/mainmenu.js index f84a0fc..e556972 100644 --- a/game/src/mainmenu.js +++ b/game/src/mainmenu.js @@ -100,15 +100,15 @@ class MainMenu extends GameObject { this.welcomeText.width = .5; this.welcomeText.height = .6; - this.greetingText = new BABYLON.GUI.TextBlock(); - this.greetingText.text = greeting; - this.greetingText.fontFamily = "Impact"; - this.greetingText.color = "white"; - this.greetingText.fontSize = 28; - this.greetingText.verticalAlignment = BABYLON.GUI.TextBlock.VERTICAL_ALIGNMENT_TOP; - this.greetingText.horizontalAlignment = BABYLON.GUI.TextBlock.HORIZONTAL_ALIGNMENT_CENTER; - this.greetingText.width = .5; - this.greetingText.height = 1.5; + // this.greetingText = new BABYLON.GUI.TextBlock(); + // this.greetingText.text = greeting; + // this.greetingText.fontFamily = "Impact"; + // this.greetingText.color = "white"; + // this.greetingText.fontSize = 28; + // this.greetingText.verticalAlignment = BABYLON.GUI.TextBlock.VERTICAL_ALIGNMENT_TOP; + // this.greetingText.horizontalAlignment = BABYLON.GUI.TextBlock.HORIZONTAL_ALIGNMENT_CENTER; + // this.greetingText.width = .5; + // this.greetingText.height = .7; this.instructionsText = new BABYLON.GUI.TextBlock(); this.instructionsText.text = "press any key to play"; From 9ff3ae5fee00c7ac9a286bae193488c8765f1647 Mon Sep 17 00:00:00 2001 From: Sean Koenig <56701039+DataCascadia@users.noreply.github.com> Date: Sat, 8 Oct 2022 14:08:26 -0700 Subject: [PATCH 8/9] Make greetingText.height = .75 --- game/src/mainmenu.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/game/src/mainmenu.js b/game/src/mainmenu.js index e556972..c995d30 100644 --- a/game/src/mainmenu.js +++ b/game/src/mainmenu.js @@ -100,15 +100,15 @@ class MainMenu extends GameObject { this.welcomeText.width = .5; this.welcomeText.height = .6; - // this.greetingText = new BABYLON.GUI.TextBlock(); - // this.greetingText.text = greeting; - // this.greetingText.fontFamily = "Impact"; - // this.greetingText.color = "white"; - // this.greetingText.fontSize = 28; - // this.greetingText.verticalAlignment = BABYLON.GUI.TextBlock.VERTICAL_ALIGNMENT_TOP; - // this.greetingText.horizontalAlignment = BABYLON.GUI.TextBlock.HORIZONTAL_ALIGNMENT_CENTER; - // this.greetingText.width = .5; - // this.greetingText.height = .7; + this.greetingText = new BABYLON.GUI.TextBlock(); + this.greetingText.text = greeting; + this.greetingText.fontFamily = "Impact"; + this.greetingText.color = "white"; + this.greetingText.fontSize = 28; + this.greetingText.verticalAlignment = BABYLON.GUI.TextBlock.VERTICAL_ALIGNMENT_TOP; + this.greetingText.horizontalAlignment = BABYLON.GUI.TextBlock.HORIZONTAL_ALIGNMENT_CENTER; + this.greetingText.width = .5; + this.greetingText.height = .75; this.instructionsText = new BABYLON.GUI.TextBlock(); this.instructionsText.text = "press any key to play"; From 83477ac6c1f789f9e4dbb57a2f472b689874c317 Mon Sep 17 00:00:00 2001 From: Eric Scheib <90006655+EDScheib78@users.noreply.github.com> Date: Sat, 8 Oct 2022 14:10:28 -0700 Subject: [PATCH 9/9] Update constants.js --- game/src/constants.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/game/src/constants.js b/game/src/constants.js index 5d084cc..0e4f8e9 100644 --- a/game/src/constants.js +++ b/game/src/constants.js @@ -6,10 +6,7 @@ const greetings = [ 'It\'s a plane!', '1000% more Cube!', 'A Whole New Dimension!', -<<<<<<< HEAD - 'Hello Dolly' -======= + 'Hello Dolly', 'Hello, Open Source!', 'Totally cubular man!' ->>>>>>> 121f74b42a38e4bb5541e7f05a9a7a89a5f5a4eb ];