Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aeronic/forest tune

Browse Source
This commit is contained in:
Monty Marz 2020-05-21 04:09:59 +00:00
parent 59f76e9fb5
commit a6569bc2ae
8 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
assets/voxygen/audio/soundtrack.ron
View File

@ -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,

BIN
assets/voxygen/audio/soundtrack/into_the_dark_forest.ogg Normal file
View File

Binary file not shown.

BIN
assets/voxygen/background/bg_16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 236 KiB

BIN
assets/voxygen/element/help.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

4
assets/voxygen/i18n/de_DE.ron
View File

@ -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,

2
assets/voxygen/i18n/en.ron
View File

@ -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!

8
voxygen/src/menu/char_selection/ui.rs
View File

@ -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(

1
voxygen/src/menu/main/ui.rs
View File

@ -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();