From 388d1a53916edffb26400aff160a18d82a6c942a Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Thu, 23 Sep 2021 00:50:40 +0200 Subject: [PATCH 1/8] show menu after key pressed (default Escape) --- NEWS_fr | 3 ++ README.md | 39 ++++++++++++++++++- scenes/game/alpha.gd | 12 +++++- scenes/game/alpha.tscn | 6 ++- .../interfaces/music_manager/music_manager.gd | 5 +++ scenes/interfaces/options/option_settings.gd | 5 +++ scenes/player/playerB.gd | 10 +++-- 7 files changed, 71 insertions(+), 9 deletions(-) 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..2dba4c8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,39 @@ -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 + +### Clone our project + +git clone https://git.khaganat.net/khaganat/mmorpg_khanat/khanat-client.git + +### Launch Godot + +godot khanat-client + +## 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/ Date: Thu, 23 Sep 2021 20:34:17 +0200 Subject: [PATCH 2/8] update README and disable addons/kh_slider/plugin.cfg --- README.md | 9 ++++++++- project.godot | 2 +- scenes/main/main.tscn | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2dba4c8..270cbbc 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,16 @@ 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 khanat-client +./Godot_v3.3.3-stable_x11.64 khanat-client/project.godot ## Add/update your language @@ -33,6 +35,11 @@ After launch this script : bash khanat-client/locale/locale.sh khanat-client/locale/ Date: Thu, 23 Sep 2021 20:55:57 +0200 Subject: [PATCH 3/8] update script to active menu --- scenes/interfaces/music_manager/music_manager.gd | 7 +------ scenes/interfaces/options/option_settings.gd | 11 +++-------- scenes/interfaces/options/options.gd | 4 ++-- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/scenes/interfaces/music_manager/music_manager.gd b/scenes/interfaces/music_manager/music_manager.gd index 9ea9f1f..64dd34b 100644 --- a/scenes/interfaces/music_manager/music_manager.gd +++ b/scenes/interfaces/music_manager/music_manager.gd @@ -58,13 +58,8 @@ func _ready(): music_player.connect("finished", self, "_on_stream_finished", []) -func connect_ext( signal_name, target ): - Config.msg_debug("Connect external [signal:" + signal_name + ", func:" + "_on_signal_" + signal_name + "]") - target.connect( signal_name, self, "_on_signal_" + signal_name ) - - func connect_ext_func( signal_name, target , function_target): - Config.msg_debug("Connect external [signal:" + signal_name + ", func:" + "_on_signal_" + signal_name + "]") + Config.msg_debug("Connect external [signal:" + signal_name + ", func:" + function_target + "]") target.connect( signal_name, self, function_target ) diff --git a/scenes/interfaces/options/option_settings.gd b/scenes/interfaces/options/option_settings.gd index dc07873..cbbb1e9 100644 --- a/scenes/interfaces/options/option_settings.gd +++ b/scenes/interfaces/options/option_settings.gd @@ -79,17 +79,12 @@ func _ready(): MusicManager.connect("musicplayer_pressed", self, "_on_signal_musicplayer_pressed") #$option.connect("mute_pressed", self, "update_mute") MusicManager.connect("mute_pressed", self, "_on_signal_mute_pressed") - MusicManager.connect_ext("musicplayer_pressed", self ) - MusicManager.connect_ext("mute_pressed", self ) - - -func connect_ext( signal_name, target): - Config.msg_debug("Connect external [signal:" + signal_name + ", func:" + "_on_signal_" + signal_name + "]") - target.connect( signal_name, self, "_on_signal_" + signal_name ) + MusicManager.connect_ext_func("musicplayer_pressed", self, "_on_signal_musicplayer_pressed") + MusicManager.connect_ext_func("mute_pressed", self, "_on_signal_mute_pressed" ) func connect_ext_func( signal_name, target , function_target): - Config.msg_debug("Connect external [signal:" + signal_name + ", func:" + "_on_signal_" + signal_name + "]") + Config.msg_debug("Connect external [signal:" + signal_name + ", func:" + function_target + "]") target.connect( signal_name, self, function_target ) diff --git a/scenes/interfaces/options/options.gd b/scenes/interfaces/options/options.gd index a8342e2..2469ff1 100644 --- a/scenes/interfaces/options/options.gd +++ b/scenes/interfaces/options/options.gd @@ -9,9 +9,9 @@ func _ready(): #get_node("option_settings").connect("mute_pressed", self, "_on_control_mute_pressed") MusicManager.connect("mute_pressed", self, "_on_control_mute_pressed") MusicManager.connect("musicplayer_pressed", self, "_on_control_musicplayer_pressed") - MusicManager.connect_ext( "mute_pressed", self ) + MusicManager.connect_ext_func( "mute_pressed", self, "_on_signal_mute_pressed" ) $option_settings.connect( "mute_pressed", self, "_on_control_mute_pressed" ) - $option_settings.connect_ext( "mute_pressed", self ) + $option_settings.connect_ext_func( "mute_pressed", self, "_on_signal_mute_pressed" ) update_sound_button() From a6b6bb36c740b01279d484e0eadc462ea58bff59 Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Thu, 23 Sep 2021 21:00:59 +0200 Subject: [PATCH 4/8] adding menu_option --- .../interfaces/menu_options/menu_options.gd | 56 +++++++ .../interfaces/menu_options/menu_options.tscn | 158 ++++++++++++++++++ 2 files changed, 214 insertions(+) create mode 100644 scenes/interfaces/menu_options/menu_options.gd create mode 100644 scenes/interfaces/menu_options/menu_options.tscn 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("