curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 20:31:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

git gud

Browse Source 
Former-commit-id: 86d4fba868dbe1c2841e1829f2857ff47187cc57
This commit is contained in:
Song Minjae
2017-03-05 01:31:40 +09:00
parent 9bfb958b0c
commit ef8469d2d6
14 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -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

1
assets/.gitattributes vendored
View File

@@ -1 +0,0 @@
*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text

1
assets/graphics/.gitattributes vendored
View File

@@ -1 +0,0 @@
*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text

1
assets/graphics/colourmap/.gitattributes vendored
View File

@@ -1 +0,0 @@
*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text

1
assets/graphics/fonts/.gitattributes vendored
View File

@@ -1 +0,0 @@
*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text

1
assets/graphics/gui/.gitattributes vendored
View File

@@ -1 +0,0 @@
*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text

1
assets/graphics/gui/quickbar/.gitattributes vendored
View File

@@ -1 +0,0 @@
*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text

1
assets/graphics/items/.gitattributes vendored
View File

@@ -1 +0,0 @@
*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text

1
assets/graphics/sprites/.gitattributes vendored
View File

@@ -1 +0,0 @@
*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text

1
assets/graphics/sprites/fixtures/.gitattributes vendored
View File

@@ -1 +0,0 @@
*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text

1
assets/graphics/terrain/.gitattributes vendored
View File

@@ -1 +0,0 @@
*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text

1
assets/graphics/weathers/.gitattributes vendored
View File

@@ -1 +0,0 @@
*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text

1
lib/slick-source/org/newdawn/slick/data/.gitattributes vendored
View File

@@ -1 +0,0 @@
*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text

8
src/net/torvald/terrarum/DefaultConfig.kt
View File

@@ -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"