Compare commits

..

5 Commits

16 changed files with 205 additions and 23 deletions

View File

@ -0,0 +1,15 @@
[gd_resource type="Environment" load_steps=3 format=3 uid="uid://bu5lp0670r7nl"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_284l6"]
sky_top_color = Color(0.90063, 0.668517, 0.773633, 1)
sky_horizon_color = Color(0.862745, 0.780392, 0.564706, 1)
[sub_resource type="Sky" id="Sky_le0bg"]
sky_material = SubResource("ProceduralSkyMaterial_284l6")
[resource]
background_mode = 2
background_energy_multiplier = 0.25
sky = SubResource("Sky_le0bg")
ambient_light_source = 3
fog_light_color = Color(0.193826, 0.181174, 0.240142, 1)

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
[gd_scene load_steps=3 format=3 uid="uid://61lt10ktv534"] [gd_scene load_steps=3 format=3 uid="uid://61lt10ktv534"]
[ext_resource type="PackedScene" uid="uid://d3doutiwh4shy" path="res://Blender Files/LightPost.blend" id="1_n4j6v"] [ext_resource type="PackedScene" uid="uid://d3doutiwh4shy" path="res://Blender Files/Objects/LightPost.blend" id="1_n4j6v"]
[sub_resource type="CylinderShape3D" id="CylinderShape3D_o8c43"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_o8c43"]
height = 5.65653 height = 5.65653

View File

@ -1,7 +1,11 @@
[gd_scene load_steps=2 format=3 uid="uid://cpwg1ula5qbrl"] [gd_scene load_steps=3 format=3 uid="uid://cpwg1ula5qbrl"]
[ext_resource type="Script" path="res://Assets/scripts/SpawnPoint.gd" id="1_1dk7k"] [ext_resource type="Script" path="res://Assets/scripts/SpawnPoint.gd" id="1_1dk7k"]
[ext_resource type="Texture2D" uid="uid://ddwwxd1akyry6" path="res://Assets/textures/Devmode/DEV_Arrow.png" id="2_uc2p6"]
[node name="SpawnPoint" type="Node3D"] [node name="SpawnPoint" type="Node3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.72563, 0.394659, -9.82302)
script = ExtResource("1_1dk7k") script = ExtResource("1_1dk7k")
[node name="Sprite3D" type="Sprite3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.07401, 0)
texture = ExtResource("2_uc2p6")

View File

@ -3,5 +3,8 @@ extends Node3D
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
GlobalSettings.SetSpawnPoint(self.global_position) GlobalSettings.SetSpawnPoint(self.global_position, self.global_rotation)
GlobalSettings.Se
get_tree().call_group("Player", "respawn") get_tree().call_group("Player", "respawn")
if not GlobalSettings.DEVMODE:
$Sprite3D.hide()

View File

@ -8,6 +8,7 @@ var is_paused = false
var current_map var current_map
var mapLoader var mapLoader
var SpawnPoint:Vector3 var SpawnPoint:Vector3
var SpawnRotation:Vector3
var Player_Last_Location = Vector3(0,0,0) var Player_Last_Location = Vector3(0,0,0)
var HasVape = false var HasVape = false
@ -78,6 +79,7 @@ func PrintSettings():
func SetCurrentMap(selected_map): func SetCurrentMap(selected_map):
current_map = selected_map current_map = selected_map
func SetSpawnPoint(pos:Vector3): func SetSpawnPoint(pos:Vector3, rot:Vector3) -> void:
SpawnPoint = pos SpawnPoint = pos
print("Spawn Point set to ", pos) SpawnRotation = rot
print("Spawn Point set to ", pos, rot)

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dab04w48ak5lq"
path.s3tc="res://.godot/imported/CircleSprite.png-97bbdd41786fd53645dae9c0dc5a1a15.s3tc.ctex"
path.etc2="res://.godot/imported/CircleSprite.png-97bbdd41786fd53645dae9c0dc5a1a15.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://Assets/textures/CircleSprite.png"
dest_files=["res://.godot/imported/CircleSprite.png-97bbdd41786fd53645dae9c0dc5a1a15.s3tc.ctex", "res://.godot/imported/CircleSprite.png-97bbdd41786fd53645dae9c0dc5a1a15.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ddwwxd1akyry6"
path.s3tc="res://.godot/imported/DEV_Arrow.png-dcb395fd1dcf2e7b9cad73edd3a7a28b.s3tc.ctex"
path.etc2="res://.godot/imported/DEV_Arrow.png-dcb395fd1dcf2e7b9cad73edd3a7a28b.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://Assets/textures/Devmode/DEV_Arrow.png"
dest_files=["res://.godot/imported/DEV_Arrow.png-dcb395fd1dcf2e7b9cad73edd3a7a28b.s3tc.ctex", "res://.godot/imported/DEV_Arrow.png-dcb395fd1dcf2e7b9cad73edd3a7a28b.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

View File

@ -0,0 +1,51 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://8fmypw6m8ars"
path="res://.godot/imported/Welcome Desk.blend-ef7d3cf42cc254ebafb965064355060c.scn"
[deps]
source_file="res://Blender Files/Objects/Furnature/Welcome Desk.blend"
dest_files=["res://.godot/imported/Welcome Desk.blend-ef7d3cf42cc254ebafb965064355060c.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true

Binary file not shown.