Merge pull request MovingBlocks#88 from LadySerenaKitty/Kitty-gitattr…

…ibutes

Fixing line endings

.gitattributes

@@ -1,4 +1,4 @@
-* text=auto !eol
+* text=auto
 
 *.bat          text eol=crlf
 *.gradle       text
@@ -20,4 +20,4 @@
 
 gradlew        text eol=lf
 LICENSE        text
-NOTICE         text
+NOTICE         text

main/debugOptions.ini

@@ -1,30 +1,30 @@
-# world initialization
-emulateMobile=false
-spawnPlace= # possible choices: planet, maze, trader
-forcePlanetType=
-forceSystemType=
-noObjs=false
-godMode=false
-
-# presentation
-noDras=false
-zoomOverride=0
-gridSz=0
-gameSpeedMultiplier=1
-directCamControl=false
-detailedMap=false
-noSound=false
-soundInSpace=false
-showWarnings=false
-showFps=false
-drawObjBorders=false
-drawDraBorders=false
-drawPhysicBorders=false
-drawPlanetBorders=false
-miscInfo=false
-objInfo=false
-soundInfo=false
-texInfo=false
-missingSoundAction=fail # possible choices: ignore, warn, fail
-missingTextureAction=fail
+# world initialization
+emulateMobile=false
+spawnPlace= # possible choices: planet, maze, trader
+forcePlanetType=
+forceSystemType=
+noObjs=false
+godMode=false
+
+# presentation
+noDras=false
+zoomOverride=0
+gridSz=0
+gameSpeedMultiplier=1
+directCamControl=false
+detailedMap=false
+noSound=false
+soundInSpace=false
+showWarnings=false
+showFps=false
+drawObjBorders=false
+drawDraBorders=false
+drawPhysicBorders=false
+drawPlanetBorders=false
+miscInfo=false
+objInfo=false
+soundInfo=false
+texInfo=false
+missingSoundAction=fail # possible choices: ignore, warn, fail
+missingTextureAction=fail
 missingPhysicsAction=fail

main/imgSrcs/asteroids/pack.json

