Skip to content
Snippets Groups Projects
Commit 010d35f7 authored by Astral's avatar Astral
Browse files

merge

parent bcf001ed
Branches
1 merge request!12Ajout de couches et correction d'orthographe
......@@ -16,7 +16,7 @@ _global_script_class_icons={
[application]
config/name="voc20-t3-g"
run/main_scene="res://scenes/scene2/scene2.tscn"
run/main_scene="res://menus/principal/Principal.tscn"
config/icon="res://icon.png"
[autoload]
......
......@@ -650,8 +650,8 @@ script = ExtResource( 22 )
[connection signal="pressed" from="carbon_popup/Control/VBoxContainer/TextureButton" to="carbon_popup/Control/Control/date_screen/date" method="_on_TextureButton_pressed"]
[connection signal="pressed" from="carbon_popup/Control/VBoxContainer/TextureButton" to="carbon_popup/Control/VBoxContainer/TextureRect/affichage_taux" method="_on_TextureButton_pressed"]
[connection signal="pressed" from="encyclopedie_popup/Control/apres" to="encyclopedie_popup/Control/Label" method="_on_apres_pressed"]
[connection signal="pressed" from="encyclopedie_popup/Control/apres" to="encyclopedie_popup/Control/TextureRect" method="_on_apres_pressed"]
[connection signal="pressed" from="encyclopedie_popup/Control/apres" to="encyclopedie_popup/Control/RichTextLabel" method="_on_apres_pressed"]
[connection signal="pressed" from="encyclopedie_popup/Control/apres" to="encyclopedie_popup/Control/TextureRect" method="_on_apres_pressed"]
[connection signal="pressed" from="encyclopedie_popup/Control/avant" to="encyclopedie_popup/Control/Label" method="_on_avant_pressed"]
[connection signal="pressed" from="encyclopedie_popup/Control/avant" to="encyclopedie_popup/Control/TextureRect" method="_on_avant_pressed"]
[connection signal="pressed" from="encyclopedie_popup/Control/avant" to="encyclopedie_popup/Control/RichTextLabel" method="_on_avant_pressed"]
[connection signal="pressed" from="encyclopedie_popup/Control/avant" to="encyclopedie_popup/Control/TextureRect" method="_on_avant_pressed"]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment