kristoferssolo/FuncIt
1
0
Fork 0
mirror of https://github.com/kristoferssolo/FuncIt.git synced 2025-10-21 19:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/KristofersSolo/Godot

Browse Source
This commit is contained in:
Alan Alexander Cerna 2021-11-09 00:07:39 +02:00
commit d6a0dc17ef
6 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
project.godot
View File

@ -37,42 +37,42 @@ fps=false
input_right={ input_right={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
] ]
} }
input_left={ input_left={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
] ]
} }
input_up={ input_up={
"deadzone": 0.49, "deadzone": 0.49,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
] ]
} }
input_down={ input_down={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
] ]
} }
input_debug={ input_debug={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":96,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":96,"unicode":0,"echo":false,"script":null)
] ]
} }
input_enter={ input_enter={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
] ]
} }
input_shift={ input_shift={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"unicode":0,"echo":false,"script":null)
] ]
} }
input_shoot={ input_shoot={
@ -82,17 +82,17 @@ input_shoot={
} }
esc={ esc={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null)
] ]
} }
rotation_increase={ rotation_increase={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":69,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":69,"unicode":0,"echo":false,"script":null)
] ]
} }
rotation_decrease={ rotation_decrease={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"unicode":0,"echo":false,"script":null)
] ]
} }

26
source/entities/player/player_node.tscn
View File

@ -179,10 +179,10 @@ animations = [ {
"name": "move-speed-left-02", "name": "move-speed-left-02",
"speed": 35.0 "speed": 35.0
}, { }, {
"frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ], "frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ],
"loop": true, "loop": true,
"name": "boost-speed-left-02", "name": "move-speed-right-01",
"speed": 50.0 "speed": 35.0
}, { }, {
"frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ], "frames": [ ExtResource( 5 ), ExtResource( 42 ), ExtResource( 35 ), ExtResource( 24 ), ExtResource( 8 ), ExtResource( 31 ), ExtResource( 30 ), ExtResource( 38 ), ExtResource( 10 ), ExtResource( 43 ), ExtResource( 41 ), ExtResource( 33 ), ExtResource( 44 ), ExtResource( 19 ), ExtResource( 29 ), ExtResource( 25 ), ExtResource( 36 ), ExtResource( 12 ), ExtResource( 45 ), ExtResource( 21 ) ],
"loop": true, "loop": true,
@ -276,12 +276,12 @@ animations = [ {
}, { }, {
"frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ], "frames": [ ExtResource( 167 ), ExtResource( 157 ), ExtResource( 158 ), ExtResource( 126 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 97 ), ExtResource( 88 ), ExtResource( 98 ), ExtResource( 91 ), ExtResource( 125 ), ExtResource( 105 ), ExtResource( 82 ), ExtResource( 84 ), ExtResource( 92 ), ExtResource( 103 ), ExtResource( 122 ), ExtResource( 130 ), ExtResource( 104 ), ExtResource( 116 ) ],
"loop": true, "loop": true,
"name": "move-speed-right-02", "name": "boost-speed-right-01",
"speed": 35.0 "speed": 50.0
}, { }, {
"frames": [ ExtResource( 162 ), ExtResource( 135 ), ExtResource( 146 ), ExtResource( 141 ), ExtResource( 143 ), ExtResource( 163 ), ExtResource( 149 ), ExtResource( 136 ), ExtResource( 154 ), ExtResource( 137 ), ExtResource( 165 ), ExtResource( 142 ), ExtResource( 139 ), ExtResource( 159 ), ExtResource( 140 ), ExtResource( 155 ), ExtResource( 144 ), ExtResource( 151 ), ExtResource( 153 ), ExtResource( 166 ) ], "frames": [ ExtResource( 73 ), ExtResource( 57 ), ExtResource( 65 ), ExtResource( 64 ), ExtResource( 54 ), ExtResource( 71 ), ExtResource( 58 ), ExtResource( 66 ), ExtResource( 62 ), ExtResource( 59 ), ExtResource( 56 ), ExtResource( 60 ), ExtResource( 63 ), ExtResource( 50 ), ExtResource( 61 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 51 ), ExtResource( 68 ), ExtResource( 69 ) ],
"loop": true, "loop": true,
"name": "idle-speed-left-04", "name": "idle-speed-left-02",
"speed": 25.0 "speed": 25.0
}, { }, {
"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ], "frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ],
@ -342,11 +342,19 @@ animations = [ {
"loop": true, "loop": true,
"name": "01", "name": "01",
"speed": 5.0 "speed": 5.0
}, {
"frames": [ ExtResource( 170 ) ],
"loop": true,
"name": "02",
"speed": 5.0
} ] } ]
[node name="player" type="KinematicBody2D" groups=["Net", "Player"]] [node name="player" type="KinematicBody2D" groups=[
"Net",
"Player",
]]
script = ExtResource( 11 ) script = ExtResource( 11 )
theme = "04" theme = "03"
[node name="player_collider" type="CollisionShape2D" parent="."] [node name="player_collider" type="CollisionShape2D" parent="."]
shape = SubResource( 1 ) shape = SubResource( 1 )

