Merge branch 'main' into command-based-transition

varun7654 · Jan 7, 2024 · ef9d812 · ef9d812
2 parents 445401d + 72e2bca
commit ef9d812
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -105,3 +105,4 @@ Thumbs.db
 
 sonarlint
 /autobuilder-robot/build/
+/shared/build/
diff --git a/.idea/modules/AutoBuilder.iml b/.idea/modules/AutoBuilder.iml
diff --git a/.idea/modules/autobuilder-robot/AutoBuilder.autobuilder-robot.iml b/.idea/modules/autobuilder-robot/AutoBuilder.autobuilder-robot.iml
diff --git a/.idea/modules/autobuilder-robot/AutoBuilder.autobuilder-robot.main.iml b/.idea/modules/autobuilder-robot/AutoBuilder.autobuilder-robot.main.iml
diff --git a/.idea/modules/autobuilder-robot/AutoBuilder.autobuilder-robot.test.iml b/.idea/modules/autobuilder-robot/AutoBuilder.autobuilder-robot.test.iml
diff --git a/.idea/modules/shared/AutoBuilder.shared.iml b/.idea/modules/shared/AutoBuilder.shared.iml
diff --git a/.idea/modules/shared/AutoBuilder.shared.main.iml b/.idea/modules/shared/AutoBuilder.shared.main.iml
diff --git a/.idea/modules/shared/AutoBuilder.shared.test.iml b/.idea/modules/shared/AutoBuilder.shared.test.iml
diff --git a/autobuilder-robot/build.gradle b/autobuilder-robot/build.gradle
@@ -10,8 +10,8 @@ sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
 group = 'com.dacubeking'
-version = '2.2.8'
-var wpilibVersion = "2023.4.3"
+version = '2.2.9'
+var wpilibVersion = "2024.1.1"
 
 repositories {
     // Use Maven Central for resolving dependencies.

diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ plugins {
 allprojects {
     apply plugin: "eclipse"
 
-    version = '2.2.7'
+    version = '2.2.8'
     ext {
         appName = "AutoBuilder"
         gdxVersion = '1.10.0'

diff --git a/core/assets/field24.png b/core/assets/field24.png
diff --git a/core/src/main/com/dacubeking/autobuilder/gui/AutoBuilder.java b/core/src/main/com/dacubeking/autobuilder/gui/AutoBuilder.java
@@ -176,7 +176,10 @@ public void create() {
         if (new File(USER_DIRECTORY + "/field.png").exists()) {
             field = new Texture(new FileHandle(USER_DIRECTORY + "/field.png"), true);
         } else {
-            field = new Texture(Gdx.files.internal("field23.png"), true);
+            field = new Texture(Gdx.files.internal("field24.png"), true);
+            config.setPointScaleFactor(169.934f);
+            config.setOriginX(-514);
+            config.setOriginY(-777);
         }
 
         field.setFilter(TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Nearest);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -105,3 +105,4 @@ Thumbs.db

		sonarlint
		/autobuilder-robot/build/
		/shared/build/