Merge branch 'master' into journey-challenges-navbar

cornell-dti · Nov 30, 2023 · 7db4ee3 · 7db4ee3
2 parents 2e18ffd + 81c8d82
commit 7db4ee3
Show file tree

Hide file tree

Showing 23 changed files with 690 additions and 97 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.14.0
+FROM node:20-alpine
 
 EXPOSE 80
 EXPOSE 8000

diff --git a/game/android/app/build.gradle b/game/android/app/build.gradle
@@ -42,7 +42,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId 'com.cornellgo.CornellGO'
-        minSdkVersion 21
+        minSdkVersion 22
         targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

diff --git a/game/assets/icons/Podium1stRed.svg b/game/assets/icons/Podium1stRed.svg
diff --git a/game/assets/icons/Podium2ndRed.svg b/game/assets/icons/Podium2ndRed.svg
diff --git a/game/assets/icons/Podium3rdRed.svg b/game/assets/icons/Podium3rdRed.svg
diff --git a/game/assets/icons/red1podium.svg b/game/assets/icons/red1podium.svg
diff --git a/game/assets/icons/red2podium.svg b/game/assets/icons/red2podium.svg
diff --git a/game/assets/icons/red3podium.svg b/game/assets/icons/red3podium.svg
diff --git a/game/assets/icons/yellow1podium.svg b/game/assets/icons/yellow1podium.svg
diff --git a/game/assets/icons/yellow2podium.svg b/game/assets/icons/yellow2podium.svg
diff --git a/game/assets/icons/yellow3podium.svg b/game/assets/icons/yellow3podium.svg
diff --git a/game/assets/images/podium.svg b/game/assets/images/podium.svg
diff --git a/game/assets/images/podium_first.svg b/game/assets/images/podium_first.svg