Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved the world scene and it's dependencies under scenes/world.

Browse Source
This commit is contained in:
Relintai 2022-02-12 20:03:17 +01:00
parent afb1ad62d4
commit e93dbcaeb0
11 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game/materials/5_standard_material_nouv2.tres
View File

File diff suppressed because one or more lines are too long

4
game/menu/Menu.tscn
View File

@ -16,8 +16,8 @@
[ext_resource path="res://scenes/ConnectServerButton.gd" type="Script" id=14] [ext_resource path="res://scenes/ConnectServerButton.gd" type="Script" id=14]
[ext_resource path="res://scenes/HostGameButton.gd" type="Script" id=15] [ext_resource path="res://scenes/HostGameButton.gd" type="Script" id=15]
[ext_resource path="res://menu/MenuWorld.gd" type="Script" id=16] [ext_resource path="res://menu/MenuWorld.gd" type="Script" id=16]
[ext_resource path="res://tw/new_terramanlibrarymerger.tres" type="TerrainLibraryMerger" id=17] [ext_resource path="res://scenes/world/new_terramanlibrarymerger.tres" type="TerrainLibraryMerger" id=17]
[ext_resource path="res://tw/new_terramanlevelgenerator.tres" type="TerrainLevelGenerator" id=18] [ext_resource path="res://scenes/world/new_terramanlevelgenerator.tres" type="TerrainLevelGenerator" id=18]
[ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=19] [ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=19]
[ext_resource path="res://ui/windows/about/About.tscn" type="PackedScene" id=20] [ext_resource path="res://ui/windows/about/About.tscn" type="PackedScene" id=20]
[ext_resource path="res://menu/ExitButton.gd" type="Script" id=21] [ext_resource path="res://menu/ExitButton.gd" type="Script" id=21]

2
game/scenes/Main.tscn
View File

@ -1,7 +1,7 @@
[gd_scene load_steps=7 format=2] [gd_scene load_steps=7 format=2]
[ext_resource path="res://scenes/MainScene.gd" type="Script" id=1] [ext_resource path="res://scenes/MainScene.gd" type="Script" id=1]
[ext_resource path="res://tw/TerrainWorldBlocky.tscn" type="PackedScene" id=2] [ext_resource path="res://scenes/world/TerrainWorldBlocky.tscn" type="PackedScene" id=2]
[ext_resource path="res://menu/Menu.tscn" type="PackedScene" id=3] [ext_resource path="res://menu/Menu.tscn" type="PackedScene" id=3]
[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=4] [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=4]
[ext_resource path="res://ui/debug/DebugInfo.tscn" type="PackedScene" id=5] [ext_resource path="res://ui/debug/DebugInfo.tscn" type="PackedScene" id=5]

0
game/tw/TerrainWorldBlocky.gd → game/scenes/world/TerrainWorldBlocky.gd
View File

6
game/tw/TerrainWorldBlocky.tscn → game/scenes/world/TerrainWorldBlocky.tscn
View File

@ -1,8 +1,8 @@
[gd_scene load_steps=8 format=2] [gd_scene load_steps=8 format=2]
[ext_resource path="res://tw/new_terramanlibrarymergerpcm.tres" type="TerrainLibraryMergerPCM" id=1] [ext_resource path="res://scenes/world/new_terramanlibrarymergerpcm.tres" type="TerrainLibraryMergerPCM" id=1]
[ext_resource path="res://tw/TerrainWorldBlocky.gd" type="Script" id=2] [ext_resource path="res://scenes/world/TerrainWorldBlocky.gd" type="Script" id=2]
[ext_resource path="res://tw/world_generator.tres" type="TerrainLevelGenerator" id=3] [ext_resource path="res://scenes/world/world_generator.tres" type="TerrainLevelGenerator" id=3]
[ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=4] [ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=4]
[ext_resource path="res://tests/test_props/MeshDataInstance.tres" type="PropData" id=5] [ext_resource path="res://tests/test_props/MeshDataInstance.tres" type="PropData" id=5]

0
game/tw/new_terramanlevelgenerator.gd → game/scenes/world/new_terramanlevelgenerator.gd
View File

