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

Turns out my main monitor's color balance was set differently, changed the settings so the style would work with the proper defaults

Browse Source
This commit is contained in:
Relintai 2019-12-07 17:00:32 +01:00
parent 054bb18cd3
commit 3587693a99
4 changed files with 135 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
game/data/models/armature_model_orig_v2.tscn
View File

@ -237,7 +237,7 @@ mesh = SubResource( 2 )
material/0 = null
[node name="LeftHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="2"]
transform = Transform( 0.103431, -0.988256, -0.112285, 0.0563176, -0.106856, 0.992626, -0.993037, -0.108994, 0.0446027, 0.245368, 0.762877, -0.00918405 )
transform = Transform( -0.0261656, 0.130703, -0.991076, 0.130667, -0.982462, -0.133017, -0.991081, -0.132981, 0.008628, 0.648056, 1.24697, -0.00282456 )
bone_name = "left_hand"
[node name="LeftHandAP" type="Spatial" parent="armature/Armature/Skeleton/LeftHandAttachment"]
@ -245,7 +245,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.04, -0.09 )
script = ExtResource( 4 )
[node name="RightHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="3"]
transform = Transform( -0.0416231, -0.998434, 0.0367112, -0.126418, 0.0416962, 0.991032, -0.991117, 0.0366207, -0.127964, -0.247466, 0.765191, -0.00755787 )
transform = Transform( 0.0297754, 0.0950467, 0.995027, 0.082978, 0.991799, -0.0972217, -0.996107, 0.0854605, 0.0216443, -0.647894, 1.24856, -0.00479745 )
bone_name = "right_hand"
[node name="RightHandAP" type="Spatial" parent="armature/Armature/Skeleton/RightHandAttachment"]
@ -261,7 +261,7 @@ transform = Transform( 1, 0, 0, 0, -1.62921e-07, 1, 0, -1, -1.62921e-07, 0, 0, 0
script = ExtResource( 4 )
[node name="NeckAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"]
transform = Transform( 0.999966, -0.00294882, 0.00777352, 0.00830044, 0.316377, -0.948514, 0.000337654, 0.948621, 0.316418, 0.00130594, 1.31563, 0.00220716 )
transform = Transform( 1, -2.64337e-05, -0.000278883, -0.000254756, 0.328229, -0.944598, 0.000116508, 0.944599, 0.328229, 0.0010334, 1.32582, -0.0023075 )
bone_name = "neck"
[node name="TorsoAP" type="Spatial" parent="armature/Armature/Skeleton/NeckAttachment"]

132
game/scenes/Menu.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=23 format=2]
[gd_scene load_steps=24 format=2]
[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
[ext_resource path="res://menu/CharacterEntry.tscn" type="PackedScene" id=2]
@ -19,11 +19,12 @@
[ext_resource path="res://data/voxel_libraries/2_main_lib_merger_empty.tres" type="VoxelmanLibraryMerger" id=17]
[ext_resource path="res://scripts/world_generators/MainPlanetGenerator.gd" type="Script" id=18]
[ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=19]
[ext_resource path="res://voxelman/transvoxel_mesher/TVVoxelChunk.gd" type="Script" id=20]
[sub_resource type="VoxelmanLevelGenerator" id=1]
script = ExtResource( 18 )
_force_planet = -1
_level_seed = 0
_level_seed = 80
_spawn_mobs = false
[sub_resource type="ProceduralSky" id=2]
@ -40,19 +41,19 @@ sun_latitude = 39.71
sun_longitude = -8.09
sun_angle_min = 0.0
sun_angle_max = 23.15
sun_energy = 9.7
sun_energy = 9.29
texture_size = 0
[sub_resource type="Environment" id=3]
background_mode = 2
background_sky = SubResource( 2 )
ambient_light_color = Color( 1, 1, 1, 1 )
ambient_light_energy = 1.23
ambient_light_sky_contribution = 0.11
ambient_light_color = Color( 0.870588, 0.870588, 0.870588, 1 )
ambient_light_energy = 1.24
ambient_light_sky_contribution = 0.09
fog_enabled = true
fog_color = Color( 0.188235, 0.207843, 0.164706, 1 )
fog_color = Color( 0.184314, 0.207843, 0.156863, 1 )
fog_sun_color = Color( 0.239216, 0.337255, 0.396078, 1 )
fog_sun_amount = 0.54
fog_sun_amount = 0.53
fog_depth_begin = 155.9
fog_depth_end = 379.9
fog_depth_curve = 1.18921
@ -67,7 +68,8 @@ glow_strength = 1.1
glow_bloom = 0.1
glow_hdr_luminance_cap = 1.0
adjustment_enabled = true
adjustment_contrast = 1.05
adjustment_brightness = 1.1
adjustment_contrast = 1.25
[node name="Menu" type="Control"]
anchor_right = 1.0
@ -593,6 +595,118 @@ light_color = Color( 0.631373, 0.631373, 0.631373, 1 )
light_energy = 0.48
light_specular = 0.0
directional_shadow_normal_bias = 0.1
[node name="Chunk[-1,-1,-1]" type="VoxelChunk" parent="World"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -96, -96, -96 )
position_x = -1
position_y = -1
position_z = -1
size_x = 460293
library = ExtResource( 17 )
voxel_scale = 6.0
mesher = Object(VoxelMesherTransvoxel,"library":ExtResource( 17 ),"material":Resource( "res://data/materials/1_standard_material.tres" ),"voxel_scale":6.0,"lod_size":1,"ao_strength":0.2,"base_light_value":0.45,"uv_margin":Rect2( 0.017, 0.017, 0.966, 0.966 ),"script":Resource( "res://voxelman/transvoxel_mesher/TVVoxelMesher.gd" ))
voxel_world = Object(VoxelWorld,"_import_path":NodePath(""),"pause_mode":0,"process_priority":0,"transform":Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ),"visible":true,"up_vector":Vector3( 0, 1, 0 ),"chunk_size_x":16,"chunk_size_y":16,"chunk_size_z":16,"current_seed":0,"use_threads":false,"max_concurrent_generations":1,"library":ExtResource( 17 ),"level_generator":SubResource( 1 ),"voxel_scale":6.0,"chunk_spawn_range":1,"player_path":NodePath(""),"player":null,"script":ExtResource( 16 ),"meshes":[ ],"editor_generate":false,"show_loading_screen":false,"generate_on_ready":true,"initial_generation":true,"spawned":false,"_editor_generate":false,"_player_file_name":"","_player":null)
script = ExtResource( 20 )
[node name="Chunk[-1,0,-1]" type="VoxelChunk" parent="World"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -96, 0, -96 )
position_x = -1
position_z = -1
size_y = 532167232
size_z = 32704
data_size_x = 77842328
data_size_z = 251552768
library = ExtResource( 17 )
voxel_scale = 6.0
mesher = Object(VoxelMesherTransvoxel,"library":ExtResource( 17 ),"material":Resource( "res://data/materials/1_standard_material.tres" ),"voxel_scale":6.0,"lod_size":1,"ao_strength":0.2,"base_light_value":0.45,"uv_margin":Rect2( 0.017, 0.017, 0.966, 0.966 ),"script":Resource( "res://voxelman/transvoxel_mesher/TVVoxelMesher.gd" ))
voxel_world = Object(VoxelWorld,"_import_path":NodePath(""),"pause_mode":0,"process_priority":0,"transform":Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ),"visible":true,"up_vector":Vector3( 0, 1, 0 ),"chunk_size_x":16,"chunk_size_y":16,"chunk_size_z":16,"current_seed":0,"use_threads":false,"max_concurrent_generations":1,"library":ExtResource( 17 ),"level_generator":SubResource( 1 ),"voxel_scale":6.0,"chunk_spawn_range":1,"player_path":NodePath(""),"player":null,"script":ExtResource( 16 ),"meshes":[ ],"editor_generate":false,"show_loading_screen":false,"generate_on_ready":true,"initial_generation":true,"spawned":false,"_editor_generate":false,"_player_file_name":"","_player":null)
script = ExtResource( 20 )
[node name="Chunk[-1,-1,0]" type="VoxelChunk" parent="World"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -96, -96, 0 )
position_x = -1
position_y = -1
position_z = 252630368
data_size_x = 252631472
data_size_z = 252633200
library = ExtResource( 17 )
voxel_scale = 6.0
mesher = Object(VoxelMesherTransvoxel,"library":ExtResource( 17 ),"material":Resource( "res://data/materials/1_standard_material.tres" ),"voxel_scale":6.0,"lod_size":1,"ao_strength":0.2,"base_light_value":0.45,"uv_margin":Rect2( 0.017, 0.017, 0.966, 0.966 ),"script":Resource( "res://voxelman/transvoxel_mesher/TVVoxelMesher.gd" ))
voxel_world = Object(VoxelWorld,"_import_path":NodePath(""),"pause_mode":0,"process_priority":0,"transform":Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ),"visible":true,"up_vector":Vector3( 0, 1, 0 ),"chunk_size_x":16,"chunk_size_y":16,"chunk_size_z":16,"current_seed":0,"use_threads":false,"max_concurrent_generations":1,"library":ExtResource( 17 ),"level_generator":SubResource( 1 ),"voxel_scale":6.0,"chunk_spawn_range":1,"player_path":NodePath(""),"player":null,"script":ExtResource( 16 ),"meshes":[ ],"editor_generate":false,"show_loading_screen":false,"generate_on_ready":true,"initial_generation":true,"spawned":false,"_editor_generate":false,"_player_file_name":"","_player":null)
script = ExtResource( 20 )
[node name="Chunk[-1,0,0]" type="VoxelChunk" parent="World"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -96, 0, 0 )
position_x = -1
position_z = 29
size_x = 1
size_y = 4
library = ExtResource( 17 )
voxel_scale = 6.0
mesher = Object(VoxelMesherTransvoxel,"library":ExtResource( 17 ),"material":Resource( "res://data/materials/1_standard_material.tres" ),"voxel_scale":6.0,"lod_size":1,"ao_strength":0.2,"base_light_value":0.45,"uv_margin":Rect2( 0.017, 0.017, 0.966, 0.966 ),"script":Resource( "res://voxelman/transvoxel_mesher/TVVoxelMesher.gd" ))
voxel_world = Object(VoxelWorld,"_import_path":NodePath(""),"pause_mode":0,"process_priority":0,"transform":Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ),"visible":true,"up_vector":Vector3( 0, 1, 0 ),"chunk_size_x":16,"chunk_size_y":16,"chunk_size_z":16,"current_seed":0,"use_threads":false,"max_concurrent_generations":1,"library":ExtResource( 17 ),"level_generator":SubResource( 1 ),"voxel_scale":6.0,"chunk_spawn_range":1,"player_path":NodePath(""),"player":null,"script":ExtResource( 16 ),"meshes":[ ],"editor_generate":false,"show_loading_screen":false,"generate_on_ready":true,"initial_generation":true,"spawned":false,"_editor_generate":false,"_player_file_name":"","_player":null)
script = ExtResource( 20 )
[node name="Chunk[0,-1,-1]" type="VoxelChunk" parent="World"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -96, -96 )
position_x = 248352896
position_y = -1
position_z = -1
data_size_z = 248351808
library = ExtResource( 17 )
voxel_scale = 6.0
mesher = Object(VoxelMesherTransvoxel,"library":ExtResource( 17 ),"material":Resource( "res://data/materials/1_standard_material.tres" ),"voxel_scale":6.0,"lod_size":1,"ao_strength":0.2,"base_light_value":0.45,"uv_margin":Rect2( 0.017, 0.017, 0.966, 0.966 ),"script":Resource( "res://voxelman/transvoxel_mesher/TVVoxelMesher.gd" ))
voxel_world = Object(VoxelWorld,"_import_path":NodePath(""),"pause_mode":0,"process_priority":0,"transform":Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ),"visible":true,"up_vector":Vector3( 0, 1, 0 ),"chunk_size_x":16,"chunk_size_y":16,"chunk_size_z":16,"current_seed":0,"use_threads":false,"max_concurrent_generations":1,"library":ExtResource( 17 ),"level_generator":SubResource( 1 ),"voxel_scale":6.0,"chunk_spawn_range":1,"player_path":NodePath(""),"player":null,"script":ExtResource( 16 ),"meshes":[ ],"editor_generate":false,"show_loading_screen":false,"generate_on_ready":true,"initial_generation":true,"spawned":false,"_editor_generate":false,"_player_file_name":"","_player":null)
script = ExtResource( 20 )
[node name="Chunk[0,0,-1]" type="VoxelChunk" parent="World"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -96 )
position_z = -1
library = ExtResource( 17 )
voxel_scale = 6.0
mesher = Object(VoxelMesherTransvoxel,"library":ExtResource( 17 ),"material":Resource( "res://data/materials/1_standard_material.tres" ),"voxel_scale":6.0,"lod_size":1,"ao_strength":0.2,"base_light_value":0.45,"uv_margin":Rect2( 0.017, 0.017, 0.966, 0.966 ),"script":Resource( "res://voxelman/transvoxel_mesher/TVVoxelMesher.gd" ))
voxel_world = Object(VoxelWorld,"_import_path":NodePath(""),"pause_mode":0,"process_priority":0,"transform":Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ),"visible":true,"up_vector":Vector3( 0, 1, 0 ),"chunk_size_x":16,"chunk_size_y":16,"chunk_size_z":16,"current_seed":0,"use_threads":false,"max_concurrent_generations":1,"library":ExtResource( 17 ),"level_generator":SubResource( 1 ),"voxel_scale":6.0,"chunk_spawn_range":1,"player_path":NodePath(""),"player":null,"script":ExtResource( 16 ),"meshes":[ ],"editor_generate":false,"show_loading_screen":false,"generate_on_ready":true,"initial_generation":true,"spawned":false,"_editor_generate":false,"_player_file_name":"","_player":null)
script = ExtResource( 20 )
[node name="Chunk[0,-1,0]" type="VoxelChunk" parent="World"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -96, 0 )
position_y = -1
size_y = 7
size_z = 1065353216
data_size_x = 253500256
library = ExtResource( 17 )
voxel_scale = 6.0
mesher = Object(VoxelMesherTransvoxel,"library":ExtResource( 17 ),"material":Resource( "res://data/materials/1_standard_material.tres" ),"voxel_scale":6.0,"lod_size":1,"ao_strength":0.2,"base_light_value":0.45,"uv_margin":Rect2( 0.017, 0.017, 0.966, 0.966 ),"script":Resource( "res://voxelman/transvoxel_mesher/TVVoxelMesher.gd" ))
voxel_world = Object(VoxelWorld,"_import_path":NodePath(""),"pause_mode":0,"process_priority":0,"transform":Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ),"visible":true,"up_vector":Vector3( 0, 1, 0 ),"chunk_size_x":16,"chunk_size_y":16,"chunk_size_z":16,"current_seed":0,"use_threads":false,"max_concurrent_generations":1,"library":ExtResource( 17 ),"level_generator":SubResource( 1 ),"voxel_scale":6.0,"chunk_spawn_range":1,"player_path":NodePath(""),"player":null,"script":ExtResource( 16 ),"meshes":[ ],"editor_generate":false,"show_loading_screen":false,"generate_on_ready":true,"initial_generation":true,"spawned":false,"_editor_generate":false,"_player_file_name":"","_player":null)
script = ExtResource( 20 )
[node name="Chunk[0,0,0]" type="VoxelChunk" parent="World"]
position_x = 96
position_z = 254438160
data_size_x = 1
data_size_y = 111
data_size_z = 254440608
library = ExtResource( 17 )
voxel_scale = 6.0
mesher = Object(VoxelMesherTransvoxel,"library":ExtResource( 17 ),"material":Resource( "res://data/materials/1_standard_material.tres" ),"voxel_scale":6.0,"lod_size":1,"ao_strength":0.2,"base_light_value":0.45,"uv_margin":Rect2( 0.017, 0.017, 0.966, 0.966 ),"script":Resource( "res://voxelman/transvoxel_mesher/TVVoxelMesher.gd" ))
voxel_world = Object(VoxelWorld,"_import_path":NodePath(""),"pause_mode":0,"process_priority":0,"transform":Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 ),"visible":true,"up_vector":Vector3( 0, 1, 0 ),"chunk_size_x":16,"chunk_size_y":16,"chunk_size_z":16,"current_seed":0,"use_threads":false,"max_concurrent_generations":1,"library":ExtResource( 17 ),"level_generator":SubResource( 1 ),"voxel_scale":6.0,"chunk_spawn_range":1,"player_path":NodePath(""),"player":null,"script":ExtResource( 16 ),"meshes":[ ],"editor_generate":false,"show_loading_screen":false,"generate_on_ready":true,"initial_generation":true,"spawned":false,"_editor_generate":false,"_player_file_name":"","_player":null)
script = ExtResource( 20 )
[connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/Load" to="CharacterSelectorMenu" method="load_character"]
[connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/HBoxContainer/Delete" to="CharacterSelectorMenu" method="delete_character"]
[connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/HBoxContainer/Create" to="." method="switch_to_menu" binds= [ 1 ]]

15
game/scenes/World.tscn
View File

@ -25,19 +25,19 @@ sun_latitude = 39.71
sun_longitude = -8.09
sun_angle_min = 0.0
sun_angle_max = 23.15
sun_energy = 9.7
sun_energy = 9.29
texture_size = 0
[sub_resource type="Environment" id=3]
background_mode = 2
background_sky = SubResource( 2 )
ambient_light_color = Color( 1, 1, 1, 1 )
ambient_light_energy = 1.23
ambient_light_sky_contribution = 0.11
ambient_light_color = Color( 0.870588, 0.870588, 0.870588, 1 )
ambient_light_energy = 1.24
ambient_light_sky_contribution = 0.09
fog_enabled = true
fog_color = Color( 0.188235, 0.207843, 0.164706, 1 )
fog_color = Color( 0.184314, 0.207843, 0.156863, 1 )
fog_sun_color = Color( 0.239216, 0.337255, 0.396078, 1 )
fog_sun_amount = 0.54
fog_sun_amount = 0.53
fog_depth_begin = 155.9
fog_depth_end = 379.9
fog_depth_curve = 1.18921
@ -52,7 +52,8 @@ glow_strength = 1.1
glow_bloom = 0.1
glow_hdr_luminance_cap = 1.0
adjustment_enabled = true
adjustment_contrast = 1.05
adjustment_brightness = 1.1
adjustment_contrast = 1.25
[node name="World" type="VoxelWorld" groups=[
"save",

2
game/voxelman/transvoxel_mesher/TVVoxelWorld.gd
View File

@ -40,7 +40,7 @@ var _player_file_name : String
var _player : Entity
func _ready():
if generate_on_ready:
if generate_on_ready and not Engine.is_editor_hint():
if level_generator != null:
level_generator.setup(self, 80, false, library)