Merge branch 'aeronic/forest-tune' into 'master'

Aeronic/forest tune

See merge request veloren/veloren!1008

assets/voxygen/audio/soundtrack.ron

@@ -2,6 +2,13 @@
 
 (
     tracks: [
+        (
+            title: "Into The Dark Forest",
+            path: "voxygen.audio.soundtrack.into_the_dark_forest",
+            length: 184.0,
+            timing: Some(Night),
+            artist: "Aeronic",
+        ),
         (
             title: "Field Grazing",
             path: "voxygen.audio.soundtrack.field_grazing",
@@ -17,7 +24,7 @@
             artist: "Aeronic",
         ),
         /*(
-            title: "Snowtop Volume",
+            title: "Snowtop Volume", //Snow Region 
             path: "voxygen.audio.soundtrack.snowtop_volume",
             length: 89.0,
             timing: Some(Day),
@@ -45,7 +52,7 @@
             artist: "Aeronic",
         ),
         /*(
-            title: "Rest Assured",
+            title: "Rest Assured", // Town/Shop 
             path: "voxygen.audio.soundtrack.rest_assured",
             length: 185.0,
             timing: Some(Day),
@@ -72,7 +79,7 @@
             timing: Some(Night),
             artist: "badbbad",
         ),
-        /*(
+        /*(  // Dungeon 
             title: "Down The Rabbit Hole",
             path: "voxygen.audio.soundtrack.down_the_rabbit_hole",
             length: 244.0,

assets/voxygen/audio/soundtrack/into_the_dark_forest.ogg

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2bd2524122e4067b2e3ef2471e2233c1f21e2ed16a468ebcf3f45a9a6ba55a89
+size 10383401

assets/voxygen/background/bg_16.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bcc674272dad537d27c983f0863c5fe940dff8e29a393f3956996b71a970cc50
+size 242212

assets/voxygen/element/help.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b9f41be9c1e49a2dfa1be3565a0c18d30ee4f7ab8ad2c879b8fa461c845699b
-size 14795
+oid sha256:fd8a1c6da8bcacbcfe15a806115821676d1f60d522b8adb9af65a495ee06bd31
+size 15438

assets/voxygen/i18n/de_DE.ron

@@ -175,7 +175,7 @@ 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.
+Doppelklickt den Gegenstand in eurer Tasche, um diesen zu nutzen.
 
 Um Items wegzuwerfen klickt sie einmal im Inventar an 
 
@@ -184,7 +184,7 @@ 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.
+Drückt 'G' um eure Laterne einzuschalten.
 
 
 Ihr wollt endlich spielen und dafür euren Cursor befreien,

assets/voxygen/i18n/en.ron

@@ -182,7 +182,7 @@ Throw them away by clicking them once and clicking outside of the bag
 
 Nights can get pretty dark in Veloren.
 
-Equip your lantern and light it by pressing G.
+Light your lantern by pressing 'G'
 
 
 Want to free your cursor to close this window? Press TAB!

voxygen/src/menu/char_selection/ui.rs

@@ -894,19 +894,19 @@ impl CharSelectionUi {
                 let create_button = Button::image(self.imgs.button)
                     .bottom_right_with_margins_on(ui_widgets.window, 10.0, 10.0)
                     .w_h(150.0, 40.0)
-                    .hover_image(if *name != "Character Name" {
+                    .hover_image(if *name != "Character Name" && *name != "" {
                         self.imgs.button_hover
                     } else {
                         self.imgs.button
                     })
-                    .press_image(if *name != "Character Name" {
+                    .press_image(if *name != "Character Name" && *name != "" {
                         self.imgs.button_press
                     } else {
                         self.imgs.button
                     })
                     .label(&self.voxygen_i18n.get("common.create"))
                     .label_font_id(self.fonts.cyri.conrod_id)
-                    .label_color(if *name != "Character Name" {
+                    .label_color(if *name != "Character Name" && *name != "" {
                         TEXT_COLOR
                     } else {
                         TEXT_COLOR_2
@@ -914,7 +914,7 @@ impl CharSelectionUi {
                     .label_font_size(self.fonts.cyri.scale(20))
                     .label_y(conrod_core::position::Relative::Scalar(3.0));
 
-                if *name == "Character Name" {
+                if *name == "Character Name" || *name == "" {
                     //TODO: We need a server side list of disallowed names and certain naming rules
                     if create_button
                         .with_tooltip(

voxygen/src/menu/main/ui.rs

@@ -183,6 +183,7 @@ impl MainMenuUi {
             "voxygen.background.bg_13",
             "voxygen.background.bg_14",
             "voxygen.background.bg_15",
+            "voxygen.background.bg_16",
         ];
         let mut rng = thread_rng();