diff --git a/export_presets.cfg b/export_presets.cfg index e5b4271..e963a2e 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -2,7 +2,7 @@ name="Windows Desktop" platform="Windows Desktop" -runnable=true +runnable=false custom_features="" export_filter="all_resources" include_filter="" diff --git a/plans.md b/plans.md index 41af003..429445f 100644 --- a/plans.md +++ b/plans.md @@ -7,6 +7,7 @@ Big TODOs: - Start making maps and figuring out what works / what you like - Make a real user interface - Voice chat +- ARTTTTT Smaller TODOs: diff --git a/scenes/heroes/2.tscn b/scenes/heroes/2.tscn index 10f3bc8..2b67ca3 100644 --- a/scenes/heroes/2.tscn +++ b/scenes/heroes/2.tscn @@ -7,7 +7,7 @@ radius = 7.0 -[node name="RigidBody" index="0" instance=ExtResource( 1 )] +[node name="RigidBody" instance=ExtResource( 1 )] collision_layer = 8 collision_mask = 13 diff --git a/scenes/lobby.tscn b/scenes/lobby.tscn index 9cc4729..53ef1ea 100644 --- a/scenes/lobby.tscn +++ b/scenes/lobby.tscn @@ -3,30 +3,30 @@ [ext_resource path="res://scripts/lobby.gd" type="Script" id=1] [ext_resource path="res://scripts/hero_select.gd" type="Script" id=2] -[sub_resource type="DynamicFontData" id=3] +[sub_resource type="DynamicFontData" id=1] font_path = "res://assets/DejaVuSansMono.ttf" _sections_unfolded = [ "Resource" ] -[sub_resource type="DynamicFont" id=4] +[sub_resource type="DynamicFont" id=2] size = 30 use_mipmaps = false use_filter = false -font_data = SubResource( 3 ) +font_data = SubResource( 1 ) _sections_unfolded = [ "Extra Spacing", "Font", "Resource", "Settings" ] -[sub_resource type="DynamicFontData" id=1] +[sub_resource type="DynamicFontData" id=3] font_path = "res://assets/DejaVuSansMono.ttf" _sections_unfolded = [ "Resource" ] -[sub_resource type="DynamicFont" id=2] +[sub_resource type="DynamicFont" id=4] size = 16 use_mipmaps = false use_filter = false -font_data = SubResource( 1 ) +font_data = SubResource( 3 ) _sections_unfolded = [ "Font", "Resource", "Settings" ] [node name="Control" type="Control"] @@ -62,7 +62,7 @@ mouse_filter = 2 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 4 -custom_fonts/font = SubResource( 4 ) +custom_fonts/font = SubResource( 2 ) text = "VANAGLORIA" percent_visible = 1.0 lines_skipped = 0 @@ -529,7 +529,7 @@ mouse_filter = 2 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 4 -custom_fonts/font = SubResource( 2 ) +custom_fonts/font = SubResource( 4 ) text = "Waiting for players to connect...." percent_visible = 1.0 lines_skipped = 0 diff --git a/scripts/heroes/3.gd b/scripts/heroes/3.gd index 0978e3e..c9739f8 100644 --- a/scripts/heroes/3.gd +++ b/scripts/heroes/3.gd @@ -1,6 +1,6 @@ extends "res://scripts/player.gd" -var merge_power = .1 +var merge_power = .75 var merged = null var old_layer @@ -89,3 +89,4 @@ sync func unmerge(): pos.z += 1 set_translation(pos) merged = null + diff --git a/scripts/tp_camera.gd b/scripts/tp_camera.gd index 1388a78..d64cc0e 100644 --- a/scripts/tp_camera.gd +++ b/scripts/tp_camera.gd @@ -99,7 +99,6 @@ func cam_update(): var pos = Vector3(); if cam_ray_result.size() != 0: - print("re-pos, ray found") var a = (cam_ray_result.position-pivot.get_global_transform().origin).normalized(); var b = pivot.get_global_transform().origin.distance_to(cam_ray_result.position); #pos = cam_ray_result.position; diff --git a/util/client-multiple.sh b/util/client-multiple.sh new file mode 100644 index 0000000..4df643b --- /dev/null +++ b/util/client-multiple.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +count=$1 +if [ ! -z "$count" ]; then + shift # Only do this if arg exists (fixes error) +else + count=2 # Default 2 +fi + +for i in `seq 1 $count` # 3, for 1 + the server + the starter +do + godot -client "$@" & +done + diff --git a/util/remove-empty.sh b/util/remove-empty.sh new file mode 100644 index 0000000..c29049d --- /dev/null +++ b/util/remove-empty.sh @@ -0,0 +1 @@ +ack '^\{"events":\[\],"spawn":"\(0, 0, 0\)","states":\[\],"time":0\}$' -l | xargs rm