diff --git a/assets/levels/develop.jpg b/assets/levels/develop.jpg deleted file mode 100644 index 1136bfc..0000000 Binary files a/assets/levels/develop.jpg and /dev/null differ diff --git a/assets/levels/home.jpg b/assets/levels/home.jpg new file mode 100644 index 0000000..cbc1762 Binary files /dev/null and b/assets/levels/home.jpg differ diff --git a/assets/levels/develop.jpg.import b/assets/levels/home.jpg.import similarity index 70% rename from assets/levels/develop.jpg.import rename to assets/levels/home.jpg.import index ccdfe10..f6f8152 100644 --- a/assets/levels/develop.jpg.import +++ b/assets/levels/home.jpg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/develop.jpg-1aa60be6aecfb8a84ffb0ec8040793c8.stex" +path="res://.import/home.jpg-bc8e6bc350c4de96f198ba321428b932.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/levels/develop.jpg" -dest_files=[ "res://.import/develop.jpg-1aa60be6aecfb8a84ffb0ec8040793c8.stex" ] +source_file="res://assets/levels/home.jpg" +dest_files=[ "res://.import/home.jpg-bc8e6bc350c4de96f198ba321428b932.stex" ] [params] diff --git a/assets/levels/warcraft.jpg b/assets/levels/warcraft.jpg index 0dee25b..d42a6cd 100644 Binary files a/assets/levels/warcraft.jpg and b/assets/levels/warcraft.jpg differ diff --git a/assets/ui/themes/UI-Button-Reset-disabled.png b/assets/ui/themes/UI-Button-Reset-disabled.png index 556c5fb..cbca598 100644 Binary files a/assets/ui/themes/UI-Button-Reset-disabled.png and b/assets/ui/themes/UI-Button-Reset-disabled.png differ diff --git a/assets/ui/themes/level-btn-leather.png b/assets/ui/themes/level-btn-leather.png new file mode 100644 index 0000000..c9281c9 Binary files /dev/null and b/assets/ui/themes/level-btn-leather.png differ diff --git a/assets/ui/themes/level-btn-leather.png.import b/assets/ui/themes/level-btn-leather.png.import new file mode 100644 index 0000000..f052187 --- /dev/null +++ b/assets/ui/themes/level-btn-leather.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/level-btn-leather.png-5e04ca36df4842ea4a9e83c590591cd9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/themes/level-btn-leather.png" +dest_files=[ "res://.import/level-btn-leather.png-5e04ca36df4842ea4a9e83c590591cd9.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/assets/ui/themes/level-btn.png b/assets/ui/themes/level-btn.png index 9081994..c3b8e1d 100644 Binary files a/assets/ui/themes/level-btn.png and b/assets/ui/themes/level-btn.png differ diff --git a/assets/ui/themes/tab_select/UI-Button-Count-disabled.png b/assets/ui/themes/tab_select/UI-Button-Count-disabled.png new file mode 100644 index 0000000..1cfae19 Binary files /dev/null and b/assets/ui/themes/tab_select/UI-Button-Count-disabled.png differ diff --git a/assets/ui/themes/tab_select/UI-Button-Count-disabled.png.import b/assets/ui/themes/tab_select/UI-Button-Count-disabled.png.import new file mode 100644 index 0000000..a31bc36 --- /dev/null +++ b/assets/ui/themes/tab_select/UI-Button-Count-disabled.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/UI-Button-Count-disabled.png-6f1ea696699e13ac9743c287ba31d0a6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/themes/tab_select/UI-Button-Count-disabled.png" +dest_files=[ "res://.import/UI-Button-Count-disabled.png-6f1ea696699e13ac9743c287ba31d0a6.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/assets/ui/themes/tab_select/UI-Button-Count-hover.png b/assets/ui/themes/tab_select/UI-Button-Count-hover.png new file mode 100644 index 0000000..d7bb0b4 Binary files /dev/null and b/assets/ui/themes/tab_select/UI-Button-Count-hover.png differ diff --git a/assets/ui/themes/tab_select/UI-Button-Count-hover.png.import b/assets/ui/themes/tab_select/UI-Button-Count-hover.png.import new file mode 100644 index 0000000..232c991 --- /dev/null +++ b/assets/ui/themes/tab_select/UI-Button-Count-hover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/UI-Button-Count-hover.png-84a0a8d367e1dda86bdaf09ae48fe630.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/themes/tab_select/UI-Button-Count-hover.png" +dest_files=[ "res://.import/UI-Button-Count-hover.png-84a0a8d367e1dda86bdaf09ae48fe630.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/assets/ui/themes/tab_select/UI-Button-Count.png b/assets/ui/themes/tab_select/UI-Button-Count.png new file mode 100644 index 0000000..0171417 Binary files /dev/null and b/assets/ui/themes/tab_select/UI-Button-Count.png differ diff --git a/assets/ui/themes/tab_select/UI-Button-Count.png.import b/assets/ui/themes/tab_select/UI-Button-Count.png.import new file mode 100644 index 0000000..95110c1 --- /dev/null +++ b/assets/ui/themes/tab_select/UI-Button-Count.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/UI-Button-Count.png-cd9e8bc1802a9543d9af9d62db2df0e6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/themes/tab_select/UI-Button-Count.png" +dest_files=[ "res://.import/UI-Button-Count.png-cd9e8bc1802a9543d9af9d62db2df0e6.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/assets/ui/themes/tab_select/UI-Button-Reset-disabled.png b/assets/ui/themes/tab_select/UI-Button-Reset-disabled.png new file mode 100644 index 0000000..9b5c4fd Binary files /dev/null and b/assets/ui/themes/tab_select/UI-Button-Reset-disabled.png differ diff --git a/assets/ui/themes/tab_select/UI-Button-Reset-disabled.png.import b/assets/ui/themes/tab_select/UI-Button-Reset-disabled.png.import new file mode 100644 index 0000000..4ebb7c6 --- /dev/null +++ b/assets/ui/themes/tab_select/UI-Button-Reset-disabled.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/UI-Button-Reset-disabled.png-16206d7b616d351fb2c57832ecffd255.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/themes/tab_select/UI-Button-Reset-disabled.png" +dest_files=[ "res://.import/UI-Button-Reset-disabled.png-16206d7b616d351fb2c57832ecffd255.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/assets/ui/themes/tab_select/UI-Button-Reset-hover.png b/assets/ui/themes/tab_select/UI-Button-Reset-hover.png new file mode 100644 index 0000000..d9e319f Binary files /dev/null and b/assets/ui/themes/tab_select/UI-Button-Reset-hover.png differ diff --git a/assets/ui/themes/tab_select/UI-Button-Reset-hover.png.import b/assets/ui/themes/tab_select/UI-Button-Reset-hover.png.import new file mode 100644 index 0000000..2b8df49 --- /dev/null +++ b/assets/ui/themes/tab_select/UI-Button-Reset-hover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/UI-Button-Reset-hover.png-327fa1d39ad4fcc3001d6858a85bd570.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/themes/tab_select/UI-Button-Reset-hover.png" +dest_files=[ "res://.import/UI-Button-Reset-hover.png-327fa1d39ad4fcc3001d6858a85bd570.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/assets/ui/themes/tab_select/UI-Button-Reset.png b/assets/ui/themes/tab_select/UI-Button-Reset.png new file mode 100644 index 0000000..6b7e0f9 Binary files /dev/null and b/assets/ui/themes/tab_select/UI-Button-Reset.png differ diff --git a/assets/ui/themes/tab_select/UI-Button-Reset.png.import b/assets/ui/themes/tab_select/UI-Button-Reset.png.import new file mode 100644 index 0000000..5061421 --- /dev/null +++ b/assets/ui/themes/tab_select/UI-Button-Reset.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/UI-Button-Reset.png-ed9127da57e521f41ac0d62df06b41f9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/themes/tab_select/UI-Button-Reset.png" +dest_files=[ "res://.import/UI-Button-Reset.png-ed9127da57e521f41ac0d62df06b41f9.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/assets/ui/themes/tab_select/UI-level-btn-leather.png b/assets/ui/themes/tab_select/UI-level-btn-leather.png new file mode 100644 index 0000000..6ce0058 Binary files /dev/null and b/assets/ui/themes/tab_select/UI-level-btn-leather.png differ diff --git a/assets/ui/themes/tab_select/UI-level-btn-leather.png.import b/assets/ui/themes/tab_select/UI-level-btn-leather.png.import new file mode 100644 index 0000000..b7b7713 --- /dev/null +++ b/assets/ui/themes/tab_select/UI-level-btn-leather.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/UI-level-btn-leather.png-3fd1a6ada85694f56d23e288b12b5efb.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/themes/tab_select/UI-level-btn-leather.png" +dest_files=[ "res://.import/UI-level-btn-leather.png-3fd1a6ada85694f56d23e288b12b5efb.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/assets/ui/themes/tab_select/UI-level-btn-shadow.png b/assets/ui/themes/tab_select/UI-level-btn-shadow.png new file mode 100644 index 0000000..7a07341 Binary files /dev/null and b/assets/ui/themes/tab_select/UI-level-btn-shadow.png differ diff --git a/assets/ui/themes/tab_select/UI-level-btn-shadow.png.import b/assets/ui/themes/tab_select/UI-level-btn-shadow.png.import new file mode 100644 index 0000000..5eeafd1 --- /dev/null +++ b/assets/ui/themes/tab_select/UI-level-btn-shadow.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/UI-level-btn-shadow.png-0111039d4264bb8e94fd4342fc2c482b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/themes/tab_select/UI-level-btn-shadow.png" +dest_files=[ "res://.import/UI-level-btn-shadow.png-0111039d4264bb8e94fd4342fc2c482b.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/developers/aurelien/ui/ui_grid_tabs.tscn b/developers/aurelien/ui/ui_grid_tabs.tscn new file mode 100644 index 0000000..fdcf921 --- /dev/null +++ b/developers/aurelien/ui/ui_grid_tabs.tscn @@ -0,0 +1,210 @@ +[gd_scene format=2] + +[node name="Control" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="GridContainer" type="GridContainer" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +custom_constants/vseparation = 10 +custom_constants/hseparation = 10 +columns = 2 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TabContainerGeneral" type="TabContainer" parent="GridContainer"] +margin_right = 635.0 +margin_bottom = 233.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +tab_align = 0 + +[node name="Generale" type="Tabs" parent="GridContainer/TabContainerGeneral"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 4.0 +margin_top = 32.0 +margin_right = 36.0 +margin_bottom = 20.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +scrolling_enabled = false + +[node name="RichTextLabel" type="RichTextLabel" parent="GridContainer/TabContainerGeneral/Generale"] +margin_right = 624.0 +margin_bottom = 221.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, consequat in, pretium a, enim. Pellentesque congue. Ut in risus volutpat libero pharetra tempor. Cras vestibulum bibendum augue. Praesent egestas leo in pede. Praesent blandit odio eu enim. Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. Maecenas adipiscing ante non diam sodales hendrerit. + +Ut velit mauris, egestas sed, gravida nec, ornare ut, mi. Aenean ut orci vel massa suscipit pulvinar. Nulla sollicitudin. Fusce varius, ligula non tempus aliquam, nunc turpis ullamcorper nibh, in tempus sapien eros vitae ligula. Pellentesque rhoncus nunc et augue. Integer id felis. Curabitur aliquet pellentesque diam. Integer quis metus vitae elit lobortis egestas. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi vel erat non mauris convallis vehicula. Nulla et sapien. Integer tortor tellus, aliquam faucibus, convallis id, congue eu, quam. Mauris ullamcorper felis vitae erat. Proin feugiat, augue non elementum posuere, metus purus iaculis lectus, et tristique ligula justo vitae magna. +Aliquam convallis sollicitudin purus. Praesent aliquam, enim at fermentum mollis, ligula massa adipiscing nisl, ac euismod nibh nisl eu lectus. Fusce vulputate sem at sapien. Vivamus leo. Aliquam euismod libero eu enim. Nulla nec felis sed leo placerat imperdiet. Aenean suscipit nulla in justo. Suspendisse cursus rutrum augue. Nulla tincidunt tincidunt mi. Curabitur iaculis, lorem vel rhoncus faucibus, felis magna fermentum augue, et ultricies lacus lorem varius purus. Curabitur eu amet." +scroll_active = false +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TabContainerMobile" type="TabContainer" parent="GridContainer"] +margin_left = 645.0 +margin_right = 1280.0 +margin_bottom = 233.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +tab_align = 0 + +[node name="Mobile" type="Tabs" parent="GridContainer/TabContainerMobile"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 4.0 +margin_top = 32.0 +margin_right = -4.0 +margin_bottom = -4.0 +tab_align = 0 + +[node name="RichTextLabel" type="RichTextLabel" parent="GridContainer/TabContainerMobile/Mobile"] +anchor_right = 1.0 +anchor_bottom = 1.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Quis autem vel eum iure reprehenderit, qui in ea voluptate velit esse, quam nihil molestiae consequatur, vel illum, qui dolorem eum fugiat, quo voluptas nulla pariatur?" +scroll_active = false +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TabContainerSound" type="TabContainer" parent="GridContainer"] +margin_top = 243.0 +margin_right = 635.0 +margin_bottom = 476.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +tab_align = 0 + +[node name="Sound" type="Tabs" parent="GridContainer/TabContainerSound"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 4.0 +margin_top = 32.0 +margin_right = -4.0 +margin_bottom = -4.0 +tab_align = 0 + +[node name="RichTextLabel2" type="RichTextLabel" parent="GridContainer/TabContainerSound/Sound"] +anchor_right = 1.0 +anchor_bottom = 1.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Quis autem vel eum iure reprehenderit, qui in ea voluptate velit esse, quam nihil molestiae consequatur, vel illum, qui dolorem eum fugiat, quo voluptas nulla pariatur?" +scroll_active = false +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TabContainerGraphisme" type="TabContainer" parent="GridContainer"] +margin_left = 645.0 +margin_top = 243.0 +margin_right = 1280.0 +margin_bottom = 476.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +tab_align = 0 + +[node name="Graphisme" type="Tabs" parent="GridContainer/TabContainerGraphisme"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 4.0 +margin_top = 32.0 +margin_right = -4.0 +margin_bottom = -4.0 +tab_align = 0 +scrolling_enabled = false + +[node name="RichTextLabel" type="RichTextLabel" parent="GridContainer/TabContainerGraphisme/Graphisme"] +anchor_right = 1.0 +anchor_bottom = 1.0 +text = "« Pour vous faire mieux connaitre d’où vient l’erreur de ceux qui blâment la volupté, et qui louent en quelque sorte la douleur, je vais entrer dans une explication plus étendue, et vous faire voir tout ce qui a été dit là-dessus par l’inventeur de la vérité, et, pour ainsi dire, par l’architecte de la vie heureuse. + +Personne [dit Épicure] ne craint ni ne fuit la volupté en tant que volupté, mais en tant qu’elle attire de grandes douleurs à ceux qui ne savent pas en faire un usage modéré et raisonnable ; et personne n’aime ni ne recherche la douleur comme douleur, mais parce qu’il arrive quelquefois que, par le travail et par la peine, on parvienne à jouir d’une grande volupté. En effet, pour descendre jusqu’aux petites choses, qui de vous ne fait point quelque exercice pénible pour en retirer quelque sorte d’utilité ? Et qui pourrait justement blâmer, ou celui qui rechercherait une volupté qui ne pourrait être suivie de rien de fâcheux, ou celui qui éviterait une douleur dont il ne pourrait espérer aucun plaisir. + +Au contraire, nous blâmons avec raison et nous croyons dignes de mépris et de haine ceux qui, se laissant corrompre par les attraits d’une volupté présente, ne prévoient pas à combien de maux et de chagrins une passion aveugle les peut exposer. + +J’en dis autant de ceux qui, par mollesse d’esprit, c’est-à-dire par la crainte de la peine et de la douleur, manquent aux devoirs de la vie. Et il est très facile de rendre raison de ce que j’avance. Car, lorsque nous sommes tout à fait libres, et que rien ne nous empêche de faire ce qui peut nous donner le plus de plaisir, nous pouvons nous livrer entièrement à la volupté et chasser toute sorte de douleur ; mais, dans les temps destinés aux devoirs de la société ou à la nécessité des affaires, souvent il faut faire divorce avec la volupté, et ne se point refuser à la peine. + +La règle que suit en cela un homme sage, c’est de renoncer à de légères voluptés pour en avoir de plus grandes, et de savoir supporter des douleurs légères pour en éviter de plus fâcheuses. »" +scroll_active = false +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TabContainerSound2" type="TabContainer" parent="GridContainer"] +margin_top = 486.0 +margin_right = 635.0 +margin_bottom = 719.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +tab_align = 0 + +[node name="Sound" type="Tabs" parent="GridContainer/TabContainerSound2"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 4.0 +margin_top = 32.0 +margin_right = -4.0 +margin_bottom = -4.0 +tab_align = 0 + +[node name="RichTextLabel2" type="RichTextLabel" parent="GridContainer/TabContainerSound2/Sound"] +anchor_right = 1.0 +anchor_bottom = 1.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Quis autem vel eum iure reprehenderit, qui in ea voluptate velit esse, quam nihil molestiae consequatur, vel illum, qui dolorem eum fugiat, quo voluptas nulla pariatur?" +scroll_active = false +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TabContainerGraphisme2" type="TabContainer" parent="GridContainer"] +margin_left = 645.0 +margin_top = 486.0 +margin_right = 1280.0 +margin_bottom = 719.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +tab_align = 0 + +[node name="Graphisme" type="Tabs" parent="GridContainer/TabContainerGraphisme2"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 4.0 +margin_top = 32.0 +margin_right = -4.0 +margin_bottom = -4.0 +tab_align = 0 +scrolling_enabled = false + +[node name="RichTextLabel" type="RichTextLabel" parent="GridContainer/TabContainerGraphisme2/Graphisme"] +anchor_right = 1.0 +anchor_bottom = 1.0 +text = "« Pour vous faire mieux connaitre d’où vient l’erreur de ceux qui blâment la volupté, et qui louent en quelque sorte la douleur, je vais entrer dans une explication plus étendue, et vous faire voir tout ce qui a été dit là-dessus par l’inventeur de la vérité, et, pour ainsi dire, par l’architecte de la vie heureuse. + +Personne [dit Épicure] ne craint ni ne fuit la volupté en tant que volupté, mais en tant qu’elle attire de grandes douleurs à ceux qui ne savent pas en faire un usage modéré et raisonnable ; et personne n’aime ni ne recherche la douleur comme douleur, mais parce qu’il arrive quelquefois que, par le travail et par la peine, on parvienne à jouir d’une grande volupté. En effet, pour descendre jusqu’aux petites choses, qui de vous ne fait point quelque exercice pénible pour en retirer quelque sorte d’utilité ? Et qui pourrait justement blâmer, ou celui qui rechercherait une volupté qui ne pourrait être suivie de rien de fâcheux, ou celui qui éviterait une douleur dont il ne pourrait espérer aucun plaisir. + +Au contraire, nous blâmons avec raison et nous croyons dignes de mépris et de haine ceux qui, se laissant corrompre par les attraits d’une volupté présente, ne prévoient pas à combien de maux et de chagrins une passion aveugle les peut exposer. + +J’en dis autant de ceux qui, par mollesse d’esprit, c’est-à-dire par la crainte de la peine et de la douleur, manquent aux devoirs de la vie. Et il est très facile de rendre raison de ce que j’avance. Car, lorsque nous sommes tout à fait libres, et que rien ne nous empêche de faire ce qui peut nous donner le plus de plaisir, nous pouvons nous livrer entièrement à la volupté et chasser toute sorte de douleur ; mais, dans les temps destinés aux devoirs de la société ou à la nécessité des affaires, souvent il faut faire divorce avec la volupté, et ne se point refuser à la peine. + +La règle que suit en cela un homme sage, c’est de renoncer à de légères voluptés pour en avoir de plus grandes, et de savoir supporter des douleurs légères pour en éviter de plus fâcheuses. »" +scroll_active = false +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/developers/aurelien/ui/ui_scrolls.tscn b/developers/aurelien/ui/ui_scrolls.tscn new file mode 100644 index 0000000..b73c5e2 --- /dev/null +++ b/developers/aurelien/ui/ui_scrolls.tscn @@ -0,0 +1,74 @@ +[gd_scene format=2] + +[node name="Control" type="ScrollContainer"] +anchor_right = 1.0 +anchor_bottom = 1.0 +scroll_vertical_enabled = false +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="MarginContainer" type="MarginContainer" parent="."] +margin_right = 1280.0 +margin_bottom = 1280.0 +rect_min_size = Vector2( 1280, 1280 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 +custom_constants/margin_right = 10 +custom_constants/margin_top = 10 +custom_constants/margin_left = 10 +custom_constants/margin_bottom = 10 + +[node name="TabContainerGeneral" type="TabContainer" parent="MarginContainer"] +margin_left = 10.0 +margin_top = 10.0 +margin_right = 1270.0 +margin_bottom = 1270.0 +rect_min_size = Vector2( 0, 1080 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 +tab_align = 0 + +[node name="Generale" type="Tabs" parent="MarginContainer/TabContainerGeneral"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 4.0 +margin_top = 32.0 +margin_right = -4.0 +margin_bottom = -4.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +scrolling_enabled = false + +[node name="RichTextLabel" type="RichTextLabel" parent="MarginContainer/TabContainerGeneral/Generale"] +anchor_right = 1.0 +anchor_bottom = 1.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, consequat in, pretium a, enim. Pellentesque congue. Ut in risus volutpat libero pharetra tempor. Cras vestibulum bibendum augue. Praesent egestas leo in pede. Praesent blandit odio eu enim. Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. Maecenas adipiscing ante non diam sodales hendrerit. + +Ut velit mauris, egestas sed, gravida nec, ornare ut, mi. Aenean ut orci vel massa suscipit pulvinar. Nulla sollicitudin. Fusce varius, ligula non tempus aliquam, nunc turpis ullamcorper nibh, in tempus sapien eros vitae ligula. Pellentesque rhoncus nunc et augue. Integer id felis. Curabitur aliquet pellentesque diam. Integer quis metus vitae elit lobortis egestas. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi vel erat non mauris convallis vehicula. Nulla et sapien. Integer tortor tellus, aliquam faucibus, convallis id, congue eu, quam. Mauris ullamcorper felis vitae erat. Proin feugiat, augue non elementum posuere, metus purus iaculis lectus, et tristique ligula justo vitae magna. +Aliquam convallis sollicitudin purus. Praesent aliquam, enim at fermentum mollis, ligula massa adipiscing nisl, ac euismod nibh nisl eu lectus. Fusce vulputate sem at sapien. Vivamus leo. Aliquam euismod libero eu enim. Nulla nec felis sed leo placerat imperdiet. Aenean suscipit nulla in justo. Suspendisse cursus rutrum augue. Nulla tincidunt tincidunt mi. Curabitur iaculis, lorem vel rhoncus faucibus, felis magna fermentum augue, et ultricies lacus lorem varius purus. Curabitur eu amet. + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, consequat in, pretium a, enim. Pellentesque congue. Ut in risus volutpat libero pharetra tempor. Cras vestibulum bibendum augue. Praesent egestas leo in pede. Praesent blandit odio eu enim. Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. Maecenas adipiscing ante non diam sodales hendrerit. + +Ut velit mauris, egestas sed, gravida nec, ornare ut, mi. Aenean ut orci vel massa suscipit pulvinar. Nulla sollicitudin. Fusce varius, ligula non tempus aliquam, nunc turpis ullamcorper nibh, in tempus sapien eros vitae ligula. Pellentesque rhoncus nunc et augue. Integer id felis. Curabitur aliquet pellentesque diam. Integer quis metus vitae elit lobortis egestas. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi vel erat non mauris convallis vehicula. Nulla et sapien. Integer tortor tellus, aliquam faucibus, convallis id, congue eu, quam. Mauris ullamcorper felis vitae erat. Proin feugiat, augue non elementum posuere, metus purus iaculis lectus, et tristique ligula justo vitae magna. +Aliquam convallis sollicitudin purus. Praesent aliquam, enim at fermentum mollis, ligula massa adipiscing nisl, ac euismod nibh nisl eu lectus. Fusce vulputate sem at sapien. Vivamus leo. Aliquam euismod libero eu enim. Nulla nec felis sed leo placerat imperdiet. Aenean suscipit nulla in justo. Suspendisse cursus rutrum augue. Nulla tincidunt tincidunt mi. Curabitur iaculis, lorem vel rhoncus faucibus, felis magna fermentum augue, et ultricies lacus lorem varius purus. Curabitur eu amet. +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, consequat in, pretium a, enim. Pellentesque congue. Ut in risus volutpat libero pharetra tempor. Cras vestibulum bibendum augue. Praesent egestas leo in pede. Praesent blandit odio eu enim. Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. Maecenas adipiscing ante non diam sodales hendrerit. + +Ut velit mauris, egestas sed, gravida nec, ornare ut, mi. Aenean ut orci vel massa suscipit pulvinar. Nulla sollicitudin. Fusce varius, ligula non tempus aliquam, nunc turpis ullamcorper nibh, in tempus sapien eros vitae ligula. Pellentesque rhoncus nunc et augue. Integer id felis. Curabitur aliquet pellentesque diam. Integer quis metus vitae elit lobortis egestas. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi vel erat non mauris convallis vehicula. Nulla et sapien. Integer tortor tellus, aliquam faucibus, convallis id, congue eu, quam. Mauris ullamcorper felis vitae erat. Proin feugiat, augue non elementum posuere, metus purus iaculis lectus, et tristique ligula justo vitae magna. +Aliquam convallis sollicitudin purus. Praesent aliquam, enim at fermentum mollis, ligula massa adipiscing nisl, ac euismod nibh nisl eu lectus. Fusce vulputate sem at sapien. Vivamus leo. Aliquam euismod libero eu enim. Nulla nec felis sed leo placerat imperdiet. Aenean suscipit nulla in justo. Suspendisse cursus rutrum augue. Nulla tincidunt tincidunt mi. Curabitur iaculis, lorem vel rhoncus faucibus, felis magna fermentum augue, et ultricies lacus lorem varius purus. Curabitur eu amet. + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, consequat in, pretium a, enim. Pellentesque congue. Ut in risus volutpat libero pharetra tempor. Cras vestibulum bibendum augue. Praesent egestas leo in pede. Praesent blandit odio eu enim. Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. Maecenas adipiscing ante non diam sodales hendrerit. + +Ut velit mauris, egestas sed, gravida nec, ornare ut, mi. Aenean ut orci vel massa suscipit pulvinar. Nulla sollicitudin. Fusce varius, ligula non tempus aliquam, nunc turpis ullamcorper nibh, in tempus sapien eros vitae ligula. Pellentesque rhoncus nunc et augue. Integer id felis. Curabitur aliquet pellentesque diam. Integer quis metus vitae elit lobortis egestas. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi vel erat non mauris convallis vehicula. Nulla et sapien. Integer tortor tellus, aliquam faucibus, convallis id, congue eu, quam. Mauris ullamcorper felis vitae erat. Proin feugiat, augue non elementum posuere, metus purus iaculis lectus, et tristique ligula justo vitae magna. +Aliquam convallis sollicitudin purus. Praesent aliquam, enim at fermentum mollis, ligula massa adipiscing nisl, ac euismod nibh nisl eu lectus. Fusce vulputate sem at sapien. Vivamus leo. Aliquam euismod libero eu enim. Nulla nec felis sed leo placerat imperdiet. Aenean suscipit nulla in justo. Suspendisse cursus rutrum augue. Nulla tincidunt tincidunt mi. Curabitur iaculis, lorem vel rhoncus faucibus, felis magna fermentum augue, et ultricies lacus lorem varius purus. Curabitur eu amet. + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, consequat in, pretium a, enim. Pellentesque congue. Ut in risus volutpat libero pharetra tempor. Cras vestibulum bibendum augue. Praesent egestas leo in pede. Praesent blandit odio eu enim. Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. Maecenas adipiscing ante non diam sodales hendrerit. + +Ut velit mauris, egestas sed, gravida nec, ornare ut, mi. Aenean ut orci vel massa suscipit pulvinar. Nulla sollicitudin. Fusce varius, ligula non tempus aliquam, nunc turpis ullamcorper nibh, in tempus sapien eros vitae ligula. Pellentesque rhoncus nunc et augue. Integer id felis. Curabitur aliquet pellentesque diam. Integer quis metus vitae elit lobortis egestas. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi vel erat non mauris convallis vehicula. Nulla et sapien. Integer tortor tellus, aliquam faucibus, convallis id, congue eu, quam. Mauris ullamcorper felis vitae erat. Proin feugiat, augue non elementum posuere, metus purus iaculis lectus, et tristique ligula justo vitae magna. +Aliquam convallis sollicitudin purus. Praesent aliquam, enim at fermentum mollis, ligula massa adipiscing nisl, ac euismod nibh nisl eu lectus. Fusce vulputate sem at sapien. Vivamus leo. Aliquam euismod libero eu enim. Nulla nec felis sed leo placerat imperdiet. Aenean suscipit nulla in justo. Suspendisse cursus rutrum augue. Nulla tincidunt tincidunt mi. Curabitur iaculis, lorem vel rhoncus faucibus, felis magna fermentum augue, et ultricies lacus lorem varius purus. Curabitur eu amet." +scroll_active = false +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/developers/aurelien/ui/ui_tile.tscn b/developers/aurelien/ui/ui_tile.tscn new file mode 100644 index 0000000..f671bcf --- /dev/null +++ b/developers/aurelien/ui/ui_tile.tscn @@ -0,0 +1,101 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://assets/ui/themes/tab_select/UI-level-btn-leather.png" type="Texture" id=1] +[ext_resource path="res://assets/ui/themes/tab_select/UI-Button-Count.png" type="Texture" id=2] +[ext_resource path="res://assets/ui/themes/tab_select/UI-level-btn-shadow.png" type="Texture" id=3] +[ext_resource path="res://assets/ui/themes/tab_select/UI-Button-Reset.png" type="Texture" id=4] + +[node name="Control" type="Control"] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -639.646 +margin_top = 0.707092 +margin_right = 640.354 +margin_bottom = 720.707 +size_flags_horizontal = 0 +size_flags_vertical = 0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BckShadow" type="TextureRect" parent="."] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -227.0 +margin_right = 228.0 +margin_bottom = 720.0 +texture = ExtResource( 3 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="MarginContainer" type="MarginContainer" parent="."] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -228.5 +margin_right = 228.5 +margin_bottom = 436.0 +custom_constants/margin_right = 20 +custom_constants/margin_top = 20 +custom_constants/margin_left = 20 +custom_constants/margin_bottom = 0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="AlignColumn" type="VBoxContainer" parent="MarginContainer"] +margin_left = 20.0 +margin_top = 20.0 +margin_right = 437.0 +margin_bottom = 549.0 +custom_constants/separation = 0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TextureRect" type="TextureRect" parent="MarginContainer/AlignColumn"] +margin_right = 417.0 +margin_bottom = 416.0 +texture = ExtResource( 1 ) + +[node name="VBoxContainer" type="HBoxContainer" parent="MarginContainer/AlignColumn"] +margin_top = 416.0 +margin_right = 417.0 +margin_bottom = 529.0 +custom_constants/separation = 0 +alignment = 1 + +[node name="TextureRect2" type="TextureRect" parent="MarginContainer/AlignColumn/VBoxContainer"] +margin_left = 7.0 +margin_right = 185.0 +margin_bottom = 113.0 +size_flags_horizontal = 0 +texture = ExtResource( 4 ) + +[node name="TextureRect3" type="TextureRect" parent="MarginContainer/AlignColumn/VBoxContainer"] +margin_left = 185.0 +margin_right = 410.0 +margin_bottom = 113.0 +rect_pivot_offset = Vector2( -231.224, -72.2715 ) +size_flags_horizontal = 0 +texture = ExtResource( 2 ) + +[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/AlignColumn/VBoxContainer/TextureRect3"] +anchor_right = 1.0 +anchor_bottom = 1.0 +custom_constants/margin_bottom = 10 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="MarginContainer/AlignColumn/VBoxContainer/TextureRect3/MarginContainer"] +margin_right = 225.0 +margin_bottom = 103.0 +size_flags_horizontal = 3 +size_flags_vertical = 7 +text = "X / 10" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/project.godot b/project.godot index 354ddd7..b1fa65d 100644 --- a/project.godot +++ b/project.godot @@ -221,11 +221,12 @@ settings/stdout/print_fps=true [display] -window/size/width=1280 -window/size/height=720 +window/size/width=1920 +window/size/height=1080 window/dpi/allow_hidpi=true window/handheld/orientation="sensor_landscape" window/stretch/mode="2d" +window/stretch/aspect="expand" [editor_plugins] diff --git a/scenes/Main.tscn b/scenes/Main.tscn index 02e0336..dfcddba 100644 --- a/scenes/Main.tscn +++ b/scenes/Main.tscn @@ -26,57 +26,84 @@ __meta__ = { } [node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer"] -margin_right = 1280.0 -margin_bottom = 720.0 +margin_right = 1920.0 +margin_bottom = 1080.0 [node name="UI_summary" parent="MarginContainer/HBoxContainer" instance=ExtResource( 8 )] anchor_bottom = 0.0 margin_right = 446.0 -margin_bottom = 720.0 +margin_bottom = 1080.0 size_flags_horizontal = 0 size_flags_vertical = 3 +[node name="PanelWood" parent="MarginContainer/HBoxContainer/UI_summary" index="0"] +margin_bottom = 1080.0 + +[node name="CenterContainer" parent="MarginContainer/HBoxContainer/UI_summary/PanelWood/VBoxContainer" index="0"] +margin_bottom = 271.0 + [node name="TextureRect" parent="MarginContainer/HBoxContainer/UI_summary/PanelWood/VBoxContainer/CenterContainer" index="0"] -focus_mode = 0 +margin_top = 71.0 +margin_bottom = 199.0 [node name="ButtonPuzzle" parent="MarginContainer/HBoxContainer/UI_summary/PanelWood/VBoxContainer" index="1"] -focus_mode = 0 +margin_top = 301.0 +margin_bottom = 378.0 [node name="ButtonSetting" parent="MarginContainer/HBoxContainer/UI_summary/PanelWood/VBoxContainer" index="2"] -focus_mode = 0 +margin_top = 408.0 +margin_bottom = 485.0 + +[node name="ButtonCredits" parent="MarginContainer/HBoxContainer/UI_summary/PanelWood/VBoxContainer" index="3"] +margin_top = 515.0 +margin_bottom = 592.0 + +[node name="MarginContainer" parent="MarginContainer/HBoxContainer/UI_summary/PanelWood/VBoxContainer" index="4"] +margin_top = 622.0 +margin_bottom = 893.0 [node name="ButtonQuit" parent="MarginContainer/HBoxContainer/UI_summary/PanelWood/VBoxContainer" index="5"] -focus_mode = 0 +margin_top = 923.0 +margin_bottom = 1000.0 + +[node name="ContainerVersion" parent="MarginContainer/HBoxContainer/UI_summary/PanelWood/VBoxContainer" index="6"] +margin_top = 1030.0 +margin_bottom = 1050.0 + +[node name="MarginContainerBottom" parent="MarginContainer/HBoxContainer/UI_summary/PanelWood/VBoxContainer" index="7"] +margin_top = 1080.0 +margin_bottom = 1080.0 + +[node name="TextureRect" parent="MarginContainer/HBoxContainer/UI_summary" index="1"] +margin_bottom = 1080.0 [node name="MarginContainer" type="MarginContainer" parent="MarginContainer/HBoxContainer"] margin_left = 450.0 -margin_right = 1280.0 -margin_bottom = 720.0 +margin_right = 1920.0 +margin_bottom = 1080.0 size_flags_horizontal = 7 size_flags_vertical = 3 [node name="Title" parent="MarginContainer/HBoxContainer/MarginContainer" instance=ExtResource( 2 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 830.0 -margin_bottom = 720.0 +margin_right = 1470.0 +margin_bottom = 1080.0 [node name="Settings" parent="MarginContainer/HBoxContainer/MarginContainer" instance=ExtResource( 4 )] visible = false anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 0.0 -margin_right = 830.0 -margin_bottom = 720.0 +margin_right = 1470.0 +margin_bottom = 1080.0 [node name="ChooseScene" parent="MarginContainer/HBoxContainer/MarginContainer" instance=ExtResource( 3 )] visible = false anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 0.0 -margin_top = 0.0 -margin_right = 830.0 -margin_bottom = 720.0 +margin_right = 1470.0 +margin_bottom = 1080.0 [connection signal="pressed" from="MarginContainer/HBoxContainer/UI_summary/PanelWood/VBoxContainer/CenterContainer/TextureRect" to="." method="_on_TextureRect_pressed"] [connection signal="pressed" from="MarginContainer/HBoxContainer/UI_summary/PanelWood/VBoxContainer/ButtonPuzzle" to="." method="_on_ButtonPuzzle_pressed"] diff --git a/scenes/UI/choose_scenes/ChooseScene.gd b/scenes/UI/choose_scenes/ChooseScene.gd index 1efcb4a..388e5c5 100644 --- a/scenes/UI/choose_scenes/ChooseScene.gd +++ b/scenes/UI/choose_scenes/ChooseScene.gd @@ -13,7 +13,7 @@ func _apply_scenes(): _apply_scene(mlevel.new(row_index), 0) func _build_path(name): - return "MarginContainer/HBoxContainer/"+name + return "MarginContainer/"+name func _build_method(name): return "_on_"+name.to_lower()+"_pressed" @@ -28,7 +28,7 @@ func _load_texture(thumbnail): return load(thumbnail) func _apply_scene(level, index): - $MarginContainer/HBoxContainer.add_child(_load_scene(level.name())) + $MarginContainer.add_child(_load_scene(level.name())) var node = _build_path(level.name()) _configure_select(level, node) @@ -36,13 +36,14 @@ func _apply_scene(level, index): configure_counter(level, node) func _configure_select(level, node): - var select = get_node(node+"/TextureRect/TextureButton") + var selector = get_node(node+"/MarginContainer/CenterAlign/MainButton") + var thumbnail = get_node(node+"/MarginContainer/CenterAlign/MainButton/MarginStich/ThumbnailLevel") - select.set_normal_texture(_load_texture(level.thumbnail())) - select.connect("pressed", Event, _build_method(level.name())) + thumbnail.set_texture(_load_texture(level.thumbnail())) + selector.connect("pressed", Event, _build_method(level.name())) func configure_reset(level, node, index): - var reset = get_node(node+"/VBoxContainer/MarginContainer/ButtonReset") + var reset = get_node(node+"/MarginContainer/CenterAlign/TabAlign/ButtonReset") if int(level.object_finding()) == 0: reset.set_disabled(true) @@ -53,6 +54,6 @@ func configure_reset(level, node, index): reset.connect("pressed", Event, "_on_reset_level", [level, node, index, self]) func configure_counter(level, node): - var count = get_node(node+"/VBoxContainer/MarginContainer2/ButtonCount/Label") + var count = get_node(node+"/MarginContainer/CenterAlign/TabAlign/ButtonCount/MarginBottom/Label") count.set_text(level.object_finding()+" / "+level.object_to_find()) diff --git a/scenes/UI/choose_scenes/ChooseScene.tscn b/scenes/UI/choose_scenes/ChooseScene.tscn index 5ca4041..6b49590 100644 --- a/scenes/UI/choose_scenes/ChooseScene.tscn +++ b/scenes/UI/choose_scenes/ChooseScene.tscn @@ -1,47 +1,21 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=2 format=2] [ext_resource path="res://scenes/UI/choose_scenes/ChooseScene.gd" type="Script" id=1] -[ext_resource path="res://scenes/levels/Template.tscn" type="PackedScene" id=2] -[node name="ChooseScene" type="CenterContainer"] +[node name="ChooseScene" type="ScrollContainer"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 73.7365 -margin_top = -67.0147 -margin_right = 73.7366 -margin_bottom = -67.0146 +size_flags_horizontal = 3 +size_flags_vertical = 3 +scroll_horizontal_enabled = false script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } -[node name="MarginContainer" type="MarginContainer" parent="."] -margin_left = 625.0 -margin_top = 345.0 -margin_right = 655.0 -margin_bottom = 375.0 +[node name="MarginContainer" type="GridContainer" parent="."] +margin_right = 1920.0 +margin_bottom = 1080.0 size_flags_horizontal = 3 size_flags_vertical = 3 -custom_constants/margin_right = 15 -custom_constants/margin_top = 15 -custom_constants/margin_left = 15 -custom_constants/margin_bottom = 15 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer"] -margin_left = 15.0 -margin_top = 15.0 -margin_right = 15.0 -margin_bottom = 15.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -custom_constants/separation = 120 - -[node name="example" parent="MarginContainer/HBoxContainer" instance=ExtResource( 2 )] -visible = false -margin_right = 200.0 -margin_bottom = 284.0 - -[editable path="MarginContainer/HBoxContainer/example"] +columns = 3 diff --git a/scenes/levels/Template.tscn b/scenes/levels/Template.tscn index 7b32df8..a828ea3 100644 --- a/scenes/levels/Template.tscn +++ b/scenes/levels/Template.tscn @@ -1,88 +1,143 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=9 format=2] -[ext_resource path="res://assets/ui/themes/level-btn.png" type="Texture" id=1] -[ext_resource path="res://assets/ui/themes/UI-Button-Clear-Large.png" type="Texture" id=2] -[ext_resource path="res://assets/ui/themes/UI-Button-Reset-hover.png" type="Texture" id=3] -[ext_resource path="res://assets/ui/themes/UI-Button-Reset.png" type="Texture" id=4] -[ext_resource path="res://assets/ui/themes/UI-Button-Clear-Large-hover.png" type="Texture" id=5] -[ext_resource path="res://assets/ui/themes/UI-Button-Reset-disabled.png" type="Texture" id=6] +[ext_resource path="res://assets/ui/themes/tab_select/UI-level-btn-shadow.png" type="Texture" id=1] +[ext_resource path="res://assets/ui/themes/tab_select/UI-Button-Count.png" type="Texture" id=2] +[ext_resource path="res://assets/ui/themes/tab_select/UI-Button-Reset.png" type="Texture" id=3] +[ext_resource path="res://assets/ui/themes/tab_select/UI-Button-Reset-disabled.png" type="Texture" id=4] +[ext_resource path="res://assets/ui/themes/tab_select/UI-Button-Count-hover.png" type="Texture" id=5] +[ext_resource path="res://assets/ui/themes/tab_select/UI-Button-Reset-hover.png" type="Texture" id=6] +[ext_resource path="res://assets/ui/themes/tab_select/UI-level-btn-leather.png" type="Texture" id=7] +[ext_resource path="res://assets/fonts/kirsty/kirsty_base.tres" type="DynamicFont" id=8] -[node name="VBoxContainer" type="VBoxContainer"] -margin_right = 150.0 -margin_bottom = 174.0 +[node name="TilePuzzle" type="Control"] +margin_left = 320.0 +margin_right = 1600.0 +margin_bottom = 720.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 __meta__ = { "_edit_use_anchors_": false } -[node name="TextureRect" type="TextureRect" parent="."] -margin_right = 200.0 -margin_bottom = 200.0 +[node name="BackgroundTile" type="TextureRect" parent="."] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -114.0 +margin_right = 115.0 +margin_bottom = 456.0 texture = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } -[node name="TextureButton" type="TextureButton" parent="TextureRect"] -margin_left = 25.0 -margin_top = 25.0 -margin_right = 40.0 -margin_bottom = 40.0 -focus_mode = 0 -mouse_default_cursor_shape = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 +[node name="MarginContainer" type="MarginContainer" parent="."] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -114.0 +margin_right = 115.0 +margin_bottom = 720.0 +custom_constants/margin_right = 10 +custom_constants/margin_top = 10 +custom_constants/margin_left = 10 __meta__ = { "_edit_use_anchors_": false } -[node name="VBoxContainer" type="HBoxContainer" parent="."] -margin_top = 204.0 -margin_right = 200.0 -margin_bottom = 284.0 +[node name="CenterAlign" type="VBoxContainer" parent="MarginContainer"] +margin_left = 10.0 +margin_top = 10.0 +margin_right = 219.0 +margin_bottom = 720.0 +custom_constants/separation = 0 + +[node name="MainButton" type="TextureButton" parent="MarginContainer/CenterAlign"] +margin_right = 209.0 +margin_bottom = 208.0 +mouse_default_cursor_shape = 2 +texture_normal = ExtResource( 7 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="MarginStich" type="MarginContainer" parent="MarginContainer/CenterAlign/MainButton"] +anchor_right = 1.0 +anchor_bottom = 1.0 +custom_constants/margin_right = 5 +custom_constants/margin_top = 5 +custom_constants/margin_left = 5 +custom_constants/margin_bottom = 5 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="ThumbnailLevel" type="TextureRect" parent="MarginContainer/CenterAlign/MainButton/MarginStich"] +margin_left = 5.0 +margin_top = 5.0 +margin_right = 204.0 +margin_bottom = 203.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +expand = true +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="ThumbnailLevel" type="TextureRect" parent="MarginContainer/CenterAlign/MainButton"] +margin_left = 5.0 +margin_top = 5.0 +margin_right = 204.0 +margin_bottom = 203.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +expand = true +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TabAlign" type="HBoxContainer" parent="MarginContainer/CenterAlign"] +margin_top = 208.0 +margin_right = 209.0 +margin_bottom = 710.0 size_flags_horizontal = 3 size_flags_vertical = 3 alignment = 1 -[node name="MarginContainer" type="CenterContainer" parent="VBoxContainer"] -margin_right = 98.0 -margin_bottom = 80.0 -size_flags_horizontal = 3 - -[node name="ButtonReset" type="TextureButton" parent="VBoxContainer/MarginContainer"] -margin_left = 9.0 -margin_right = 89.0 -margin_bottom = 80.0 -focus_mode = 0 +[node name="ButtonReset" type="TextureButton" parent="MarginContainer/CenterAlign/TabAlign"] +margin_left = 1.0 +margin_right = 90.0 +margin_bottom = 57.0 mouse_default_cursor_shape = 2 -size_flags_horizontal = 3 +size_flags_vertical = 0 disabled = true -texture_normal = ExtResource( 4 ) -texture_hover = ExtResource( 3 ) -texture_disabled = ExtResource( 6 ) -texture_focused = ExtResource( 3 ) +texture_normal = ExtResource( 3 ) +texture_hover = ExtResource( 6 ) +texture_disabled = ExtResource( 4 ) +texture_focused = ExtResource( 6 ) -[node name="MarginContainer2" type="CenterContainer" parent="VBoxContainer"] -margin_left = 102.0 -margin_right = 200.0 -margin_bottom = 80.0 -size_flags_horizontal = 3 - -[node name="ButtonCount" type="TextureButton" parent="VBoxContainer/MarginContainer2"] -margin_left = 9.0 -margin_right = 89.0 -margin_bottom = 80.0 -focus_mode = 0 +[node name="ButtonCount" type="TextureButton" parent="MarginContainer/CenterAlign/TabAlign"] +margin_left = 94.0 +margin_right = 207.0 +margin_bottom = 57.0 mouse_default_cursor_shape = 2 -size_flags_horizontal = 3 +size_flags_vertical = 0 texture_normal = ExtResource( 2 ) texture_hover = ExtResource( 5 ) texture_focused = ExtResource( 5 ) -[node name="Label" type="Label" parent="VBoxContainer/MarginContainer2/ButtonCount"] +[node name="MarginBottom" type="MarginContainer" parent="MarginContainer/CenterAlign/TabAlign/ButtonCount"] anchor_right = 1.0 anchor_bottom = 1.0 +custom_constants/margin_bottom = 10 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="MarginContainer/CenterAlign/TabAlign/ButtonCount/MarginBottom"] +margin_right = 113.0 +margin_bottom = 47.0 size_flags_horizontal = 3 size_flags_vertical = 7 +custom_fonts/font = ExtResource( 8 ) text = "X / 10" align = 1 valign = 1 diff --git a/scenes/levels/home/Home.tscn b/scenes/levels/home/Home.tscn new file mode 100644 index 0000000..cb36257 --- /dev/null +++ b/scenes/levels/home/Home.tscn @@ -0,0 +1,5 @@ +[gd_scene format=2] + +[node name="Spatial" type="Spatial"] + +[node name="Camera" type="Camera" parent="."] diff --git a/scripts/Event.gd b/scripts/Event.gd index e27537b..8061b22 100644 --- a/scripts/Event.gd +++ b/scripts/Event.gd @@ -16,6 +16,10 @@ func _on_warcraft_pressed(): Global.current_scene_int = 0 Global.goto_scene("res://scenes/levels/warcraft/WarCraft.tscn") +func _on_home_pressed(): + Global.current_scene_int = 1 + Global.goto_scene("res://scenes/levels/home/Home.tscn") + func _on_reset_level(level, node, index, parent): Global.current_scene_int = index level.reset()