Merge remote-tracking branch 'origin/master' into sharp/small-fixes

.gitignore

@@ -27,6 +27,7 @@
 *.rar
 *.log
 settings.ron
+server_settings.ron
 run.sh
 maps
 screenshots

.gitlab-ci.yml

@@ -105,6 +105,7 @@ unittests:
 
 coverage:
     stage: build-post
+    allow_failure: true
     when: delayed
     start_in: 5 seconds
     tags:

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added daily Mac builds
 - Allow spawning individual pet species, not just generic body kinds.
 - Configurable fonts
+- Configurable keybindings from the Controls menu
 - Tanslation status tracking
 - Added gamma setting
 - Added new orc hairstyles
@@ -40,6 +41,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fleshed out "attack" animation into alpha, beta and spin type attacks
 - Fleshed out range attack into charging and shooting anims for staff/bow
 - Customized attack animation for hammers and axes
+- German translation
+- Added a silhouette for players when they are occluded
+- Added transparency to the player when zooming in
+- Made armor and hotbar slots actually function
+- Added dragging and right-click to use functionality to inventory, armor & hotbar slots
+- Added capes, lanterns, tabards, rings, helmets & necklaces as equippable armor
+- 6 new music tracks
+- Added basic world and civilisation simulation
+- Added overhauled towns
+- Added fields, crops and scarecrows
+- Added paths
+- Added bridges
+- Added procedural house generation
+- Added lampposts
+- Added NPCs that spawn in towns
+- Added simple dungeons
+- Added sub-voxel noise effect
+- Added waypoints next to dungeons
+- Made players spawn in towns
+- Added non-uniform block heights
 
 ### Changed
 
@@ -54,7 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Overhauled icon art
 - Asset cleanup to lower client-size
 - Rewrote the humanoid skeleton to be more ideal for attack animations
-
+- Arrows can no longer hurt their owners
 
 ### Removed
 

Cargo.toml

@@ -14,10 +14,10 @@ members = [
 # default profile for devs, fast to compile, okay enough to run, no debug information
 [profile.dev]
 opt-level = 2
-overflow-checks = true 
+overflow-checks = true
 debug-assertions = true
 panic = "abort"
-debug = false 
+debug = false
 codegen-units = 8
 lto = false
 incremental = true

assets/common/items/armor/back/admin.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Admin's Cape",
+   description: "
+   With great power comes 
+   great responsibility. ",
+    kind: Armor(
+        kind: Back(Admin),
+        stats: (20),
+    ),
+)

assets/common/items/armor/back/short_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Short leather Cape",
+   description: "",
+    kind: Armor(
+        kind: Back(Short0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/head/assa_mask_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Dark Assassin Mask",
+   description: "WIP",
+    kind: Armor(
+        kind: Head(AssaMask0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/head/leather_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Swift Leather Cap",
+   description: "WIP",
+    kind: Armor(
+        kind: Head(Leather0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/neck/neck_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Plain Necklace",
+   description: "",
+    kind: Armor(
+        kind: Neck(Neck0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/ring/ring_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Scratched Ring",
+   description: "Barely fits your finger.",
+    kind: Armor(
+        kind: Ring(Ring0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/starter/rugged_chest.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Rugged Shirt",
+    description: "Smells like Adventure.",
+    kind: Armor(
+        kind: Chest(Rugged0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/starter/rugged_pants.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Rugged Commoner's Pants",
+   description: "They remind you of the old days.",
+    kind: Armor(
+        kind: Pants(Rugged0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/starter/sandals_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Worn out Sandals",
+    description: "Loyal companions.",
+    kind: Armor(
+        kind: Foot(Sandal0),
+        stats: (20),
+    ),
+)

assets/common/items/armor/tabard/admin.ron

@@ -0,0 +1,10 @@
+Item(
+    name: "Admin's Tabard",
+   description: "
+   With great power comes
+   great responsibility. ",
+    kind: Armor(
+        kind: Tabard(Admin),
+        stats: (20),
+    ),
+)

assets/common/items/coconut.ron

@@ -0,0 +1,13 @@
+Item(
+    name: "Coconut",
+    description: "Reliable source of water and fat.
+
+Restores 30 health.",
+    kind: Consumable(
+        kind: Coconut,
+        effect: Health((
+            amount: 30,
+            cause: Item,
+        )),
+    ),
+)

assets/common/items/debug/admin_back.ron

@@ -0,0 +1,9 @@
+Item(
+    name: "Admin's Cape",
+   description: "With great power comes
+   great responsibility. ",
+    kind: Armor(
+        kind: Back(Admin),
+        stats: (20),
+    ),
+)

assets/common/items/debug/admin_tabard.ron

@@ -0,0 +1,9 @@
+Item(
+    name: "Admin's Tabard",
+   description: "With great power comes
+   great responsibility. ",
+    kind: Armor(
+        kind: Tabard(Admin),
+        stats: (20),
+    ),
+)

assets/common/items/debug/green_0.ron

@@ -0,0 +1,5 @@
+Item(
+    name: "Lime Zest Lantern",
+    description: "It has an opening that could fit a ring...",
+    kind: Lantern(Green0),
+)

assets/common/items/debug/leather_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Swift Leather Cap",
+   description: "WIP",
+    kind: Armor(
+        kind: Head(Leather0),
+        stats: (20),
+    ),
+)

assets/common/items/debug/neck_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Plain Necklace",
+   description: "WIP",
+    kind: Armor(
+        kind: Neck(Neck0),
+        stats: (20),
+    ),
+)

assets/common/items/debug/plate_belt.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Iron Belt",
+    description: "WIP",
+    kind: Armor(
+        kind: Belt(Plate0),
+        stats: (20),
+    ),
+)

assets/common/items/debug/plate_chest.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Iron Chestplate",
+    description: "Arrows to the stomach are soooo last update.",
+    kind: Armor(
+        kind: Chest(PlateGreen0),
+        stats: (20),
+    ),
+)

assets/common/items/debug/plate_feet.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Iron Feet",
+    description: "WIP",
+    kind: Armor(
+        kind: Foot(Plate0),
+        stats: (20),
+    ),
+)

assets/common/items/debug/plate_hands.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Iron Handguards",
+    description: "WIP",
+    kind: Armor(
+        kind: Hand(Plate0),
+        stats: (20),
+    ),
+)

assets/common/items/debug/plate_legs.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Iron Legguards",
+    description: "WIP",
+    kind: Armor(
+        kind: Pants(PlateGreen0),
+        stats: (20),
+    ),
+)

assets/common/items/debug/plate_shoulder.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Iron Shoulderguards",
+    description: "A strong shoulder to lean on.",
+    kind: Armor(
+        kind: Shoulder(Plate0),
+        stats: (20),
+    ),
+)

assets/common/items/debug/ring_0.ron

@@ -0,0 +1,8 @@
+Item(
+    name: "Scratched Ring",
+   description: "WIP",
+    kind: Armor(
+        kind: Ring(Ring0),
+        stats: (20),
+    ),
+)

assets/common/items/lantern/black_0.ron

@@ -0,0 +1,5 @@
+Item(
+    name: "Black Lantern",
+    description: "Used by city guards.",
+    kind: Lantern(Black0),
+)

assets/common/items/lantern/green_0.ron

@@ -0,0 +1,5 @@
+Item(
+    name: "Lime Zest Lantern",
+    description: "It has an opening that could fit a ring...",
+    kind: Lantern(Green0),
+)

assets/voxygen/audio/soundtrack.ron

@@ -41,6 +41,48 @@
             length: 173.0,
             timing: Some(Night),
             artist: "Aeronic",
-        )
+        ),
+        (
+            title: "Rest Assured",
+            path: "voxygen.audio.soundtrack.rest_assured",
+            length: 185.0,
+            timing: Some(Day),
+            artist: "badbbad",
+        ),
+        (
+            title: "Just The Beginning",
+            path: "voxygen.audio.soundtrack.just_the_beginning",
+            length: 188.0,
+            timing: Some(Day),
+            artist: "badbbad",
+        ),
+        (
+            title: "Campfire Stories",
+            path: "voxygen.audio.soundtrack.campfire_stories",
+            length: 100.0,
+            timing: Some(Night),
+            artist: "badbbad",
+        ),
+        (
+            title: "Limits",
+            path: "voxygen.audio.soundtrack.limits",
+            length: 203.0,
+            timing: Some(Night),
+            artist: "badbbad",
+        ),
+        (
+            title: "Down The Rabbit Hole",
+            path: "voxygen.audio.soundtrack.down_the_rabbit_hole",
+            length: 244.0,
+            timing: Some(Night),
+            artist: "badbbad",
+        ),
+        (
+            title: "Between The Fairies",
+            path: "voxygen.audio.soundtrack.between_the_fairies",
+            length: 175.0,
+            timing: Some(Night),
+            artist: "badbbad",
+        ),
     ]
 )

assets/voxygen/i18n/de_DE.ron

@@ -0,0 +1,379 @@
+/// Translation document instructions
+/// 
+/// In order to keep localization documents readible please follow the following
+/// rules:
+/// - separate the string map sections using a commentary describing the purpose
+///   of the next section
+/// - prepend multi-line strings with a commentary
+/// - append one blank lines after a multi-line strings and two after sections
+///
+/// To add a new language in Veloren, juste write an additional `.ron` file in 
+/// `assets/voxygen/i18n` and that's it!
+
+/// Lokalisation für Deutsch/Deutschland
+VoxygenLocalization(
+    metadata: (
+        language_name: "Deutsch",
+        language_identifier: "de_DE",
+    ),
+    convert_utf8_to_ascii: false,
+    fonts: {
+        "opensans": Font (
+            asset_key: "voxygen.font.OpenSans-Regular",
+            scale_ratio: 1.0,
+        ),
+        "metamorph": Font (
+            asset_key: "voxygen.font.Metamorphous-Regular",
+            scale_ratio: 1.0,
+        ),
+        "alkhemi": Font (
+            asset_key: "voxygen.font.Alkhemikal",
+            scale_ratio: 1.0,
+        ),
+        "wizard": Font (
+            asset_key: "voxygen.font.wizard",
+            scale_ratio: 1.0,
+        ),
+        "cyri": Font (
+            asset_key: "voxygen.font.haxrcorp_4089_cyrillic_altgr_extended",
+            scale_ratio: 1.0,
+        ),
+    },
+    string_map: {
+        /// Start Common section
+        /// Texts used in multiple locations with the same formatting
+        "common.username": "Benutzername",
+        "common.singleplayer": "Einzelspieler",
+        "common.multiplayer": "Mehrspieler",
+        "common.servers": "Server",
+        "common.quit": "Beenden",
+        "common.settings": "Einstellungen",
+        "common.languages": "Sprache",
+        "common.interface": "Interface",
+        "common.gameplay": "Spiel",
+        "common.controls": "Tastenbelegung",
+        "common.video": "Grafik",
+        "common.sound": "Audio",
+        "common.resume": "Weiter",
+        "common.characters": "Charaktere",
+        "common.close": "Schließen",
+        "common.yes": "Ja",
+        "common.no": "Nein",
+        "common.back": "Zurück",
+        "common.create": "Erstellen",
+        "common.okay": "Okay",
+        "common.accept": "Annehmen",
+        "common.disclaimer": "Disclaimer",
+        "common.cancel": "Abbrechen",
+        "common.none": "Kein",
+        "common.error": "Fehler",
+        "common.fatal_error": "Fataler Fehler",
+        /// End Common section
+
+         // Message when connection to the server is lost
+        "common.connection_lost": r#"Verbindung unterbrochen."#,
+
+
+        "common.races.orc": "Orc",
+        "common.races.human": "Mensch",
+        "common.races.dwarf": "Zwerg",
+        "common.races.elf": "Elf",
+        "common.races.undead": "Untoter",
+        "common.races.danari": "Danari",
+
+        "common.weapons.axe": "Axt",
+        "common.weapons.sword": "Schwert",
+        "common.weapons.staff": "Stab",
+        "common.weapons.bow": "Bogen",
+        "common.weapons.hammer": "Hammer",
+        /// End Common section
+
+
+        /// Start Main screen section
+        "main.connecting": "Verbinde ",
+        "main.creating_world": "Erschaffe Welt ",
+
+
+        /// Start Main screen section
+        /// Welcome notice that appears the first time Veloren is started
+        "main.notice": r#"Willkommen zur Veloren Alpha!
+
+Bevor es losgeht noch einige Infos:
+
+Dies ist eine frühe Alpha. Ihr werdet auf Bugs, unfertiges Gameplay und Mechaniken, sowie fehlende Features sto�en.
+
+Für konstruktives Feedback und Bug-Reports könnt ihr uns via Reddit, Gitlab oder unseren Discord Server kontaktieren.
+
+Veloren hat die GPL 3 Open-Source Lizenz. Das heißt ihr könnt es kostenlos spielen, aber auch modifizieren (solange die Mods auch die selbe Lizenz tragen) und das Spiel an andere weiterschicken.
+
+Veloren ist ein Non-Profit Community Projekt und jeder Mitarbeiter entwickelt es als Hobby in seiner Freizeit.
+
+Wenn euch die Idee gefällt, dann schließt euch doch einfach unserem Dev- oder Art-Team an!
+
+Voxel RPGs haben sich (Genau wie First Person Shooter, die lange nur Doom-Klone genannt wurden) zu einem eigenen Genre entwickelt. 
+Dieses Spiel ist alles andere, als ein Klon bereits vorhandener Spiele und wird sich in seine ganz eigene Richtung entwickeln.
+
+Danke, dass ihr euch die Zeit genommen habt diese Zeilen zu lesen und wir hoffen, dass euch Veloren gefällt!
+
+~ Die Entwickler"#,
+
+        /// Login process description
+        "main.login_process": r#"Information zum Login:
+
+Zum Spielen wird ein Account benötigt. 
+
+Diesen könnt ihr euch hier erstellen:
+
+https://account.veloren.net.
+
+Aktuell wird nur das Aussehen 
+eurer erstellen Charaktere gespeichert."#,
+"main.login.server_not_found": "Server nicht gefunden.",
+        "main.login.authentication_error": "Authentifizierung fehlgeschlagen",
+        "main.login.server_full": "Server ist voll",
+        "main.login.untrusted_auth_server": "Dem Auth. Server wird nicht vertraut",
+        "main.login.outdated_client_or_server": "Inkompatible Version",
+        "main.login.timeout": "Zeitüberschreitung",
+        "main.login.server_shut_down": "Server heruntergefahren",
+        "main.login.already_logged_in": "Ihr seid bereits eingelogged",
+        "main.login.network_error": "Netzwerkfehler",
+        "main.login.failed_sending_request": "Authentifizierung fehlgeschlagen",
+        "main.login.client_crashed": "Client abgestürzt",
+
+        /// End Main screen section
+
+
+        /// Start HUD Section
+        "hud.do_not_show_on_startup": "Nicht wieder anzeigen.",
+        "hud.show_tips": "Tips zeigen.",
+        "hud.quests": "Quests",
+        "hud.you_died": "Ihr seid gestorben.",
+        
+        "hud.press_key_to_show_keybindings_fmt": "Drückt {key} um die Tastenbelegung zu zeigen",
+        "hud.press_key_to_show_debug_info_fmt": "Drückt {key} um die Debug-Info zu zeigen",
+        "hud.press_key_to_toggle_keybindings_fmt": "Drückt {key} um die Tastenbelegung zu zeigen",
+        "hud.press_key_to_toggle_debug_info_fmt": "Drückt {key} um die Debug-Info zu zeigen",
+
+        /// Respawn message
+        "hud.press_key_to_respawn": r#"Drückt {key} um am letzten Lagerfeuer wiederbelebt zu werden."#,
+
+        /// Welcome message
+        "hud.welcome": r#"Willkommen zur Veloren Alpha.
+
+
+Einige Tipps bevor ihr startet:
+
+
+Drückt F1, um die Tastenbelegungen zu sehen.
+
+Um Chat-Kommandos zu sehen gebt /help in den Chat ein.
+
+
+Überall in der Welt erscheinen Kisten und andere Gegenstände.
+
+Sammelt diese mit Rechts-Klick auf.
+
+Um diese zu nutzen öffnet euer Inventar mit 'B'.
+
+Doppelklickt den Gegenstand in eurer Tasche, um dieses zu nutzen.
+
+Um Items wegzuwerfen klickt sie einmal im Inventar an 
+
+und klickt dann außerhalb der Tasche.
+
+
+Die Nächte in Veloren können sehr dunkel werden.
+
+Um eure Laterne anzuzünden gebt /lantern in den Chat ein.
+
+
+Ihr wollt endlich spielen und dafür euren Cursor befreien,
+
+um dieses Fenster zu schließen? Drückt 'TAB'!
+
+
+Viel Spaß in der Welt von Veloren, Abenteurer!"#,
+
+        // Inventory
+        "hud.bag.inventory": "{playername}s Inventar",
+        "hud.bag.stats_title": "{playername}s Werte",
+        "hud.bag.exp": "Erf",
+        "hud.bag.armor": "Rüstung",
+        "hud.bag.stats": "Werte",
+        "hud.bag.head": "Kopf",
+        "hud.bag.neck": "Hals",
+        "hud.bag.tabard": "Wappenrock",
+        "hud.bag.shoulders": "Schultern",
+        "hud.bag.chest": "Brust",
+        "hud.bag.hands": "Hände",
+        "hud.bag.lantern": "Laterne",
+        "hud.bag.belt": "Gürtel",
+        "hud.bag.ring": "Ring",
+        "hud.bag.back": "Rücken",
+        "hud.bag.legs": "Beine",
+        "hud.bag.feet": "Füße",
+        "hud.bag.mainhand": "Haupthand",
+        "hud.bag.offhand": "Nebenhand",  
+
+        // Map and Questlog
+        "hud.map.map_title": "Karte",
+        "hud.map.qlog_title": "Aufgaben",
+
+        // Settings
+        "hud.settings.general": "Allgemein",
+        "hud.settings.none": "Keine",
+        "hud.settings.press_behavior.toggle": "Umschalten",
+        "hud.settings.press_behavior.hold": "Halten",
+        "hud.settings.help_window": "Hilfe",
+        "hud.settings.debug_info": "Debug Info",
+        "hud.settings.tips_on_startup": "Tips",
+        "hud.settings.ui_scale": "UI-Skalierung",
+        "hud.settings.relative_scaling": "Relative Skalierung",
+        "hud.settings.custom_scaling": "Freie Skalierung",
+        "hud.settings.crosshair": "Fadenkreuz",
+        "hud.settings.transparency": "Transparenz",
+        "hud.settings.hotbar": "Hotbar",        
+        "hud.settings.toggle_shortcuts": "Tastenbelegung",
+        "hud.settings.toggle_bar_experience": "Erfahrungsleiste",
+        "hud.settings.scrolling_combat_text": "Aufsteigende Kampfwerte",
+        "hud.settings.single_damage_number": "Einzelne Schadenszahlen",
+        "hud.settings.cumulated_damage": "Addierter Schaden",
+        "hud.settings.incoming_damage": "Erlittener Schaden",
+        "hud.settings.cumulated_incoming_damage": "Addierter erlittener Schaden",
+        "hud.settings.energybar_numbers": "Zahlen auf Ressourcenanzeige",
+        "hud.settings.values": "Werte",
+        "hud.settings.percentages": "Prozent",
+        "hud.settings.chat": "Chat",
+        "hud.settings.background_transparency": "Hintergrund Sichtbarkeit",        
+
+        "hud.settings.pan_sensitivity": "Schwenk Sensibilität",
+        "hud.settings.zoom_sensitivity": "Zoom Sensibilität",
+        "hud.settings.invert_scroll_zoom": "Scroll-Zoom invertieren",
+        "hud.settings.invert_mouse_y_axis": "Maus Y-Achse invertieren",
+        "hud.settings.free_look_behavior": "Freies Umsehen",
+
+        "hud.settings.view_distance": "Sichtweite",
+        "hud.settings.maximum_fps": "Maximale FPS",
+        "hud.settings.fov": "Sichtfeld (Grad)",
+        "hud.settings.gamma": "Gamma",
+        "hud.settings.antialiasing_mode": "Anti-Alias Modus",
+        "hud.settings.cloud_rendering_mode": "Wolken Detail",
+        "hud.settings.fluid_rendering_mode": "Flüssigkeits Detail",
+        "hud.settings.fluid_rendering_mode.cheap": "Niedrig",
+        "hud.settings.fluid_rendering_mode.shiny": "Hoch",
+        "hud.settings.cloud_rendering_mode.regular": "Realistisch",
+        "hud.settings.fullscreen": "Vollbild",
+        "hud.settings.save_window_size": "Größe speichern",
+
+        "hud.settings.music_volume": "Musik Lautstärke",
+        "hud.settings.sound_effect_volume": "Geräusch Lautstärke",
+        "hud.settings.audio_device": "Ausgabegerät",
+
+        "hud.settings.awaitingkey": "Drückt eine Taste...",
+
+        "hud.social": "Sozial",
+        "hud.social.online": "Online",
+        "hud.social.friends": "Freunde",
+        "hud.social.not_yet_available": "Noch nicht verfügbar",
+        "hud.social.faction": "Fraktion",
+        "hud.social.play_online_fmt": "{nb_player} Spieler online",
+
+        "hud.spell": "Zauber",
+
+        "hud.free_look_indicator": "Freie Sicht aktiv",
+
+       
+        /// End HUD section
+        /// Start GameInput section
+
+        "gameinput.primary": "Linker mittlerer Slot",
+        "gameinput.secondary": "Rechter mittlerer Slot",
+        "gameinput.slot1": "Hotbar Slot 1",        
+        "gameinput.slot2": "Hotbar Slot 2",
+        "gameinput.slot3": "Hotbar Slot 3",
+        "gameinput.slot4": "Hotbar Slot 4",
+        "gameinput.slot5": "Hotbar Slot 5",
+        "gameinput.slot6": "Hotbar Slot 6",
+        "gameinput.slot7": "Hotbar Slot 7",
+        "gameinput.slot8": "Hotbar Slot 8",
+        "gameinput.slot9": "Hotbar Slot 9",
+        "gameinput.slot10": "Hotbar Slot 10",
+        "gameinput.swaploadout": "Waffe wechseln",
+        "gameinput.togglecursor": "Mauszeiger zeigen/verstecken",
+        "gameinput.help": "Hilfe anzeigen",
+        "gameinput.toggleinterface": "Interface verstecken/zeigen",
+        "gameinput.toggledebug": "FPS und Debug Informationen",
+        "gameinput.screenshot": "Bildschirmaufnahme",
+        "gameinput.toggleingameui": "Namensplaketten zeigen",
+        "gameinput.fullscreen": "Vollbildschirm",
+        "gameinput.moveforward": "Vorwärts bewegen",
+        "gameinput.moveleft": "Nach Links bewegen",
+        "gameinput.moveright": "Nach Rechts bewegen",
+        "gameinput.moveback": "Rückwärts bewegen",
+        "gameinput.jump": "Springen",
+        "gameinput.glide": "Gleiter",
+        "gameinput.roll": "Rollen",
+        "gameinput.climb": "Klettern",
+        "gameinput.climbdown": "Runter klettern",
+        "gameinput.wallleap": "Wandsprung",
+        "gameinput.mount": "Aufsteigen",
+        "gameinput.enter": "Betreten",
+        "gameinput.command": "Befehl",
+        "gameinput.escape": "Escape",
+        "gameinput.map": "Karte",
+        "gameinput.bag": "Inventar",
+        "gameinput.social": "Sozial",
+        "gameinput.sit": "Sitzen",
+        "gameinput.spellbook": "Zauber",
+        "gameinput.settings": "Einstellungen",
+        "gameinput.respawn": "Wiederbeleben",
+        "gameinput.charge": "Anstürmen",
+        "gameinput.togglewield": "Waffe ziehen/wegstecken",
+        "gameinput.interact": "Interagieren",
+        "gameinput.freelook": "Freie Sicht",
+
+        /// End GameInput section
+
+        /// Start chracter selection section
+        "char_selection.delete_permanently": "Diesen Charakter unwiderruflich löschen?",
+        "char_selection.change_server": "Server wechseln.",
+        "char_selection.enter_world": "Betreten",
+        "char_selection.logout": "Logout",
+        "char_selection.create_charater": "Charakter erstellen",
+        "char_selection.character_creation": "Charakter Erstellung",
+        "char_selection.create_new_charater": "Neuen Charakter erstellen",
+
+       "char_selection.human_default": "Human Default",
+        "char_selection.level_fmt": "Level {level_nb}",
+        "char_selection.uncanny_valley": "Wildniss",
+        "char_selection.plains_of_uncertainty": "Wildniss",
+        "char_selection.beard": "Bart",
+        "char_selection.hair_style": "Frisur",
+        "char_selection.hair_color": "Haarfarbe",
+        "char_selection.chest_color": "Brustrüstung",
+        "char_selection.eye_color": "Augenfarbe",
+        "char_selection.skin": "Hautton",
+        "char_selection.eyebrows": "Augenbrauen",
+        "char_selection.accessories": "Accessoires",
+        /// End chracter selection section
+        /// Start character window section
+        "character_window.character_name": "Charakter",
+        // Charater stats
+        // Charater stats
+        "character_window.character_stats": r#"Ausdauer
+
+Beweglichkeit
+
+Willenskraft
+"#,
+
+
+        /// Start character window section
+        
+
+        /// Start Escape Menu Section
+        "esc_menu.logout": "Ausloggen",
+        "esc_menu.quit_game": "Desktop",
+        /// End Escape Menu Section
+    }
+)

assets/voxygen/i18n/en.ron

@@ -9,6 +9,8 @@
 ///
 /// To add a new language in Veloren, just write an additional `.ron` file in
 /// `assets/voxygen/i18n` and that's it!
+///
+/// WARNING: Localization files shall be saved in UTF-8 format without BOM
 
 /// Localization for "global" English
 VoxygenLocalization(
@@ -147,24 +149,19 @@ https://account.veloren.net."#,
 
         "hud.press_key_to_show_keybindings_fmt": "Press {key} to show keybindings",
         "hud.press_key_to_show_debug_info_fmt": "Press {key} to show debug info",
-        "hud.press_key_to_toggle_keybindings_fmt": "Press {key} to toogle keybindings",
-        "hud.press_key_to_toggle_debug_info_fmt": "Press {key} to toogle debug info",
+        "hud.press_key_to_toggle_keybindings_fmt": "Press {key} to toggle keybindings",
+        "hud.press_key_to_toggle_debug_info_fmt": "Press {key} to toggle debug info",
 
         // Respawn message
         "hud.press_key_to_respawn": r#"Press {key} to respawn at the last campfire you visited."#,
 
         // Welcome message
-        "hud.welcome": r#"Welcome to the Veloren Alpha!,
+        "hud.welcome": r#"Welcome to the Veloren Alpha!
 
 
 Some tips before you start:
 
 
-MOST IMPORTANTLY: To set your respawn point type /waypoint into the chat.
-
-This can also be done when you are already dead!
-
-
 Press F1 to see the available key commands.
 
 Type /help into the chat to see chat commands
@@ -193,11 +190,26 @@ Enjoy your stay in the World of Veloren."#,
 
 
         // Inventory
-        "hud.bag.inventory": "'s Inventory",
-        "hud.bag.stats_title": "'s Stats",
+        "hud.bag.inventory": "{playername}'s Inventory",
+        "hud.bag.stats_title": "{playername}'s Stats",
         "hud.bag.exp": "Exp",
         "hud.bag.armor": "Armor",
         "hud.bag.stats": "Stats",
+        "hud.bag.head": "Head",
+        "hud.bag.neck": "Neck",
+        "hud.bag.tabard": "Tabard",
+        "hud.bag.shoulders": "Shoulders",
+        "hud.bag.chest": "Chest",
+        "hud.bag.hands": "Hands",
+        "hud.bag.lantern": "Lantern",
+        "hud.bag.belt": "Belt",
+        "hud.bag.ring": "Ring",
+        "hud.bag.back": "Back",
+        "hud.bag.legs": "Legs",
+        "hud.bag.feet": "Feet",
+        "hud.bag.mainhand": "Mainhand",
+        "hud.bag.offhand": "Offhand",    
+
 
         // Map and Questlog
         "hud.map.map_title": "Map",
@@ -228,13 +240,13 @@ Enjoy your stay in the World of Veloren."#,
         "hud.settings.values": "Values",
         "hud.settings.percentages": "Percentages",
         "hud.settings.chat": "Chat",
-        "hud.settings.background_transparency": "Background Transparency",
-        "hud.settings.none": "None",
+        "hud.settings.background_transparency": "Background Transparency",        
 
         "hud.settings.pan_sensitivity": "Pan Sensitivity",
         "hud.settings.zoom_sensitivity": "Zoom Sensitivity",
         "hud.settings.invert_scroll_zoom": "Invert Scroll Zoom",
         "hud.settings.invert_mouse_y_axis": "Invert Mouse Y Axis",
+        "hud.settings.enable_mouse_smoothing": "Camera Smoothing",
         "hud.settings.free_look_behavior": "Free look behavior",
 
         "hud.settings.view_distance": "View Distance",
@@ -254,90 +266,7 @@ Enjoy your stay in the World of Veloren."#,
         "hud.settings.sound_effect_volume": "Sound Effects Volume",
         "hud.settings.audio_device": "Audio Device",
 
-        // Control list
-        "hud.settings.control_names": r#"Free Cursor
-Toggle Help Window
-Toggle Interface
-Toggle FPS and Debug Info
-Take Screenshot
-Toggle Nametags
-Toggle Fullscreen
-
-
-Move Forward
-Move Left
-Move Right
-Move Backwards
-
-Jump
-
-Glider
-
-Dodge
-
-Roll
-
-Climb
-
-Climb down
-
-Auto Walk
-
-Sheathe/Draw Weapons
-
-Put on/Remove Helmet
-
-Sit
-
-Mount
-
-Interact
-
-
-Basic Attack
-Secondary Attack/Block/Aim
-
-
-Skillbar Slot 1
-Skillbar Slot 2
-Skillbar Slot 3
-Skillbar Slot 4
-Skillbar Slot 5
-Skillbar Slot 6
-Skillbar Slot 7
-Skillbar Slot 8
-Skillbar Slot 9
-Skillbar Slot 10
-
-
-Pause Menu
-Settings
-Social
-Map
-Spellbook
-Character
-Questlog
-Bag
-
-
-
-Send Chat Message
-Scroll Chat
-
-
-Free look
-
-
-Chat commands:  
-
-/alias [Name] - Change your Chat Name   
-/tp [Name] - Teleports you to another player    
-/jump <dx> <dy> <dz> - Offset your position
-/goto <x> <y> <z> - Teleport to a position  
-/kill - Kill yourself   
-/pig - Spawn pig NPC    
-/wolf - Spawn wolf NPC  
-/help - Display chat commands"#,
+        "hud.settings.awaitingkey": "Press a key...",
 
         "hud.social": "Social",
         "hud.social.online": "Online",
@@ -348,10 +277,62 @@ Chat commands:
 
         "hud.spell": "Spell",
 
-        "hud.free_look_indicator": "Free look active",
+        "hud.free_look_indicator": "Free look active",       
+
         /// End HUD section
 
 
+        /// Start GameInput section
+
+        "gameinput.primary": "Basic Attack",
+        "gameinput.secondary": "Secondary Attack/Block/Aim",
+       "gameinput.slot1": "Hotbar Slot 1",        
+        "gameinput.slot2": "Hotbar Slot 2",
+        "gameinput.slot3": "Hotbar Slot 3",
+        "gameinput.slot4": "Hotbar Slot 4",
+        "gameinput.slot5": "Hotbar Slot 5",
+        "gameinput.slot6": "Hotbar Slot 6",
+        "gameinput.slot7": "Hotbar Slot 7",
+        "gameinput.slot8": "Hotbar Slot 8",
+        "gameinput.slot9": "Hotbar Slot 9",
+        "gameinput.slot10": "Hotbar Slot 10",
+        "gameinput.swaploadout": "Swap Loadout",
+        "gameinput.togglecursor": "Toggle Cursor",
+        "gameinput.help": "Toggle Help Window",
+        "gameinput.toggleinterface": "Toggle Interface",
+        "gameinput.toggledebug": "Toggle FPS and Debug Info",
+        "gameinput.screenshot": "Take Screenshot",
+        "gameinput.toggleingameui": "Toggle Nametags",
+        "gameinput.fullscreen": "Toggle Fullscreen",
+        "gameinput.moveforward": "Move Forward",
+        "gameinput.moveleft": "Move Left",
+        "gameinput.moveright": "Move Right",
+        "gameinput.moveback": "Move Backwards",
+        "gameinput.jump": "Jump",
+        "gameinput.glide": "Glider",
+        "gameinput.roll": "Roll",
+        "gameinput.climb": "Climb",
+        "gameinput.climbdown": "Climb Down",
+        "gameinput.wallleap": "Wall Leap",
+        "gameinput.mount": "Mount",
+        "gameinput.enter": "Enter",
+        "gameinput.command": "Command",
+        "gameinput.escape": "Escape",
+        "gameinput.map": "Map",
+        "gameinput.bag": "Bag",
+        "gameinput.social": "Social",
+        "gameinput.sit": "Sit",
+        "gameinput.spellbook": "Spells",
+        "gameinput.settings": "Settings",
+        "gameinput.respawn": "Respawn",
+        "gameinput.charge": "Charge",
+        "gameinput.togglewield": "Toggle Wield",
+        "gameinput.interact": "Interact",
+        "gameinput.freelook": "Free Look",
+        
+        /// End GameInput section
+
+
         /// Start chracter selection section
         "char_selection.delete_permanently": "Permanently delete this Character?",
         "char_selection.change_server": "Change Server",

assets/voxygen/item_image_manifest.ron

@@ -54,12 +54,31 @@
         "voxel.weapon.shield.wood-0",
         (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
     ),
+    // Lanterns
+    Lantern(Black0): Png(
+        "element.icons.lantern_black-0",        
+    ),
+    Lantern(Green0): Png(
+        "element.icons.lantern_green-0",        
+    ),
     // Other
     Utility(Collar): Png(
         "element.icons.collar",
-    ),
-    
+    ),    
     // Armor
+    // Starter Parts
+    Armor(Foot(Sandal0)): VoxTrans(
+        "voxel.armor.foot.cloth_sandals",
+        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+    ),
+    Armor(Pants(Rugged0)): VoxTrans(
+        "voxel.armor.pants.rugged-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Chest(Rugged0)): VoxTrans(
+        "voxel.armor.chest.rugged-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
     // Assassin Set
     Armor(Chest(Assassin)): VoxTrans(
         "voxel.armor.chest.assa",
@@ -222,10 +241,44 @@
         "voxel.armor.shoulder.cloth_purple_right-0",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
+    // Backs
+    Armor(Back(Short0)): VoxTrans(
+        "voxel.armor.back.short-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    Armor(Back(Admin)): VoxTrans(
+        "voxel.armor.back.admin",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    // Rings
+    Armor(Ring(Ring0)): Png(
+        "element.icons.ring-0",        
+    ),
+    // Necks
+    Armor(Neck(Neck0)): Png(
+        "element.icons.neck-0",        
+    ),
+    // Tabards
+    Armor(Tabard(Admin)): Png(
+        "element.icons.tabard_admin",        
+    ),
+    // Heads
+    Armor(Head(Leather0)): VoxTrans(
+        "voxel.armor.head.leather-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    Armor(Head(AssaMask0)): VoxTrans(
+        "voxel.armor.head.assa_mask-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
     // Consumables
-    Consumable(Apple): VoxTrans(
+    Consumable(Apple):
+    VoxTrans(
         "element.icons.item_apple",
         (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 1.0,
+    ),    
+    Consumable(Coconut): Png(
+        "element.icons.item_coconut",
     ),
     Consumable(PotionMinor): VoxTrans(
         "voxel.object.potion_red",

assets/voxygen/net.veloren.veloren.appdata.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2019 Artem Polishchuk <ego.cordatus@gmail.com> -->
-<component type="desktop-application">
-    <id>net.veloren.veloren.desktop</id>
-    <metadata_license>CC0-1.0</metadata_license>
-    <project_license>GPL-3.0-or-later</project_license>
-    <content_rating type="oars-1.0">
-        <content_attribute id="social-chat">intense</content_attribute>
-        <content_attribute id="social-info">mild</content_attribute>
-        <content_attribute id="violence-cartoon">mild</content_attribute>
-        <content_attribute id="violence-fantasy">mild</content_attribute>
-    </content_rating>
-    <name>Veloren</name>
-    <summary>
-        Veloren is a multiplayer voxel RPG written in Rust. It is inspired
-        by games such as Cube World, Legend of Zelda: Breath of the Wild,
-        Dwarf Fortress and Minecraft.
-    </summary>
-    <description>
-        <p>
-            Welcome To Veloren!
-        </p><p>
-            Veloren is a multiplayer voxel RPG written in Rust. Veloren takes
-            inspiration from games such as Cube World, Minecraft and Dwarf
-            Fortress. The game is currently under heavy development, but is
-            playable.
-        </p><p>
-            Development
-        </p><p>
-            Currently the communication of contributors happens mainly on our
-            official Discord server (https://discord.gg/kjwJwjK). You can join
-            it to keep up with the development, talk to us or contribute
-            something yourself. Anyone who shows genuine effort to help is
-            welcome in our team. You don't have to know how to program to
-            contribute!
-        </p>
-    </description>
-    <screenshots>
-        <screenshot type="default">
-            <image>https://media.discordapp.net/attachments/634860358623821835/643034796548947968/screenshot_1573381825305.png</image>
-        </screenshot>
-        <screenshot>
-            <image>https://media.discordapp.net/attachments/597826574095613962/643102462781423616/screenshot_1573397958545.png</image>
-        </screenshot>
-        <screenshot>
-            <image>https://cdn.discordapp.com/attachments/634860358623821835/646518917577310219/screenshot_1574211401431.png</image>
-        </screenshot>
-    </screenshots>
-    <keywords>
-        <keyword>sandbox</keyword>
-        <keyword>world</keyword>
-        <keyword>multiplayer</keyword>
-    </keywords>
-    <url type="homepage">https://veloren.net</url>
-    <url type="bugtracker">https://gitlab.com/veloren/veloren/issues</url>
-    <url type="faq">https://gitlab.com/veloren/veloren#faq</url>
-    <url type="help">https://book.veloren.net/</url>
-    <provides>
-        <binary>veloren-voxygen</binary>
-    </provides>
-</component>

assets/voxygen/net.veloren.veloren.desktop

@@ -5,5 +5,5 @@ Comment=Veloren is a multiplayer voxel RPG written in Rust
 Exec=veloren-voxygen
 Categories=Game;Simulation;
 Keywords=veloren;sandbox;world;blocks;nodes;multiplayer;roleplaying;
-Icon=net.veloren.veloren.png
+Icon=net.veloren.veloren
 Terminal=false