diff --git a/NEWS_fr b/NEWS_fr index 7eb0854..0073e83 100644 --- a/NEWS_fr +++ b/NEWS_fr @@ -34,3 +34,6 @@ 9) A l'ouverture du JukeBox, il retaille la fenetre afin de ne pas avoir du scrolling (si possible) +10) Ajout d'une scene simple (damier + personnage avec annimation, et ajout d'autre créature) + +11) Ajout du menu (quand on presse Escape) pendant la scene pour voir les options/quitter/... diff --git a/README.md b/README.md index d79fe79..4bd006e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,61 @@ -VERSION GODOT : 3.3.3 -https://downloads.tuxfamily.org/godotengine/3.3.3/Godot_v3.3.3-stable_x11.64.zip +# Khanat + +## Launch Game + +### Download Version Godot + +We use version GODOT : 3.3.3 + +wget https://downloads.tuxfamily.org/godotengine/3.3.3/Godot_v3.3.3-stable_x11.64.zip +unzip Godot_v3.3.3-stable_x11.64.zip + +### Clone our project + +git clone https://git.khaganat.net/khaganat/mmorpg_khanat/khanat-client.git +(cd khanat-client;git checkout develop) + +### Launch Godot + +./Godot_v3.3.3-stable_x11.64 khanat-client/project.godot + +## Add/update your language + +Welcome to help us to improve our translation. +We need clone our project. + +### Create a new language + +* On Linux : + +Edit file : khanat-client/locale/locale.sh +(You need add in section [# LIST LANGUAGE] your locale) +After launch this script : bash khanat-client/locale/locale.sh + +### Edit your local + +khanat-client/locale/.po" ) +### Push your update + +To send your update, could you please create a branch and send us this branch? + diff --git a/addons/kh_slider/kh_h_slider.gd b/addons/kh_slider/kh_h_slider.gd index 567f813..92466ec 100644 --- a/addons/kh_slider/kh_h_slider.gd +++ b/addons/kh_slider/kh_h_slider.gd @@ -22,7 +22,7 @@ func get_plus_texture(): func _ready(): - self.add_child( preload( "res://addons/kh_slider/kh_h_slider.tscn" ).instance() ) + self.add_child( load( "res://addons/kh_slider/kh_h_slider.tscn" ).instance() ) $kh_h_slider/minus.connect( "pressed", self, "_on_minus_pressed" ) $kh_h_slider/value.connect( "changed", self, "_on_value_changed" ) diff --git a/addons/kh_slider/kh_h_slider_plugin.gd b/addons/kh_slider/kh_h_slider_plugin.gd index 892a7f8..cb066b4 100644 --- a/addons/kh_slider/kh_h_slider_plugin.gd +++ b/addons/kh_slider/kh_h_slider_plugin.gd @@ -2,7 +2,7 @@ tool extends EditorPlugin func _enter_tree(): - add_custom_type("KhHSlider", "HBoxContainer", preload("kh_h_slider.gd"), preload("kh_h_slider.png")) + add_custom_type("KhHSlider", "HBoxContainer", load("kh_h_slider.gd"), load("kh_h_slider.png")) func _exit_tree(): remove_custom_type("KhHSlider") diff --git a/addons/kh_window/kh_window_plugin.gd b/addons/kh_window/kh_window_plugin.gd index af8aeb4..ebcfdd6 100644 --- a/addons/kh_window/kh_window_plugin.gd +++ b/addons/kh_window/kh_window_plugin.gd @@ -4,7 +4,7 @@ extends EditorPlugin func _enter_tree(): # Initialization of the plugin goes here # Add the new type with a name, a parent type, a script and an icon - add_custom_type("kh_window", "MarginContainer", preload("res://addons/kh_window/kh_window.gd"), preload("res://addons/kh_window/icon.png")) + add_custom_type("kh_window", "MarginContainer", load("res://addons/kh_window/kh_window.gd"), load("res://addons/kh_window/icon.png")) func _exit_tree(): # Clean-up of the plugin goes here diff --git a/assets/interfaces/background-menu-options.png b/assets/interfaces/background-menu-options.png new file mode 100644 index 0000000..e9b1a8a Binary files /dev/null and b/assets/interfaces/background-menu-options.png differ diff --git a/locale/locale.sh b/locale/locale.sh index 859f151..a73a9c5 100755 --- a/locale/locale.sh +++ b/locale/locale.sh @@ -16,6 +16,12 @@ function generate_locale() } ORIGIN=$PWD cd $WORKDIR +####################### +# LIST LANGUAGE : START +####################### generate_locale fr generate_locale en +###################### +# LIST LANGUAGE : END +###################### cd $ORIGIN diff --git a/scenes/game/alpha.gd b/scenes/game/alpha.gd index 8dd2165..da96507 100644 --- a/scenes/game/alpha.gd +++ b/scenes/game/alpha.gd @@ -70,10 +70,18 @@ func _ready(): self.add_creature("RA_3", "res://scenes/player/creature_raference.tscn", Vector3( 1.0, 0.01, 5.0 ), Vector3( 0.0, -3.141592, 0.0 )) self.add_creature("Arche_1", "res://scenes/player/creature_arche.tscn", Vector3( -2.0, 0.01, 2.0 ), Vector3( 0.0, -3.141592, 0.0 )) self.add_creature("Isidor_1", "res://scenes/player/creature_isidor.tscn", Vector3( -2.0, 0.01, 5.0 ), Vector3( 0.0, -3.141592, 0.0 )) - pass # Replace with function body. + $player.connect("menu_options_pressed", self, "_on_menu_options") + + +func _on_menu_options(): + Config.msg_info("Received menu options") + if $menu_options.is_visible(): + $menu_options.hide() + else: + $menu_options.show() # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): - Config.msg_info("update Map") + #Config.msg_info("update Map") pass diff --git a/scenes/game/alpha.tscn b/scenes/game/alpha.tscn index 1a87cc3..aca66f1 100644 --- a/scenes/game/alpha.tscn +++ b/scenes/game/alpha.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] +[ext_resource path="res://scenes/interfaces/menu_options/menu_options.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/game/alpha.gd" type="Script" id=5] [ext_resource path="res://scenes/player/playerB.tscn" type="PackedScene" id=8] @@ -12,3 +13,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.01, 0 ) [node name="map" type="Spatial" parent="."] [node name="creatures" type="Spatial" parent="."] + +[node name="menu_options" parent="." instance=ExtResource( 1 )] +visible = false diff --git a/scenes/interfaces/menu_options/menu_options.gd b/scenes/interfaces/menu_options/menu_options.gd new file mode 100644 index 0000000..2dbdc54 --- /dev/null +++ b/scenes/interfaces/menu_options/menu_options.gd @@ -0,0 +1,56 @@ +extends Control + + +signal quit_pressed +signal mute_pressed + + +func _ready(): + #get_node("option_settings").connect("mute_pressed", self, "_on_control_mute_pressed") + MusicManager.connect("mute_pressed", self, "_on_signal_mute_pressed") + MusicManager.connect_ext_func( "mute_pressed", self , "_on_signal_mute_pressed") + $option_settings.connect( "mute_pressed", self, "_on_signal_mute_pressed" ) + $option_settings.connect_ext_func( "mute_pressed", self, "_on_signal_mute_pressed" ) + update_sound_button() + + +func _on_signal_mute_pressed(): + Config.msg_debug("