Merge branch 'MaxBondarev' into 'develop'

Max bondarev See merge request tehnokom/universo!15

Merge branch 'MaxBondarev' into 'develop'
Max bondarev See merge request tehnokom/universo!15
92d742a5 · Max Bondarev · 52eceb8c · 05caafac · 92d742a5 · 52eceb8c
--- a/.gitignore
+++ b/.gitignore
-.import
+.import/
 export_presets.cfg
+addons/
+
--- a/blokoj/toroid/resursoj/default_env.tres
+++ b/blokoj/toroid/resursoj/default_env.tres
-[gd_resource type="Environment" load_steps=2 format=2]
-
-[sub_resource type="ProceduralSky" id=1]
-
-[resource]
-background_sky = SubResource( 1 )
-background_color = Color( 0.137255, 0.141176, 0.152941, 1 )
--- a/blokoj/toroid/scenoj/toroid.tscn
+++ b/blokoj/toroid/scenoj/toroid.tscn
@@ -2,7 +2,7 @@

 [ext_resource path="res://blokoj/toroid/resursoj/torus_arraymesh.tres" type="ArrayMesh" id=1]
 [ext_resource path="res://blokoj/toroid/skriptoj/player.gd" type="Script" id=2]
-[ext_resource path="res://blokoj/toroid/resursoj/default_env.tres" type="Environment" id=3]
+[ext_resource path="res://resursoj/spaco_env.tres" type="Environment" id=3]

 [sub_resource type="SpatialMaterial" id=1]
 albedo_color = Color( 0.639216, 0.639216, 0.639216, 1 )

--- a/project.godot
+++ b/project.godot
@@ -8,17 +8,30 @@

 config_version=4

-_global_script_classes=[  ]
+_global_script_classes=[ {
+"base": "Node",
+"class": "WATTest",
+"language": "GDScript",
+"path": "res://addons/WAT/Runner/test.gd"
+} ]
 _global_script_class_icons={
-
+"WATTest": ""
 }

+[WAT]
+
+Test_Directory="res://tests"
+
 [application]

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

+[editor_plugins]
+
+enabled=PoolStringArray( "WAT" )
+
 [input]

 ui_left={

--- a/resursoj/spaco_env.tres
+++ b/resursoj/spaco_env.tres
+[gd_resource type="Environment" load_steps=3 format=2]
+
+[sub_resource type="StreamTexture" id=1]
+flags = 4
+load_path = "res://.import/stelamapo_8k.jpg-0d40f450d9748662037f2f810c67353f.stex"
+
+[sub_resource type="PanoramaSky" id=2]
+radiance_size = 6
+panorama = SubResource( 1 )
+
+[resource]
+background_mode = 2
+background_sky = SubResource( 2 )
+background_color = Color( 0.137255, 0.141176, 0.152941, 1 )
--- a/resursoj/stelamapo_8k.jpg
+++ b/resursoj/stelamapo_8k.jpg
--- a/resursoj/stelamapo_8k.jpg.import
+++ b/resursoj/stelamapo_8k.jpg.import
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/stelamapo_8k.jpg-0d40f450d9748662037f2f810c67353f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resursoj/stelamapo_8k.jpg"
+dest_files=[ "res://.import/stelamapo_8k.jpg-0d40f450d9748662037f2f810c67353f.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0