2
game/tw/new_terramanlevelgenerator.tres → game/scenes/world/new_terramanlevelgenerator.tres
View File

@ -1,6 +1,6 @@
[gd_resource type="TerrainLevelGenerator" load_steps=2 format=2] [gd_resource type="TerrainLevelGenerator" load_steps=2 format=2]
[ext_resource path="res://tw/new_terramanlevelgenerator.gd" type="Script" id=1] [ext_resource path="res://scenes/world/new_terramanlevelgenerator.gd" type="Script" id=1]
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )

0
game/tw/new_terramanlevelgeneratorflat.tres → game/scenes/world/new_terramanlevelgeneratorflat.tres
View File

24
game/tw/new_terramanlibrarymerger.tres → game/scenes/world/new_terramanlibrarymerger.tres
View File

@ -1,8 +1,8 @@
[gd_resource type="TerrainLibraryMerger" load_steps=10 format=2] [gd_resource type="TerrainLibraryMerger" load_steps=10 format=2]
[ext_resource path="res://worlds/test_world/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] [ext_resource path="res://worlds/test_world/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1]
[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_1_albedo.png" type="Texture" id=2] [ext_resource path="res://worlds/test_world/voxel_library/textures/dirt_albedo.png" type="Texture" id=2]
[ext_resource path="res://worlds/test_world/voxel_library/textures/dirt_albedo.png" type="Texture" id=3] [ext_resource path="res://worlds/test_world/voxel_library/textures/stone_1_albedo.png" type="Texture" id=3]
[ext_resource path="res://materials/7_standard_material_notex.tres" type="Material" id=4] [ext_resource path="res://materials/7_standard_material_notex.tres" type="Material" id=4]
[ext_resource path="res://materials/5_standard_material_nouv2.tres" type="Material" id=5] [ext_resource path="res://materials/5_standard_material_nouv2.tres" type="Material" id=5]
@ -12,20 +12,20 @@ texture_bottom = ExtResource( 1 )
texture_side = ExtResource( 1 ) texture_side = ExtResource( 1 )
[sub_resource type="TerrainSurfaceMerger" id=2] [sub_resource type="TerrainSurfaceMerger" id=2]
texture_top = ExtResource( 3 )
texture_bottom = ExtResource( 3 )
texture_side = ExtResource( 3 )
[sub_resource type="TerrainSurfaceMerger" id=3]
texture_top = ExtResource( 3 )
texture_bottom = ExtResource( 1 )
texture_side = ExtResource( 2 )
[sub_resource type="TerrainSurfaceMerger" id=4]
texture_top = ExtResource( 2 ) texture_top = ExtResource( 2 )
texture_bottom = ExtResource( 2 ) texture_bottom = ExtResource( 2 )
texture_side = ExtResource( 2 ) texture_side = ExtResource( 2 )
[sub_resource type="TerrainSurfaceMerger" id=3]
texture_top = ExtResource( 2 )
texture_bottom = ExtResource( 1 )
texture_side = ExtResource( 3 )
[sub_resource type="TerrainSurfaceMerger" id=4]
texture_top = ExtResource( 3 )
texture_bottom = ExtResource( 3 )
texture_side = ExtResource( 3 )
[resource] [resource]
materials = [ ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 4 ) ] materials = [ ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 4 ) ]
texture_flags = 1 texture_flags = 1

40
game/tw/new_terramanlibrarymergerpcm.tres → game/scenes/world/new_terramanlibrarymergerpcm.tres
View File

