diff --git a/.gitattributes b/.gitattributes index c84c197d5..69f4dd9e3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,3 +5,4 @@ *.opus filter=lfs diff=lfs merge=lfs -text *.pdf filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text +*.kra filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/.gitignore b/.gitignore index e6e7ba5d5..d5a73b6a3 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ workspace.xml # Temporary files .tmp* tmp_* +*.bak ## Microsoft Office ~$* ## Generic temp files in Linux diff --git a/src/net/torvald/terrarum/ModOptionsHost.kt b/src/net/torvald/terrarum/ModOptionsHost.kt new file mode 100644 index 000000000..98a067f75 --- /dev/null +++ b/src/net/torvald/terrarum/ModOptionsHost.kt @@ -0,0 +1,38 @@ +package net.torvald.terrarum + +import com.badlogic.gdx.graphics.Camera +import com.badlogic.gdx.graphics.g2d.SpriteBatch +import net.torvald.terrarum.modulebasegame.ui.UIRemoCon +import net.torvald.terrarum.ui.UICanvas + +class ModOptionsHost : UICanvas() { + + override var openCloseTime: Second = 0f + + private val moduleAreaHMargin = 48 + private val moduleAreaBorder = 8 + + override var width = AppLoader.screenW - UIRemoCon.remoConWidth - moduleAreaHMargin + override var height = AppLoader.screenH - moduleAreaHMargin * 2 + + override fun updateUI(delta: Float) { + } + + override fun renderUI(batch: SpriteBatch, camera: Camera) { + } + + override fun doOpening(delta: Float) { + } + + override fun doClosing(delta: Float) { + } + + override fun endOpening(delta: Float) { + } + + override fun endClosing(delta: Float) { + } + + override fun dispose() { + } +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt b/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt index 5f07c632f..592b12f58 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt @@ -27,6 +27,7 @@ object UITitleRemoConYaml { - MENU_LABEL_RETURN - MENU_OPTIONS_SOUND - MENU_LABEL_LANGUAGE : net.torvald.terrarum.modulebasegame.ui.UITitleLanguage + - MENU_MODULES : net.torvald.terrarum.ModOptionsHost - MENU_LABEL_RETURN - MENU_MODULES : net.torvald.terrarum.modulebasegame.ui.UITitleModules - MENU_LABEL_RETURN diff --git a/work_files/DataFormats/Map data format.txt b/work_files/DataFormats/Worldmap format.txt similarity index 94% rename from work_files/DataFormats/Map data format.txt rename to work_files/DataFormats/Worldmap format.txt index 3d370d573..0e3265f2a 100644 --- a/work_files/DataFormats/Map data format.txt +++ b/work_files/DataFormats/Worldmap format.txt @@ -88,3 +88,5 @@ EOF FE Byte order mark * To read layers: you'll need to search for specific strings, namely ["TERR", "WALL", "WIRE"] +* It is possible that compressed data happen to replicate any of the internal identifiers + (e.g. "\0pLdTERR", "EndTEM\xFF\xFE", "EndPYLd\xFF"), but such probability is very low (0.000000000000000005421 %) diff --git a/work_files/physics_staircasing.kra b/work_files/physics_staircasing.kra index 3a2046800..de833b3be 100644 Binary files a/work_files/physics_staircasing.kra and b/work_files/physics_staircasing.kra differ