8
source/scenes/GUI/main_menu.tscn
View File

@ -66,8 +66,8 @@ margin_left = -150.0
margin_top = -36.0 margin_top = -36.0
margin_right = 150.0 margin_right = 150.0
margin_bottom = 36.0 margin_bottom = 36.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 5 ) custom_fonts/font = ExtResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "PLAY" text = "PLAY"
align = 1 align = 1
valign = 1 valign = 1
@ -91,8 +91,8 @@ margin_left = -98.8223
margin_top = -36.0 margin_top = -36.0
margin_right = 134.178 margin_right = 134.178
margin_bottom = 36.0 margin_bottom = 36.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 5 ) custom_fonts/font = ExtResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "LAN Party" text = "LAN Party"
align = 1 align = 1
valign = 1 valign = 1
@ -123,8 +123,8 @@ margin_left = -150.0
margin_top = -36.0 margin_top = -36.0
margin_right = 150.0 margin_right = 150.0
margin_bottom = 36.0 margin_bottom = 36.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 5 ) custom_fonts/font = ExtResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "EXIT" text = "EXIT"
align = 1 align = 1
valign = 1 valign = 1
@ -138,8 +138,8 @@ margin_left = 1798.91
margin_top = 989.536 margin_top = 989.536
margin_right = 1889.91 margin_right = 1889.91
margin_bottom = 1061.54 margin_bottom = 1061.54
custom_colors/font_color_disabled = Color( 1, 1, 1, 1 )
custom_fonts/font = ExtResource( 8 ) custom_fonts/font = ExtResource( 8 )
custom_colors/font_color_disabled = Color( 1, 1, 1, 1 )
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }

8
source/scenes/GUI/network_setup.tscn
View File

@ -14,13 +14,13 @@
[ext_resource path="res://source/scenes/OVERLAY/elements/wall.tscn" type="PackedScene" id=13] [ext_resource path="res://source/scenes/OVERLAY/elements/wall.tscn" type="PackedScene" id=13]
[ext_resource path="res://source/assets/sprites/GUI/server_title.svg" type="Texture" id=15] [ext_resource path="res://source/assets/sprites/GUI/server_title.svg" type="Texture" id=15]
[sub_resource type="DynamicFont" id=7] [sub_resource type="DynamicFont" id=11]
size = 36 size = 36
use_mipmaps = true use_mipmaps = true
use_filter = true use_filter = true
font_data = ExtResource( 2 ) font_data = ExtResource( 2 )
[sub_resource type="StyleBoxEmpty" id=8] [sub_resource type="StyleBoxEmpty" id=12]
[sub_resource type="StyleBoxEmpty" id=4] [sub_resource type="StyleBoxEmpty" id=4]
@ -177,7 +177,7 @@ margin_left = -225.0
margin_top = -25.0 margin_top = -25.0
margin_right = -225.0 margin_right = -225.0
margin_bottom = -25.0 margin_bottom = -25.0
custom_fonts/font = SubResource( 7 ) custom_fonts/font = SubResource( 11 )
custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "Enter your username" text = "Enter your username"
align = 1 align = 1
@ -209,7 +209,7 @@ margin_left = -175.0
margin_top = -28.0 margin_top = -28.0
margin_right = 175.0 margin_right = 175.0
margin_bottom = 28.0 margin_bottom = 28.0
custom_styles/focus = SubResource( 8 ) custom_styles/focus = SubResource( 12 )
custom_styles/normal = SubResource( 4 ) custom_styles/normal = SubResource( 4 )
custom_fonts/font = SubResource( 5 ) custom_fonts/font = SubResource( 5 )
custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 ) custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 )