@ -1,35 +1,35 @@
[gd_resource type="TerrainLibraryMergerPCM" load_steps=12 format=2] [gd_resource type="TerrainLibraryMergerPCM" load_steps=12 format=2]
[ext_resource path="res://worlds/test_world/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] [ext_resource path="res://materials/8_standard_material_prop_notex.tres" type="Material" id=1]
[ext_resource path="res://worlds/test_world/voxel_library/textures/stone_1_albedo.png" type="Texture" id=2] [ext_resource path="res://materials/6_standard_material_prop_nouv2.tres" type="Material" id=2]
[ext_resource path="res://worlds/test_world/voxel_library/textures/dirt_albedo.png" type="Texture" id=3] [ext_resource path="res://worlds/test_world/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=3]
[ext_resource path="res://materials/7_standard_material_notex.tres" type="Material" id=4] [ext_resource path="res://worlds/test_world/voxel_library/textures/dirt_albedo.png" type="Texture" id=4]
[ext_resource path="res://materials/5_standard_material_nouv2.tres" type="Material" id=5] [ext_resource path="res://worlds/test_world/voxel_library/textures/stone_1_albedo.png" type="Texture" id=5]
[ext_resource path="res://materials/6_standard_material_prop_nouv2.tres" type="Material" id=6] [ext_resource path="res://materials/7_standard_material_notex.tres" type="Material" id=6]
[ext_resource path="res://materials/8_standard_material_prop_notex.tres" type="Material" id=7] [ext_resource path="res://materials/5_standard_material_nouv2.tres" type="Material" id=7]
[sub_resource type="TerrainSurfaceMerger" id=1] [sub_resource type="TerrainSurfaceMerger" id=1]
texture_top = ExtResource( 1 )
texture_bottom = ExtResource( 1 )
texture_side = ExtResource( 1 )
[sub_resource type="TerrainSurfaceMerger" id=2]
texture_top = ExtResource( 3 ) texture_top = ExtResource( 3 )
texture_bottom = ExtResource( 3 ) texture_bottom = ExtResource( 3 )
texture_side = ExtResource( 3 ) texture_side = ExtResource( 3 )
[sub_resource type="TerrainSurfaceMerger" id=2]
texture_top = ExtResource( 4 )
texture_bottom = ExtResource( 4 )
texture_side = ExtResource( 4 )
[sub_resource type="TerrainSurfaceMerger" id=3] [sub_resource type="TerrainSurfaceMerger" id=3]
texture_top = ExtResource( 3 ) texture_top = ExtResource( 4 )
texture_bottom = ExtResource( 1 ) texture_bottom = ExtResource( 3 )
texture_side = ExtResource( 2 ) texture_side = ExtResource( 5 )
[sub_resource type="TerrainSurfaceMerger" id=4] [sub_resource type="TerrainSurfaceMerger" id=4]
texture_top = ExtResource( 2 ) texture_top = ExtResource( 5 )
texture_bottom = ExtResource( 2 ) texture_bottom = ExtResource( 5 )
texture_side = ExtResource( 2 ) texture_side = ExtResource( 5 )
[resource] [resource]
materials = [ ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 4 ) ] materials = [ ExtResource( 7 ), ExtResource( 7 ), ExtResource( 7 ), ExtResource( 7 ), ExtResource( 6 ) ]
prop_materials = [ ExtResource( 6 ), ExtResource( 6 ), ExtResource( 6 ), ExtResource( 6 ), ExtResource( 7 ) ] prop_materials = [ ExtResource( 2 ), ExtResource( 2 ), ExtResource( 2 ), ExtResource( 2 ), ExtResource( 1 ) ]
texture_flags = 1 texture_flags = 1
voxel_surfaces = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ) ] voxel_surfaces = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ) ]

8
game/tw/world_generator.tres → game/scenes/world/world_generator.tres
View File

@ -1,10 +1,10 @@
[gd_resource type="TerrainLevelGenerator" load_steps=3 format=2] [gd_resource type="TerrainLevelGenerator" load_steps=3 format=2]
[ext_resource path="res://scripts/world_generators/TerrainWorldGenerator.gd" type="Script" id=1] [ext_resource path="res://worlds/test_world/test_world.tres" type="Resource" id=1]
[ext_resource path="res://worlds/test_world/test_world.tres" type="Resource" id=2] [ext_resource path="res://scripts/world_generators/TerrainWorldGenerator.gd" type="Script" id=2]
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 2 )
_level_seed = 0 _level_seed = 0
_spawn_mobs = true _spawn_mobs = true
world_gen_world = ExtResource( 2 ) world_gen_world = ExtResource( 1 )