diff --git a/cmi2/assets/allPage/backbutton.png b/cmi2/assets/allPage/backbutton.png new file mode 100644 index 0000000000000000000000000000000000000000..b8efb98e70854628a1e567b826ed5a25b22de30d Binary files /dev/null and b/cmi2/assets/allPage/backbutton.png differ diff --git a/cmi2/assets/allPage/backbutton.png.import b/cmi2/assets/allPage/backbutton.png.import new file mode 100644 index 0000000000000000000000000000000000000000..31f345f1c0731ab196088ada983bf47f8eadf2ae --- /dev/null +++ b/cmi2/assets/allPage/backbutton.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/backbutton.png-8fee6ad7734c1d3f863cd9a46768a3bb.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/allPage/backbutton.png" +dest_files=[ "res://.import/backbutton.png-8fee6ad7734c1d3f863cd9a46768a3bb.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/cmi2/assets/allPage/backbuttonhover.png b/cmi2/assets/allPage/backbuttonhover.png new file mode 100644 index 0000000000000000000000000000000000000000..48acdd5e86bea497ac2df4715cc6f0e06c11e96a Binary files /dev/null and b/cmi2/assets/allPage/backbuttonhover.png differ diff --git a/cmi2/assets/allPage/backbuttonhover.png.import b/cmi2/assets/allPage/backbuttonhover.png.import new file mode 100644 index 0000000000000000000000000000000000000000..4bef89d0df9b737c2108291d0ee6d5a6d3639c24 --- /dev/null +++ b/cmi2/assets/allPage/backbuttonhover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/backbuttonhover.png-4209a77808e79ad7977c995e604658a6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/allPage/backbuttonhover.png" +dest_files=[ "res://.import/backbuttonhover.png-4209a77808e79ad7977c995e604658a6.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/cmi2/assets/allPage/mainTitle.png b/cmi2/assets/allPage/mainTitle.png new file mode 100644 index 0000000000000000000000000000000000000000..16d601061a69b9d7a8963ebf847160b743b6737f Binary files /dev/null and b/cmi2/assets/allPage/mainTitle.png differ diff --git a/cmi2/assets/allPage/mainTitle.png.import b/cmi2/assets/allPage/mainTitle.png.import new file mode 100644 index 0000000000000000000000000000000000000000..b76ac27e52b78a4e0e54670fff85ab9b4fcd3fbe --- /dev/null +++ b/cmi2/assets/allPage/mainTitle.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mainTitle.png-561040b38a94b1e6343cde1aa4070ca1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/allPage/mainTitle.png" +dest_files=[ "res://.import/mainTitle.png-561040b38a94b1e6343cde1aa4070ca1.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/cmi2/assets/allPage/options.png b/cmi2/assets/allPage/options.png new file mode 100644 index 0000000000000000000000000000000000000000..583637e9c85dc666ee9fe942b5fcbadd6b7a9666 Binary files /dev/null and b/cmi2/assets/allPage/options.png differ diff --git a/cmi2/assets/allPage/options.png.import b/cmi2/assets/allPage/options.png.import new file mode 100644 index 0000000000000000000000000000000000000000..fbf4f6ce9450ea28368ef1a9dad452111a1c2d41 --- /dev/null +++ b/cmi2/assets/allPage/options.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/options.png-ae787eb8f1df22f4117d7280b562ce34.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/allPage/options.png" +dest_files=[ "res://.import/options.png-ae787eb8f1df22f4117d7280b562ce34.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/cmi2/assets/allPage/optionshover.png b/cmi2/assets/allPage/optionshover.png new file mode 100644 index 0000000000000000000000000000000000000000..18e33beee6ffbbb6992c5094ad1bcd8b8f5898d7 Binary files /dev/null and b/cmi2/assets/allPage/optionshover.png differ diff --git a/cmi2/assets/allPage/optionshover.png.import b/cmi2/assets/allPage/optionshover.png.import new file mode 100644 index 0000000000000000000000000000000000000000..a413e9fef850178882d1579e0a9e940cb7214a31 --- /dev/null +++ b/cmi2/assets/allPage/optionshover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/optionshover.png-6642514d8113ff531a0e90b39628f1c8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/allPage/optionshover.png" +dest_files=[ "res://.import/optionshover.png-6642514d8113ff531a0e90b39628f1c8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/cmi2/assets/selectGame/16Button.png b/cmi2/assets/selectGame/16Button.png new file mode 100644 index 0000000000000000000000000000000000000000..7077ad035746c5d94fcc734f2fe068c289acff97 Binary files /dev/null and b/cmi2/assets/selectGame/16Button.png differ diff --git a/cmi2/assets/selectGame/16Button.png.import b/cmi2/assets/selectGame/16Button.png.import new file mode 100644 index 0000000000000000000000000000000000000000..198a87615d9170a9569402f864405ddd61549936 --- /dev/null +++ b/cmi2/assets/selectGame/16Button.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/16Button.png-ee228d3b9404c4be6317aa621ced2824.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/selectGame/16Button.png" +dest_files=[ "res://.import/16Button.png-ee228d3b9404c4be6317aa621ced2824.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/cmi2/assets/selectGame/2Button.png b/cmi2/assets/selectGame/2Button.png new file mode 100644 index 0000000000000000000000000000000000000000..8a14b10dcd82b91050ca00f4254142c2e358b0ae Binary files /dev/null and b/cmi2/assets/selectGame/2Button.png differ diff --git a/cmi2/assets/selectGame/2Button.png.import b/cmi2/assets/selectGame/2Button.png.import new file mode 100644 index 0000000000000000000000000000000000000000..5b7bb66288c46837a76576ccda6f2a23f0837538 --- /dev/null +++ b/cmi2/assets/selectGame/2Button.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/2Button.png-c28077c855d913024c61b1a2ce8b2301.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/selectGame/2Button.png" +dest_files=[ "res://.import/2Button.png-c28077c855d913024c61b1a2ce8b2301.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/cmi2/assets/selectGame/32Button.png b/cmi2/assets/selectGame/32Button.png new file mode 100644 index 0000000000000000000000000000000000000000..46ee04a1a6f170927fdaec4fa906d91c066aca4b Binary files /dev/null and b/cmi2/assets/selectGame/32Button.png differ diff --git a/cmi2/assets/selectGame/32Button.png.import b/cmi2/assets/selectGame/32Button.png.import new file mode 100644 index 0000000000000000000000000000000000000000..7c4cacf2973fc706d337f0e5f888a84b74d9517b --- /dev/null +++ b/cmi2/assets/selectGame/32Button.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/32Button.png-43acd886ca5b298bedf197b91857ae0d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/selectGame/32Button.png" +dest_files=[ "res://.import/32Button.png-43acd886ca5b298bedf197b91857ae0d.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/cmi2/assets/selectGame/4Button.png b/cmi2/assets/selectGame/4Button.png new file mode 100644 index 0000000000000000000000000000000000000000..bbb8fb0887f77d58e48e9e082ba572b90a77ecbd Binary files /dev/null and b/cmi2/assets/selectGame/4Button.png differ diff --git a/cmi2/assets/selectGame/4Button.png.import b/cmi2/assets/selectGame/4Button.png.import new file mode 100644 index 0000000000000000000000000000000000000000..9322862c2e93bc49ced6ff8dbb6d5814d2cec20d --- /dev/null +++ b/cmi2/assets/selectGame/4Button.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/4Button.png-3fd1314c35a68368c9761c75c70a8ac2.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/selectGame/4Button.png" +dest_files=[ "res://.import/4Button.png-3fd1314c35a68368c9761c75c70a8ac2.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/cmi2/assets/selectGame/8Button.png b/cmi2/assets/selectGame/8Button.png new file mode 100644 index 0000000000000000000000000000000000000000..3d4b3352ec6cdcfd979cf574866999f25e494dd1 Binary files /dev/null and b/cmi2/assets/selectGame/8Button.png differ diff --git a/cmi2/assets/selectGame/8Button.png.import b/cmi2/assets/selectGame/8Button.png.import new file mode 100644 index 0000000000000000000000000000000000000000..a76169bf3ff945954743efeb0fd93ee5f8fd69a7 --- /dev/null +++ b/cmi2/assets/selectGame/8Button.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/8Button.png-b090e90c6cb2ec5f775e711e454121b3.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/selectGame/8Button.png" +dest_files=[ "res://.import/8Button.png-b090e90c6cb2ec5f775e711e454121b3.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/cmi2/project.godot b/cmi2/project.godot index 8e989ef489b7f6eca37e86cb3c3eee199ad7a7c6..1ac25d3358be4412a3349ce5c82640cbe544678d 100644 --- a/cmi2/project.godot +++ b/cmi2/project.godot @@ -22,7 +22,6 @@ config/icon="res://img/icon.png" [autoload] Globals="*res://Globals.gd" -SaveSettings="*res://SaveSettings.gd" [rendering] diff --git a/cmi2/scenes/MultiSelectMenu.tscn b/cmi2/scenes/MultiSelectMenu.tscn index a95720225fb6c2d626634ec6d1b30c2e4ff87007..195072845f01525e27878448972f4101193e87fc 100644 --- a/cmi2/scenes/MultiSelectMenu.tscn +++ b/cmi2/scenes/MultiSelectMenu.tscn @@ -1,27 +1,29 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://scenes/multiSelectMenu.gd" type="Script" id=1] -[ext_resource path="res://assets/allPage/arrow.png" type="Texture" id=2] -[ext_resource path="res://assets/Karla-Regular.ttf" type="DynamicFontData" id=3] -[ext_resource path="res://assets/allPage/option.png" type="Texture" id=4] - -[sub_resource type="DynamicFont" id=1] -size = 30 -extra_spacing_top = 10 -extra_spacing_bottom = 10 -extra_spacing_char = 1 -font_data = ExtResource( 3 ) - -[sub_resource type="DynamicFont" id=2] -size = 23 -extra_spacing_char = 1 -font_data = ExtResource( 3 ) +[ext_resource path="res://assets/allPage/fondmain.png" type="Texture" id=2] +[ext_resource path="res://assets/allPage/mainTitle.png" type="Texture" id=3] +[ext_resource path="res://assets/allPage/backbutton.png" type="Texture" id=4] +[ext_resource path="res://assets/allPage/backbuttonhover.png" type="Texture" id=5] +[ext_resource path="res://scenes/mainTitleTheme.tres" type="Theme" id=6] +[ext_resource path="res://assets/allPage/options.png" type="Texture" id=7] +[ext_resource path="res://assets/allPage/optionshover.png" type="Texture" id=8] +[ext_resource path="res://assets/selectGame/2Button.png" type="Texture" id=9] +[ext_resource path="res://assets/selectGame/4Button.png" type="Texture" id=10] +[ext_resource path="res://assets/selectGame/8Button.png" type="Texture" id=11] +[ext_resource path="res://assets/selectGame/16Button.png" type="Texture" id=12] +[ext_resource path="res://assets/selectGame/32Button.png" type="Texture" id=13] [node name="Control" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 1 ) +[node name="TextureRect" type="TextureRect" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +texture = ExtResource( 2 ) + [node name="MarginContainer" type="MarginContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 @@ -33,17 +35,29 @@ margin_right = 1024.0 margin_bottom = 600.0 size_flags_horizontal = 3 size_flags_vertical = 3 -custom_constants/separation = 30 +custom_constants/separation = 130 alignment = 1 [node name="header" type="HBoxContainer" parent="MarginContainer/VBoxContainer"] margin_right = 1024.0 -margin_bottom = 96.0 size_flags_horizontal = 11 +custom_constants/separation = 0 -[node name="headerContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer/header"] +[node name="Control" type="Control" parent="MarginContainer/VBoxContainer/header"] margin_right = 1024.0 -margin_bottom = 96.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="TextureRect" type="TextureRect" parent="MarginContainer/VBoxContainer/header/Control"] +anchor_right = 1.0 +margin_bottom = 120.0 +texture = ExtResource( 3 ) +expand = true +stretch_mode = 1 + +[node name="headerContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer/header/Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/margin_right = 20 @@ -51,37 +65,38 @@ custom_constants/margin_top = 20 custom_constants/margin_left = 20 custom_constants/margin_bottom = 20 -[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/header/headerContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/header/Control/headerContainer"] margin_left = 20.0 margin_top = 20.0 margin_right = 1004.0 -margin_bottom = 76.0 +margin_bottom = 120.0 custom_constants/separation = 50 -[node name="back" type="TextureButton" parent="MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer"] -margin_right = 50.0 -margin_bottom = 56.0 +[node name="back" type="TextureButton" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"] +margin_right = 80.0 +margin_bottom = 100.0 grow_horizontal = 0 -rect_min_size = Vector2( 50, 50 ) +rect_min_size = Vector2( 80, 65 ) size_flags_vertical = 3 size_flags_stretch_ratio = 0.2 -texture_normal = ExtResource( 2 ) +texture_normal = ExtResource( 4 ) +texture_hover = ExtResource( 5 ) expand = true stretch_mode = 4 -[node name="Multiplayer Selection" type="Label" parent="MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer"] -margin_left = 100.0 -margin_right = 884.0 -margin_bottom = 56.0 +[node name="Multiplayer Selection" type="Label" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"] +margin_left = 130.0 +margin_right = 854.0 +margin_bottom = 100.0 size_flags_horizontal = 3 size_flags_vertical = 3 -custom_fonts/font = SubResource( 1 ) +theme = ExtResource( 6 ) text = "Multiplayer Selection" align = 1 valign = 1 uppercase = true -[node name="titleMargins" type="MarginContainer" parent="MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer"] +[node name="titleMargins" type="MarginContainer" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"] visible = false margin_left = 535.0 margin_right = 854.0 @@ -91,20 +106,21 @@ size_flags_vertical = 3 custom_constants/margin_right = 150 custom_constants/margin_left = 150 -[node name="options" type="TextureButton" parent="MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer"] -margin_left = 934.0 +[node name="options" type="TextureButton" parent="MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer"] +margin_left = 904.0 margin_right = 984.0 -margin_bottom = 56.0 -rect_min_size = Vector2( 50, 50 ) +margin_bottom = 100.0 +rect_min_size = Vector2( 80, 65 ) size_flags_horizontal = 9 size_flags_vertical = 3 size_flags_stretch_ratio = 0.3 -texture_normal = ExtResource( 4 ) +texture_normal = ExtResource( 7 ) +texture_hover = ExtResource( 8 ) expand = true stretch_mode = 5 [node name="multiContainer" type="MarginContainer" parent="MarginContainer/VBoxContainer"] -margin_top = 126.0 +margin_top = 130.0 margin_right = 1024.0 margin_bottom = 600.0 size_flags_horizontal = 3 @@ -118,106 +134,101 @@ custom_constants/margin_bottom = 20 margin_left = 20.0 margin_top = 20.0 margin_right = 1004.0 -margin_bottom = 454.0 +margin_bottom = 450.0 size_flags_horizontal = 3 [node name="top" type="MarginContainer" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV"] margin_right = 984.0 -margin_bottom = 215.0 +margin_bottom = 213.0 size_flags_vertical = 3 custom_constants/margin_bottom = 20 [node name="firstLignSelection" type="HBoxContainer" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/top"] margin_right = 984.0 -margin_bottom = 195.0 +margin_bottom = 193.0 size_flags_vertical = 3 custom_constants/separation = 30 [node name="Players2Zone" type="MarginContainer" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/top/firstLignSelection"] margin_right = 308.0 -margin_bottom = 195.0 +margin_bottom = 193.0 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="Players2" type="Button" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/top/firstLignSelection/Players2Zone"] +[node name="Players2" type="TextureButton" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/top/firstLignSelection/Players2Zone"] margin_right = 308.0 -margin_bottom = 195.0 -custom_fonts/font = SubResource( 2 ) -text = "2 Players" -flat = true -clip_text = true +margin_bottom = 193.0 +texture_normal = ExtResource( 9 ) +expand = true +stretch_mode = 5 [node name="Players4Zone" type="MarginContainer" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/top/firstLignSelection"] margin_left = 338.0 margin_right = 646.0 -margin_bottom = 195.0 +margin_bottom = 193.0 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="Players4" type="Button" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/top/firstLignSelection/Players4Zone"] +[node name="Players4" type="TextureButton" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/top/firstLignSelection/Players4Zone"] margin_right = 308.0 -margin_bottom = 195.0 -custom_fonts/font = SubResource( 2 ) -text = "4 Players" -flat = true -clip_text = true +margin_bottom = 193.0 +texture_normal = ExtResource( 10 ) +expand = true +stretch_mode = 5 [node name="Players8Zone" type="MarginContainer" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/top/firstLignSelection"] margin_left = 676.0 margin_right = 984.0 -margin_bottom = 195.0 +margin_bottom = 193.0 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="Players8" type="Button" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/top/firstLignSelection/Players8Zone"] +[node name="Players8" type="TextureButton" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/top/firstLignSelection/Players8Zone"] margin_right = 308.0 -margin_bottom = 195.0 -custom_fonts/font = SubResource( 2 ) -text = "8 Players" -flat = true -clip_text = true +margin_bottom = 193.0 +texture_normal = ExtResource( 11 ) +expand = true +stretch_mode = 5 [node name="bottom" type="MarginContainer" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV"] -margin_top = 219.0 +margin_top = 217.0 margin_right = 984.0 -margin_bottom = 434.0 +margin_bottom = 430.0 size_flags_vertical = 3 [node name="secondLignSelection" type="HBoxContainer" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/bottom"] margin_right = 984.0 -margin_bottom = 215.0 +margin_bottom = 213.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 30 [node name="Players16Zone" type="MarginContainer" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/bottom/secondLignSelection"] margin_right = 477.0 -margin_bottom = 215.0 +margin_bottom = 213.0 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="Players16" type="Button" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/bottom/secondLignSelection/Players16Zone"] +[node name="Players16" type="TextureButton" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/bottom/secondLignSelection/Players16Zone"] margin_right = 477.0 -margin_bottom = 215.0 -custom_fonts/font = SubResource( 2 ) -text = "16 Players" -flat = true -clip_text = true +margin_bottom = 213.0 +texture_normal = ExtResource( 12 ) +expand = true +stretch_mode = 5 [node name="Players33Zone" type="MarginContainer" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/bottom/secondLignSelection"] margin_left = 507.0 margin_right = 984.0 -margin_bottom = 215.0 +margin_bottom = 213.0 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="Players33" type="Button" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/bottom/secondLignSelection/Players33Zone"] +[node name="Players33" type="TextureButton" parent="MarginContainer/VBoxContainer/multiContainer/multiSelectV/bottom/secondLignSelection/Players33Zone"] margin_right = 477.0 -margin_bottom = 215.0 -custom_fonts/font = SubResource( 2 ) -text = "33 Players" -flat = true -clip_text = true +margin_bottom = 213.0 +texture_normal = ExtResource( 13 ) +expand = true +stretch_mode = 5 [node name="Control" type="Control" parent="."] editor/display_folded = true diff --git a/cmi2/scenes/mainTitleTheme.tres b/cmi2/scenes/mainTitleTheme.tres new file mode 100644 index 0000000000000000000000000000000000000000..f3d22a09efa40e15d7b953e85efd851d359d44f4 --- /dev/null +++ b/cmi2/scenes/mainTitleTheme.tres @@ -0,0 +1,11 @@ +[gd_resource type="Theme" load_steps=3 format=2] + +[ext_resource path="res://assets/fonts/fibre-font.otf" type="DynamicFontData" id=1] + +[sub_resource type="DynamicFont" id=3] +size = 55 +extra_spacing_char = 2 +font_data = ExtResource( 1 ) + +[resource] +default_font = SubResource( 3 ) diff --git a/cmi2/scenes/multiSelectMenu.gd b/cmi2/scenes/multiSelectMenu.gd index e10b417ecebd332c49f2a0efa4c482c199978c6c..363f8ea87c73f45afbe59350b5d30e1a85fee59a 100644 --- a/cmi2/scenes/multiSelectMenu.gd +++ b/cmi2/scenes/multiSelectMenu.gd @@ -20,8 +20,8 @@ func _ready(): MODE8 = $MarginContainer/VBoxContainer/multiContainer/multiSelectV/top/firstLignSelection/Players8Zone/Players8 MODE16 =$MarginContainer/VBoxContainer/multiContainer/multiSelectV/bottom/secondLignSelection/Players16Zone/Players16 MODE32 =$MarginContainer/VBoxContainer/multiContainer/multiSelectV/bottom/secondLignSelection/Players33Zone/Players33 - BACK = $MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer/back - OPTIONS = $MarginContainer/VBoxContainer/header/headerContainer/HBoxContainer/options + BACK = $MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer/back + OPTIONS = $MarginContainer/VBoxContainer/header/Control/headerContainer/HBoxContainer/options # Connect the buttons with their destinations MODE2.connect("pressed", self, "selectedGame", ["play",2]) @@ -42,4 +42,4 @@ func selectedGame(button_name,playerNumber): globals.load_new_scene("res://scenes/Settings.tscn") else: globals.NUMBER_OF_PLAYERS = playerNumber - #globals.load_new_scene("res://scenes/characterSelection.tscn") + globals.load_new_scene("res://scenes/characterSelection.tscn")