From 76fcb5b12fcb45fa48e00f0800a631117d640a8f Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Sun, 5 Mar 2017 01:31:40 +0900 Subject: [PATCH] git gud Former-commit-id: 86d4fba868dbe1c2841e1829f2857ff47187cc57 --- .gitattributes | 1 + assets/.gitattributes | 1 - assets/graphics/.gitattributes | 1 - assets/graphics/colourmap/.gitattributes | 1 - assets/graphics/fonts/.gitattributes | 1 - assets/graphics/gui/.gitattributes | 1 - assets/graphics/gui/quickbar/.gitattributes | 1 - assets/graphics/items/.gitattributes | 1 - assets/graphics/sprites/.gitattributes | 1 - assets/graphics/sprites/fixtures/.gitattributes | 1 - assets/graphics/terrain/.gitattributes | 1 - assets/graphics/weathers/.gitattributes | 1 - lib/slick-source/org/newdawn/slick/data/.gitattributes | 1 - src/net/torvald/terrarum/DefaultConfig.kt | 8 ++++---- 14 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 assets/.gitattributes delete mode 100644 assets/graphics/.gitattributes delete mode 100644 assets/graphics/colourmap/.gitattributes delete mode 100644 assets/graphics/fonts/.gitattributes delete mode 100644 assets/graphics/gui/.gitattributes delete mode 100644 assets/graphics/gui/quickbar/.gitattributes delete mode 100644 assets/graphics/items/.gitattributes delete mode 100644 assets/graphics/sprites/.gitattributes delete mode 100644 assets/graphics/sprites/fixtures/.gitattributes delete mode 100644 assets/graphics/terrain/.gitattributes delete mode 100644 assets/graphics/weathers/.gitattributes delete mode 100644 lib/slick-source/org/newdawn/slick/data/.gitattributes diff --git a/.gitattributes b/.gitattributes index 6e487824c..dde9b4eb8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ *.psd filter=lfs diff=lfs merge=lfs -text *.ogg filter=lfs diff=lfs merge=lfs -text +*.tga filter=lfs diff=lfs merge=lfs -text diff --git a/assets/.gitattributes b/assets/.gitattributes deleted file mode 100644 index ca82ef549..000000000 --- a/assets/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/.gitattributes b/assets/graphics/.gitattributes deleted file mode 100644 index ca82ef549..000000000 --- a/assets/graphics/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/colourmap/.gitattributes b/assets/graphics/colourmap/.gitattributes deleted file mode 100644 index ca82ef549..000000000 --- a/assets/graphics/colourmap/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/fonts/.gitattributes b/assets/graphics/fonts/.gitattributes deleted file mode 100644 index ca82ef549..000000000 --- a/assets/graphics/fonts/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/gui/.gitattributes b/assets/graphics/gui/.gitattributes deleted file mode 100644 index ca82ef549..000000000 --- a/assets/graphics/gui/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/gui/quickbar/.gitattributes b/assets/graphics/gui/quickbar/.gitattributes deleted file mode 100644 index ca82ef549..000000000 --- a/assets/graphics/gui/quickbar/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/items/.gitattributes b/assets/graphics/items/.gitattributes deleted file mode 100644 index ca82ef549..000000000 --- a/assets/graphics/items/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/sprites/.gitattributes b/assets/graphics/sprites/.gitattributes deleted file mode 100644 index ca82ef549..000000000 --- a/assets/graphics/sprites/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/sprites/fixtures/.gitattributes b/assets/graphics/sprites/fixtures/.gitattributes deleted file mode 100644 index ca82ef549..000000000 --- a/assets/graphics/sprites/fixtures/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/terrain/.gitattributes b/assets/graphics/terrain/.gitattributes deleted file mode 100644 index ca82ef549..000000000 --- a/assets/graphics/terrain/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/weathers/.gitattributes b/assets/graphics/weathers/.gitattributes deleted file mode 100644 index ca82ef549..000000000 --- a/assets/graphics/weathers/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/lib/slick-source/org/newdawn/slick/data/.gitattributes b/lib/slick-source/org/newdawn/slick/data/.gitattributes deleted file mode 100644 index ca82ef549..000000000 --- a/lib/slick-source/org/newdawn/slick/data/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/src/net/torvald/terrarum/DefaultConfig.kt b/src/net/torvald/terrarum/DefaultConfig.kt index 3266f737b..7fce50326 100644 --- a/src/net/torvald/terrarum/DefaultConfig.kt +++ b/src/net/torvald/terrarum/DefaultConfig.kt @@ -33,10 +33,10 @@ object DefaultConfig { jsonObject.addProperty("joypadldown", 6) jsonObject.addProperty("joypadrdown", 7) // logitech indices - jsonObject.addProperty("joypadlstickx", 3) - jsonObject.addProperty("joypadlsticky", 2) - jsonObject.addProperty("joypadrstickx", 1) - jsonObject.addProperty("joypadrsticky", 0) // logitech indices + jsonObject.addProperty("joypadlstickx", 0) + jsonObject.addProperty("joypadlsticky", 1) + jsonObject.addProperty("joypadrstickx", 2) + jsonObject.addProperty("joypadrsticky", 3) // 0-1-2-3 but sometimes 3-2-1-0 ?! what the actual fuck? jsonObject.addProperty("joypadlabelstyle", "generic") // "nwii", "logitech", "sonyps", "msxb360", "generic"