Merge branch 'MaxBondarev' into 'develop'

Max bondarev See merge request tehnokom/universo!11

Merge branch 'MaxBondarev' into 'develop'
Max bondarev See merge request tehnokom/universo!11
eae6c56f · Max Bondarev · fed93a25 · 09d3dd17 · eae6c56f · eae6c56f
--- a/default_env.tres
+++ b/default_env.tres
@@ -3,5 +3,5 @@
 [sub_resource type="ProceduralSky" id=1]

 [resource]
-background_mode = 2
 background_sky = SubResource( 1 )
+background_color = Color( 0.137255, 0.141176, 0.152941, 1 )
--- a/blokoj/toroid/torus_arraymesh.tres
+++ b/blokoj/toroid/torus_arraymesh.tres
--- a/root.tscn
+++ b/root.tscn
--- a/player.gd
+++ b/player.gd
--- a/project.godot
+++ b/project.godot
@@ -16,8 +16,8 @@ _global_script_class_icons={
 [application]

 config/name="Universo"
-run/main_scene="res://root.tscn"
-config/icon="res://icon.png"
+run/main_scene="res://blokoj/toroid/scenoj/toroid.tscn"
+config/icon="res://resursoj/icon.png"

 [input]


--- a/icon.png
+++ b/icon.png
--- a/icon.png.import
+++ b/icon.png.import
@@ -2,15 +2,15 @@

 importer="texture"
 type="StreamTexture"
-path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+path="res://.import/icon.png-ceaafdc6c89293a095426adfedd5b247.stex"
 metadata={
 "vram_texture": false
 }

 [deps]

-source_file="res://icon.png"
-dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
+source_file="res://resursoj/icon.png"
+dest_files=[ "res://.import/icon.png-ceaafdc6c89293a095426adfedd5b247.stex" ]

 [params]