Browse Source

bunch of fixes based on feedback, adding changelog

galo 1 year ago
parent
commit
90cb35737d
8 changed files with 21 additions and 14 deletions
  1. 1 1
      BrowserListClient.gd
  2. 7 3
      Client.tscn
  3. 4 4
      Login.gd
  4. 1 1
      Server.tscn
  5. 2 2
      envarg.gd
  6. 1 1
      export_presets.cfg
  7. 1 1
      main.tscn
  8. 4 1
      playersprite.tscn

+ 1 - 1
BrowserListClient.gd

@@ -1,6 +1,6 @@
 extends Node
 
-var browsecolumn = preload('res://browseColumn.tscn')
+var browsecolumn = preload('res://BrowseColumn.tscn')
 
 
 func _on_dict_arrived(arg):

+ 7 - 3
Client.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=17 format=2]
 
-[ext_resource path="res://debug.tscn" type="PackedScene" id=1]
-[ext_resource path="res://powerMenu.tscn" type="PackedScene" id=2]
-[ext_resource path="res://client.gd" type="Script" id=3]
+[ext_resource path="res://Debug.tscn" type="PackedScene" id=1]
+[ext_resource path="res://PowerMenu.tscn" type="PackedScene" id=2]
+[ext_resource path="res://Client.gd" type="Script" id=3]
 [ext_resource path="res://font/tiny.tres" type="DynamicFont" id=4]
 [ext_resource path="res://font/8bit.tres" type="DynamicFont" id=5]
 [ext_resource path="res://ping.gd" type="Script" id=6]
@@ -92,6 +92,7 @@ margin_left = 480.0
 margin_top = 320.0
 margin_right = 620.0
 margin_bottom = 344.0
+custom_fonts/font = ExtResource( 5 )
 align = 2
 placeholder_text = "....message"
 
@@ -100,6 +101,7 @@ margin_left = 480.0
 margin_top = 220.0
 margin_right = 620.0
 margin_bottom = 315.0
+custom_fonts/normal_font = ExtResource( 5 )
 
 [node name="ColorRect" type="ColorRect" parent="Chat/RichTextLabel"]
 show_behind_parent = true
@@ -123,6 +125,7 @@ margin_bottom = 196.0
 [node name="spawnmsg" type="Label" parent="spawnmsg/CenterContainer/VBoxContainer"]
 margin_right = 164.0
 margin_bottom = 14.0
+custom_fonts/font = ExtResource( 5 )
 text = "press \"space\" to be ready"
 align = 1
 valign = 1
@@ -134,6 +137,7 @@ node2 = NodePath("../..")
 margin_top = 18.0
 margin_right = 164.0
 margin_bottom = 32.0
+custom_fonts/font = ExtResource( 5 )
 text = "loading list...."
 align = 1
 valign = 1

+ 4 - 4
Login.gd

@@ -1,8 +1,8 @@
 extends Node
 
-var client = preload('res://client.tscn')
-var server = preload('res://server.tscn')
-var auth = preload('res://auth.tscn')
+var client = preload('res://Client.tscn')
+var server = preload('res://Server.tscn')
+var auth = preload('res://Auth.tscn')
 signal login_confimed
 signal choose_a_server(arg)
 var login_await = true
@@ -128,7 +128,7 @@ func _on_chang_password_button_down():
 	var password_new = $changepassword/VBoxContainer/HBoxContainer4/LineEdit2.get_text()
 	var username_new = $changepassword/VBoxContainer/HBoxContainer5/LineEdit2.get_text()
 	var email_new = $changepassword/VBoxContainer/HBoxContainer6/LineEdit2.get_text()
-	
+
 	print(salt)
 	if salt == null: return
 	for i in 512: password_old = (password_old+salt).sha256_text()

+ 1 - 1
Server.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://server.gd" type="Script" id=1]
+[ext_resource path="res://Server.gd" type="Script" id=1]
 [ext_resource path="res://enemydirector.gd" type="Script" id=2]
 
 [node name="Server" type="Node" groups=["server"]]

+ 2 - 2
envarg.gd

@@ -1,7 +1,7 @@
 extends Node
 
-var server = preload('res://server.tscn')
-var auth = preload('res://auth.tscn')
+var server = preload('res://Server.tscn')
+var auth = preload('res://Auth.tscn')
 
 func _ready():
 	var args = Array(OS.get_cmdline_args())

+ 1 - 1
export_presets.cfg

@@ -7,7 +7,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="../serverexp/win/vampirezombiresurvivorsouls.exe"
+export_path="../../serverexp/win/vampirezombiresurvivorsouls.exe"
 script_export_mode=1
 script_encryption_key=""
 

+ 1 - 1
main.tscn

@@ -227,7 +227,7 @@ render_target_v_flip = true
 [node name="Goblin" type="AnimatedSprite" parent="Textures/Goblin4"]
 modulate = Color( 1, 0, 0.984314, 1 )
 frames = SubResource( 5 )
-frame = 1
+frame = 2
 speed_scale = 0.9
 playing = true
 offset = Vector2( 32, 32 )

+ 4 - 1
playersprite.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=16 format=2]
+[gd_scene load_steps=17 format=2]
 
 [ext_resource path="res://NPC/soldier/soldieranim.tscn" type="PackedScene" id=1]
 [ext_resource path="res://art/NPC/soldier/helmet.png" type="Texture" id=2]
 [ext_resource path="res://art/NPC/soldier/soldieremotions.png" type="Texture" id=3]
+[ext_resource path="res://font/8bit.tres" type="DynamicFont" id=4]
 [ext_resource path="res://font/yoster.ttf" type="DynamicFontData" id=5]
 [ext_resource path="res://art/NPC/soldier/soldiertest.png" type="Texture" id=6]
 [ext_resource path="res://art/NPC/soldier/head2.png" type="Texture" id=7]
@@ -238,6 +239,7 @@ margin_right = 50.0
 margin_bottom = -71.839
 rect_scale = Vector2( 1e-05, 1e-05 )
 rect_pivot_offset = Vector2( 50, 0 )
+custom_fonts/font = ExtResource( 4 )
 align = 1
 valign = 1
 autowrap = true
@@ -268,5 +270,6 @@ margin_left = -316.031
 margin_top = -46.0209
 margin_right = 323.969
 margin_bottom = -32.0209
+custom_fonts/font = ExtResource( 4 )
 align = 1
 valign = 1