Merge pull request #42 from SmileGamez/launcher

Changed background image
Martomate · Jan 4, 2020 · f907bf6 · f907bf6
2 parents 9a03d56 + 93798cc
commit f907bf6
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 6 deletions.
diff --git a/.import/Bakgrundsbild i launchern.png-3c7603a7d88df4a6cdbcc443398b5424.md5 b/.import/Bakgrundsbild i launchern.png-3c7603a7d88df4a6cdbcc443398b5424.md5
@@ -0,0 +1,3 @@
+source_md5="1bf3342f840b4b057ad06c3698c484d8"
+dest_md5="1993e689b25ea9a1345e75a133df339c"
+
diff --git a/.import/Bakgrundsbild i launchern2.0.png-8210d112ce64ea8205615a57672407a9.md5 b/.import/Bakgrundsbild i launchern2.0.png-8210d112ce64ea8205615a57672407a9.md5
@@ -0,0 +1,3 @@
+source_md5="13e6aae05c823343e52ecf815f0e6318"
+dest_md5="f682783caabd27baf8c968f09655fcbb"
+
diff --git a/.import/Bakgrundsbild i launchern2.0.png-8210d112ce64ea8205615a57672407a9.stex b/.import/Bakgrundsbild i launchern2.0.png-8210d112ce64ea8205615a57672407a9.stex
diff --git a/.import/background.png-98289422cd7d93003950872a7b97021f.stex b/.import/background.png-98289422cd7d93003950872a7b97021f.stex
diff --git a/Bakgrundsbild i launchern2.0.png b/Bakgrundsbild i launchern2.0.png
diff --git a/background.png.import → Bakgrundsbild i launchern2.0.png.import b/background.png.import → Bakgrundsbild i launchern2.0.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/background.png-98289422cd7d93003950872a7b97021f.stex"
+path="res://.import/Bakgrundsbild i launchern2.0.png-8210d112ce64ea8205615a57672407a9.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://background.png"
-dest_files=[ "res://.import/background.png-98289422cd7d93003950872a7b97021f.stex" ]
+source_file="res://Bakgrundsbild i launchern2.0.png"
+dest_files=[ "res://.import/Bakgrundsbild i launchern2.0.png-8210d112ce64ea8205615a57672407a9.stex" ]
 
 [params]
 

diff --git a/Window.tscn b/Window.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://main_theme.tres" type="Theme" id=1]
 [ext_resource path="res://Window.gd" type="Script" id=2]
-[ext_resource path="res://background.png" type="Texture" id=3]
+[ext_resource path="res://Bakgrundsbild i launchern2.0.png" type="Texture" id=3]
 [ext_resource path="res://Verdana.ttf" type="DynamicFontData" id=4]
 [ext_resource path="res://play_button_style.tres" type="StyleBox" id=5]
 
@@ -102,7 +102,7 @@ margin_bottom = 29.0
 size_flags_horizontal = 0
 text = "Latest release (0.8)"
 flat = true
-items = [ "Latest release (0.8)", null, false, -1, null ]
+items = [ "Latest release (0.8)", null, false, 0, null ]
 selected = 0
 
 [node name="Filler" type="Label" parent="MarginContainer/HBoxContainer"]

diff --git a/background.png b/background.png
diff --git a/project.godot b/project.godot
@@ -24,7 +24,7 @@ config/name="Hexacraft Launcher"
 run/main_scene="res://Window.tscn"
 config/use_custom_user_dir=true
 config/custom_user_dir_name="Hexacraft"
-boot_splash/image="res://background.png"
+boot_splash/image="res://Bakgrundsbild i launchern2.0.png"
 config/icon="res://icon.png"
 
 [display]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		source_md5="1bf3342f840b4b057ad06c3698c484d8"
		dest_md5="1993e689b25ea9a1345e75a133df339c"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		source_md5="13e6aae05c823343e52ecf815f0e6318"
		dest_md5="f682783caabd27baf8c968f09655fcbb"