aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/audio/TODO.md42
-rw-r--r--client/global.gd7
-rw-r--r--client/project.godot2
-rw-r--r--server/src/main.rs2
4 files changed, 8 insertions, 45 deletions
diff --git a/client/audio/TODO.md b/client/audio/TODO.md
deleted file mode 100644
index 56c3c064..00000000
--- a/client/audio/TODO.md
+++ /dev/null
@@ -1,42 +0,0 @@
-
-sfx:
-- plate on table
- - `plate_down1`
- - `plate_down2`
- - `plate_down3`
-- stuff on plate
- - `into_plate1`
- - `into_plate2`
-- stuff in pot
- - `into_pot1`
- - `into_pot2`
-- stuff in cutting board
- - `into_board1`
- - `into_board2`
-- stuff in blender
- - `into_blender1`
-- cutting
- - `cutting1`
- - `cutting2`
- - `cutting3`
-- cooking
- - `cooking1`
- - `cooking2`
- - `cooking3`
-- blender
- - `blender1`
- - `blender2`
- - `blender3`
-- pickup plate
- - `plate_up`
-- pickup other
- - `pickup1`
- - `pickup2`
-- walking
- - `steps1`
- - `steps2`
- - `steps3`
-- running
- - `steps_fast1`
- - `steps_fast2`
- - `steps_fast3`
diff --git a/client/global.gd b/client/global.gd
index 53e82397..6095a34d 100644
--- a/client/global.gd
+++ b/client/global.gd
@@ -36,7 +36,7 @@ var default_profile := {
"has_seen_join_while_running": false
}
}
-var languages := [tr("System default"), "en", "de"]
+var languages := language_array()
var using_joypad := false
var default_settings := {
@@ -270,3 +270,8 @@ static func interpolate_angle(current, target, dt):
func find_menu(node: Node) -> Menu:
if node is Menu: return node
else: return find_menu(node.get_parent())
+
+func language_array() -> Array:
+ var lang: Array = [tr("System default")]
+ lang.append_array(TranslationServer.get_loaded_locales())
+ return lang
diff --git a/client/project.godot b/client/project.godot
index 20d49f20..8ef3527c 100644
--- a/client/project.godot
+++ b/client/project.godot
@@ -184,7 +184,7 @@ zoom_out_discrete={
[internationalization]
-locale/translations=PackedStringArray("res://po/de.po")
+locale/translations=PackedStringArray("res://po/de.po", "res://po/fr.po", "res://po/es.po", "res://po/ja.po")
locale/translations_pot_files=PackedStringArray("res://global.gd", "res://menu/overlay.tscn", "res://menu/setup.tscn", "res://menu/character.tscn", "res://menu/error.tscn", "res://menu/ingame.tscn", "res://menu/lobby.tscn", "res://menu/main.tscn", "res://menu/settings.tscn", "res://menu/ingame.gd", "res://menu/lobby.gd", "res://menu/popup_message.gd", "res://multiplayer.gd", "res://menu/hairstyle_preview.gd", "res://menu/credits.tscn", "res://menu/credits.gd")
[rendering]
diff --git a/server/src/main.rs b/server/src/main.rs
index 1cee94cf..2e1fb77d 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -100,7 +100,7 @@ async fn run() -> anyhow::Result<()> {
{
let state = state.clone();
spawn(async move {
- let dt = 1. / 25.;
+ let dt = 1. / 50.;
let mut tick = interval(Duration::from_secs_f32(dt));
loop {
tick.tick().await;