Compare commits

..

No commits in common. "f9a788d7db4004ca65b9312a96f2b33aa362d8a7" and "aa9a5c824ca3fb08e150ea9edafa92105ef51ba8" have entirely different histories.

7 changed files with 44 additions and 35 deletions

View file

@ -7,15 +7,19 @@ var port = 2670
# Called when the node enters the scene tree for the first time.
func _ready():
if OS.has_environment("USERNAME"):
$GeneralPanel/player_name.text = OS.get_environment("USERNAME")
else:
var desktop_path = OS.get_system_dir(0).replace("\\", "/").split("/")
$GeneralPanel/player_name.text = desktop_path[desktop_path.size() - 2]
#var myip = IP.get_local_addresses()
#var interfaces = IP.get_local_interfaces ()
#$HostPanel/label_myip.text = "IP "+myip[0]+". "+interfaces[0]
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
func _on_singleplayer_button_up():
var _letsgo = get_tree().change_scene("res://scenes/world/World.tscn")
var _letsgo = get_tree().change_scene("res://world_scenes/World.tscn")
func _on_JoinGameBtn_button_up():

View file

@ -3,7 +3,7 @@
[ext_resource path="res://misc/fonts/font_buttons.tres" type="DynamicFont" id=1]
[ext_resource path="res://misc/fonts/field_labels.tres" type="DynamicFont" id=2]
[ext_resource path="res://misc/fonts/fieldfonts.tres" type="DynamicFont" id=3]
[ext_resource path="res://scripts/menu.gd" type="Script" id=4]
[ext_resource path="res://scenes/menu.gd" type="Script" id=4]
[ext_resource path="res://Sounds/mus_test.ogg" type="AudioStream" id=5]
[ext_resource path="res://Backgrounds/bkMountains.png" type="Texture" id=6]
[ext_resource path="res://misc/panel_mainmenu.tres" type="StyleBox" id=7]
@ -158,7 +158,7 @@ margin_bottom = -62.0
hint_tooltip = "Start a singleplayer game"
mouse_default_cursor_shape = 2
custom_fonts/font = ExtResource( 1 )
text = "Single player"
text = "Force Start"
__meta__ = {
"_edit_use_anchors_": false
}

View file

@ -9,7 +9,8 @@ var motion = Vector2()
var spawned = false
func _ready():
$SndSpawn.play(0)
$SndSpawn.play(0);
pass
func _physics_process(delta):
@ -39,3 +40,4 @@ func _physics_process(delta):
#print(motion)
motion = move_and_slide(motion, UP)
pass

View file

@ -40,21 +40,16 @@
[sub_resource type="SpriteFrames" id=1]
animations = [ {
"frames": [ ExtResource( 14 ), ExtResource( 11 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 29 ), ExtResource( 31 ), ExtResource( 19 ), ExtResource( 13 ), ExtResource( 24 ), ExtResource( 6 ) ],
"loop": false,
"name": "Spawn",
"speed": 5.0
}, {
"frames": [ ExtResource( 9 ), ExtResource( 27 ), ExtResource( 26 ), ExtResource( 12 ), ExtResource( 35 ), ExtResource( 34 ), ExtResource( 36 ), ExtResource( 10 ), ExtResource( 30 ), ExtResource( 28 ), ExtResource( 21 ), ExtResource( 32 ), ExtResource( 8 ), ExtResource( 18 ) ],
"loop": true,
"name": "Warp",
"speed": 20.0
}, {
"frames": [ ExtResource( 33 ), ExtResource( 23 ), ExtResource( 15 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ), ExtResource( 33 ) ],
"loop": true,
"name": "Idle",
"speed": 20.0
}, {
"frames": [ ExtResource( 14 ), ExtResource( 11 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 29 ), ExtResource( 31 ), ExtResource( 19 ), ExtResource( 13 ), ExtResource( 24 ), ExtResource( 6 ) ],
"loop": false,
"name": "Spawn",
"speed": 5.0
}, {
"frames": [ ExtResource( 5 ) ],
"loop": true,
"name": "Fall",
@ -69,6 +64,11 @@ animations = [ {
"loop": true,
"name": "Jump",
"speed": 5.0
}, {
"frames": [ ExtResource( 9 ), ExtResource( 27 ), ExtResource( 26 ), ExtResource( 12 ), ExtResource( 35 ), ExtResource( 34 ), ExtResource( 36 ), ExtResource( 10 ), ExtResource( 30 ), ExtResource( 28 ), ExtResource( 21 ), ExtResource( 32 ), ExtResource( 8 ), ExtResource( 18 ) ],
"loop": true,
"name": "Warp",
"speed": 20.0
} ]
[sub_resource type="RectangleShape2D" id=2]
@ -76,6 +76,9 @@ extents = Vector2( 5.0126, 5.32944 )
[node name="Player" type="KinematicBody2D"]
script = ExtResource( 25 )
__meta__ = {
"_edit_group_": true
}
[node name="Label" type="Label" parent="."]
margin_left = -25.041

File diff suppressed because one or more lines are too long