@@ -1,6 +1,6 @@
-{
-  minWidth: 512,
-  minHeight: 512,
-  maxWidth: 512,
-  maxHeight: 512,
+{
+  minWidth: 512,
+  minHeight: 512,
+  maxWidth: 512,
+  maxHeight: 512,
 }

main/imgSrcs/deco/pack.json

@@ -1,7 +1,7 @@
-{
-  minWidth: 512,
-  minHeight: 512,
-  maxWidth: 512,
-  maxHeight: 512,
-  combineSubdirectories: true,
+{
+  minWidth: 512,
+  minHeight: 512,
+  maxWidth: 512,
+  maxHeight: 512,
+  combineSubdirectories: true,
 }

main/imgSrcs/grounds/desert/pack.json

@@ -1,6 +1,6 @@
-{
-  minWidth: 1024,
-  minHeight: 1024,
-  maxWidth: 1024,
-  maxHeight: 1024,
+{
+  minWidth: 1024,
+  minHeight: 1024,
+  maxWidth: 1024,
+  maxHeight: 1024,
 }

main/imgSrcs/hulls/pack.json

@@ -1,6 +1,6 @@
-{
-  minWidth: 1024,
-  minHeight: 1024,
-  maxWidth: 1024,
-  maxHeight: 1024,
+{
+  minWidth: 1024,
+  minHeight: 1024,
+  maxWidth: 1024,
+  maxHeight: 1024,
 }

main/imgSrcs/mapObjs/pack.json

@@ -1,6 +1,6 @@
-{
-  minWidth: 512,
-  minHeight: 512,
-  maxWidth: 512,
-  maxHeight: 512,
+{
+  minWidth: 512,
+  minHeight: 512,
+  maxWidth: 512,
+  maxHeight: 512,
 }

main/imgSrcs/pack.json

@@ -1,30 +1,30 @@
-{
-  pot: true,
-  paddingX: 0,
-  paddingY: 0,
-  bleed: true,
-  edgePadding: true,
-  rotation: false,
-  minWidth: 16,
-  minHeight: 16,
-  maxWidth: 1024,
-  maxHeight: 1024,
-  stripWhitespaceX: false,
-  stripWhitespaceY: false,
-  alphaThreshold: 0,
-  filterMin: MipMapNearestNearest,
-  filterMag: MipMapNearestNearest,
-  wrapX: ClampToEdge,
-  wrapY: ClampToEdge,
-  format: RGBA8888,
-  alias: true,
-  outputFormat: png,
-  jpegQuality: 0.9,
-  ignoreBlankImages: true,
-  fast: false,
-  debug: false,
-  combineSubdirectories: false,
-  flattenPaths: false,
-  premultiplyAlpha: false,
-  useIndexes: true
+{
+  pot: true,
+  paddingX: 0,
+  paddingY: 0,
+  bleed: true,
+  edgePadding: true,
+  rotation: false,
+  minWidth: 16,
+  minHeight: 16,
+  maxWidth: 1024,
+  maxHeight: 1024,
+  stripWhitespaceX: false,
+  stripWhitespaceY: false,
+  alphaThreshold: 0,
+  filterMin: MipMapNearestNearest,
+  filterMag: MipMapNearestNearest,
+  wrapX: ClampToEdge,
+  wrapY: ClampToEdge,
+  format: RGBA8888,
+  alias: true,
+  outputFormat: png,
+  jpegQuality: 0.9,
+  ignoreBlankImages: true,
+  fast: false,
+  debug: false,
+  combineSubdirectories: false,
+  flattenPaths: false,
+  premultiplyAlpha: false,
+  useIndexes: true
 }

main/imgSrcs/planetStarCommons/pack.json

@@ -1,7 +1,7 @@
-{
-  minWidth: 512,
-  minHeight: 512,
-  maxWidth: 512,
-  maxHeight: 512,
-  combineSubdirectories: true,
+{
+  minWidth: 512,
+  minHeight: 512,
+  maxWidth: 512,
+  maxHeight: 512,
+  combineSubdirectories: true,
 }

main/imgSrcs/skies/pack.json

@@ -1,7 +1,7 @@
-{
-  minWidth: 128,
-  minHeight: 128,
-  maxWidth: 128,
-  maxHeight: 128,
-  combineSubdirectories: true,
+{
+  minWidth: 128,
+  minHeight: 128,
+  maxWidth: 128,
+  maxHeight: 128,
+  combineSubdirectories: true,
 }

main/imgSrcs/smallGameObjs/pack.json

@@ -1,7 +1,7 @@
-{
-  minWidth: 1024,
-  minHeight: 1024,
-  maxWidth: 1024,
-  maxHeight: 1024,
-  combineSubdirectories: true,
+{
+  minWidth: 1024,
+  minHeight: 1024,
+  maxWidth: 1024,
+  maxHeight: 1024,
+  combineSubdirectories: true,
 }

main/imgSrcs/ui/pack.json

@@ -1,7 +1,7 @@
-{
-  minWidth: 512,
-  minHeight: 512,
-  maxWidth: 512,
-  maxHeight: 512,
-  combineSubdirectories: true,
+{
+  minWidth: 512,
+  minHeight: 512,
+  maxWidth: 512,
+  maxHeight: 512,
+  combineSubdirectories: true,
 }

main/res/configs/abilities.json

@@ -1,54 +1,54 @@
-{
-  sloMo: {
-    effect: {
-      effectFile: areaShipAbility,
-      tex: sloMo,
-      tint: fire,
-      size: 5,
-    },
-
-    activatedSound: "abilities/sloMoActivated",
-  },
-
-
-
-  knockBack: {
-    effect: {
-      effectFile: knockBack,
-      tex: knockBack,
-      tint: "50 200 250",
-    },
-
-    activatedSound: "abilities/knockBackActivated",
-  },
-
-
-
-  emWave: {
-    effect: {
-      effectFile: areaShipAbility,
-      tex: emWave,
-      tint: "0 255 0",
-    },
-
-    activatedSound: "abilities/unShieldActivated",
-  },
-
-
-
-  unShield: {
-    effect: {
-      effectFile: knockBack,
-      tex: unShield,
-      tint: "0 100 255",
-    },
-
-    activatedSound: "abilities/unShieldActivated",
-  },
-
-
-
-  teleport: {
-    activatedSound: "abilities/teleportActivated",
-  },
+{
+  sloMo: {
+    effect: {
+      effectFile: areaShipAbility,
+      tex: sloMo,
+      tint: fire,
+      size: 5,
+    },
+
+    activatedSound: "abilities/sloMoActivated",
+  },
+
+
+
+  knockBack: {
+    effect: {
+      effectFile: knockBack,
+      tex: knockBack,
+      tint: "50 200 250",
+    },
+
+    activatedSound: "abilities/knockBackActivated",
+  },
+
+
+
+  emWave: {
+    effect: {
+      effectFile: areaShipAbility,
+      tex: emWave,
+      tint: "0 255 0",
+    },
+
+    activatedSound: "abilities/unShieldActivated",
+  },
+
+
+
+  unShield: {
+    effect: {
+      effectFile: knockBack,
+      tex: unShield,
+      tint: "0 100 255",
+    },
+
+    activatedSound: "abilities/unShieldActivated",
+  },
+
+
+
+  teleport: {
+    activatedSound: "abilities/teleportActivated",
+  },
 }