8
source/scenes/GUI/server_handlers/server_browser.tscn
View File

@ -43,9 +43,9 @@ use_mipmaps = true
use_filter = true use_filter = true
font_data = ExtResource( 8 ) font_data = ExtResource( 8 )
[sub_resource type="StyleBoxEmpty" id=8] [sub_resource type="StyleBoxEmpty" id=5]
[sub_resource type="StyleBoxEmpty" id=9] [sub_resource type="StyleBoxEmpty" id=6]
[sub_resource type="DynamicFont" id=7] [sub_resource type="DynamicFont" id=7]
size = 36 size = 36
@ -263,8 +263,8 @@ margin_left = -175.0
margin_top = -28.0 margin_top = -28.0
margin_right = 175.0 margin_right = 175.0
margin_bottom = 28.0 margin_bottom = 28.0
custom_styles/focus = SubResource( 8 ) custom_styles/focus = SubResource( 5 )
custom_styles/normal = SubResource( 9 ) custom_styles/normal = SubResource( 6 )
custom_fonts/font = SubResource( 7 ) custom_fonts/font = SubResource( 7 )
custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 ) custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 )
align = 1 align = 1

8
source/scenes/OVERLAY/elements/simple_prompt.tscn
View File

@ -5,7 +5,7 @@
[ext_resource path="res://source/fonts/roboto/Roboto-Regular.ttf" type="DynamicFontData" id=3] [ext_resource path="res://source/fonts/roboto/Roboto-Regular.ttf" type="DynamicFontData" id=3]
[ext_resource path="res://source/scenes/OVERLAY/elements/button.tscn" type="PackedScene" id=4] [ext_resource path="res://source/scenes/OVERLAY/elements/button.tscn" type="PackedScene" id=4]
[sub_resource type="StyleBoxFlat" id=3] [sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0, 0, 0, 0.380392 ) bg_color = Color( 0, 0, 0, 0.380392 )
[sub_resource type="DynamicFont" id=2] [sub_resource type="DynamicFont" id=2]
@ -14,7 +14,7 @@ use_mipmaps = true
use_filter = true use_filter = true
font_data = ExtResource( 1 ) font_data = ExtResource( 1 )
[sub_resource type="DynamicFont" id=1] [sub_resource type="DynamicFont" id=3]
size = 100 size = 100
use_mipmaps = true use_mipmaps = true
use_filter = true use_filter = true
@ -37,7 +37,7 @@ margin_left = -704.0
margin_top = -330.0 margin_top = -330.0
margin_right = 704.0 margin_right = 704.0
margin_bottom = 330.0 margin_bottom = 330.0
custom_styles/panel = SubResource( 3 ) custom_styles/panel = SubResource( 1 )
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
@ -75,7 +75,7 @@ margin_left = -516.0
margin_top = -155.5 margin_top = -155.5
margin_right = 516.0 margin_right = 516.0
margin_bottom = -37.5 margin_bottom = -37.5
custom_fonts/font = SubResource( 1 ) custom_fonts/font = SubResource( 3 )
text = "Simple prompt" text = "Simple prompt"
align = 1 align = 1
valign = 1 valign = 1