summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Del Campo Romero <xavi92@disroot.org>2026-11-15 02:05:26 +0100
committerXavier Del Campo Romero <xavi92@disroot.org>2026-11-15 02:05:26 +0100
commita0b19d6ff35bc98eb2bb39cd289eaa28c5f76bf9 (patch)
tree80e1f1faa46cfaf3ba9444073b22fae74a8ccce6
parentf791a65ba2b08e54247187b808f3488d2b401597 (diff)
downloadnj26-a0b19d6ff35bc98eb2bb39cd289eaa28c5f76bf9.tar.gz
Add cat to menu + joystick bindings
-rw-r--r--Spatial.tscn40
-rw-r--r--mainmenu.tscn19
-rw-r--r--project.godot22
3 files changed, 60 insertions, 21 deletions
diff --git a/Spatial.tscn b/Spatial.tscn
index d03e67b..3f79880 100644
--- a/Spatial.tscn
+++ b/Spatial.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=19 format=2]
+[gd_scene load_steps=22 format=2]
[ext_resource path="res://floor.png" type="Texture" id=1]
[ext_resource path="res://sky.tscn" type="PackedScene" id=2]
@@ -6,6 +6,7 @@
[ext_resource path="res://Spatial.gd" type="Script" id=4]
[ext_resource path="res://basefloor.gd" type="Script" id=5]
[ext_resource path="res://vera/Vera.ttf" type="DynamicFontData" id=6]
+[ext_resource path="res://vera/VeraBd.ttf" type="DynamicFontData" id=7]
[sub_resource type="PlaneMesh" id=1]
size = Vector2( 20, 40 )
@@ -42,12 +43,22 @@ albedo_color = Color( 0.415686, 0.305882, 0.545098, 1 )
[sub_resource type="SphereShape" id=11]
radius = 6.565
+[sub_resource type="DynamicFont" id=15]
+size = 32
+use_filter = true
+font_data = ExtResource( 6 )
+
[sub_resource type="DynamicFont" id=13]
size = 48
use_mipmaps = true
use_filter = true
font_data = ExtResource( 6 )
+[sub_resource type="DynamicFont" id=16]
+size = 32
+use_filter = true
+font_data = ExtResource( 7 )
+
[node name="Spatial" type="Spatial"]
script = ExtResource( 4 )
@@ -184,25 +195,25 @@ __meta__ = {
}
[node name="hb" type="HBoxContainer" parent="CanvasLayer/cc"]
-margin_left = 689.0
-margin_right = 1270.0
+margin_left = 555.0
+margin_right = 1405.0
margin_bottom = 57.0
size_flags_horizontal = 3
size_flags_vertical = 3
-alignment = 1
[node name="pink" type="Label" parent="CanvasLayer/cc/hb"]
-margin_top = 21.0
-margin_right = 82.0
-margin_bottom = 35.0
-custom_colors/font_color = Color( 1, 0, 0.796078, 1 )
+margin_top = 9.0
+margin_right = 203.0
+margin_bottom = 47.0
+custom_colors/font_color = Color( 0.988235, 0.0862745, 0.803922, 1 )
+custom_fonts/font = SubResource( 15 )
text = "Team Pink: 0"
align = 1
valign = 1
[node name="time_left" type="Label" parent="CanvasLayer/cc/hb"]
-margin_left = 86.0
-margin_right = 493.0
+margin_left = 207.0
+margin_right = 614.0
margin_bottom = 57.0
custom_colors/font_color = Color( 1, 1, 1, 1 )
custom_constants/shadow_as_outline = 1
@@ -213,11 +224,12 @@ valign = 1
uppercase = true
[node name="blue" type="Label" parent="CanvasLayer/cc/hb"]
-margin_left = 497.0
-margin_top = 21.0
-margin_right = 581.0
-margin_bottom = 35.0
+margin_left = 618.0
+margin_top = 9.0
+margin_right = 850.0
+margin_bottom = 47.0
custom_colors/font_color = Color( 0, 0.788235, 1, 1 )
+custom_fonts/font = SubResource( 16 )
text = "Team Blue: 0"
align = 1
valign = 1
diff --git a/mainmenu.tscn b/mainmenu.tscn
index 9acfeef..7edd3c1 100644
--- a/mainmenu.tscn
+++ b/mainmenu.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=8 format=2]
[ext_resource path="res://bg.png" type="Texture" id=1]
[ext_resource path="res://vera/VeraBI.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://vera/VeraBd.ttf" type="DynamicFontData" id=3]
[ext_resource path="res://mainmenu.gd" type="Script" id=4]
+[ext_resource path="res://cat/c0.png" type="Texture" id=5]
[sub_resource type="DynamicFont" id=1]
size = 180
@@ -24,6 +25,22 @@ margin_right = 1920.0
margin_bottom = 1080.0
texture = ExtResource( 1 )
+[node name="CenterContainer3" type="CenterContainer" parent="CanvasLayer"]
+anchor_left = 0.221
+anchor_top = 0.664
+anchor_right = 0.5
+anchor_bottom = 0.664
+margin_right = 40.0
+margin_bottom = 40.0
+use_top_left = true
+
+[node name="TextureRect" type="TextureRect" parent="CanvasLayer/CenterContainer3"]
+margin_left = -320.0
+margin_top = -320.0
+margin_right = 320.0
+margin_bottom = 320.0
+texture = ExtResource( 5 )
+
[node name="CenterContainer" type="CenterContainer" parent="CanvasLayer"]
anchor_left = 0.5
anchor_top = 0.3
diff --git a/project.godot b/project.godot
index 2c62726..71c1230 100644
--- a/project.godot
+++ b/project.godot
@@ -118,19 +118,27 @@ p1_right={
}
p2_up={
"deadzone": 0.5,
-"events": [ ]
+"events": [ Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":2,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":2,"axis":1,"axis_value":-1.0,"script":null)
+ ]
}
p2_down={
"deadzone": 0.5,
-"events": [ ]
+"events": [ Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":2,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":2,"axis":1,"axis_value":1.0,"script":null)
+ ]
}
p2_left={
"deadzone": 0.5,
-"events": [ ]
+"events": [ Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":2,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":2,"axis":0,"axis_value":-1.0,"script":null)
+ ]
}
p2_right={
"deadzone": 0.5,
-"events": [ ]
+"events": [ Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":2,"button_index":15,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":2,"axis":0,"axis_value":1.0,"script":null)
+ ]
}
p3_up={
"deadzone": 0.5,
@@ -161,11 +169,13 @@ p1_powerup={
}
p2_powerup={
"deadzone": 0.5,
-"events": [ ]
+"events": [ Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":2,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
+ ]
}
p3_powerup={
"deadzone": 0.5,
-"events": [ ]
+"events": [ Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":3,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
+ ]
}
[physics]