Merge branch 'pfau/alpha-disclaimer' into 'master'

Pfau/alpha disclaimer

See merge request veloren/veloren!1109

.gitignore

@@ -1,7 +1,5 @@
 # Rust
-
+target
-/target/
-/*/target/
 
 # Vim
 

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added weapon/attack sound effects
 - M2 attack for bow
 - Hotbar persistence.
+- Alpha version Disclaimer
 
 ### Changed
 
@@ -43,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 - Wield requirement to swap loadout; fixes issue with unable swap loadout outside of combat.
+- Disclaimer wall of text on first startup
 
 ## [0.6.0] - 2020-05-16
 

voxygen/src/hud/mod.rs

@@ -129,8 +129,8 @@ widget_ids! {
         intro_check,
         intro_check_text,
 
-        // Test
+        // Alpha Disclaimer
-        bag_space_add,
+        alpha_text,
 
         // Debug
         debug_bg,
@@ -622,6 +622,14 @@ impl Hud {
                         .color(Some(Color::Rgba(1.0, 1.0, 1.0, hurt_fade)))
                         .set(self.ids.hurt_bg, ui_widgets);
                 }
+                // Alpha Disclaimer
+                Text::new(&format!("Veloren Pre-Alpha {}", env!("CARGO_PKG_VERSION")))
+                    .font_id(self.fonts.cyri.conrod_id)
+                    .font_size(self.fonts.cyri.scale(10))
+                    .color(TEXT_COLOR)
+                    .mid_top_with_margin_on(ui_widgets.window, 2.0)
+                    .set(self.ids.alpha_text, ui_widgets);
+
                 // Death Frame
                 if stats.is_dead {
                     Image::new(self.imgs.death_bg)

voxygen/src/menu/char_selection/ui.rs

@@ -70,6 +70,9 @@ widget_ids! {
         deleting_character_text,
         character_error_message,
 
+        //Alpha Disclaimer
+        alpha_text,
+
         // REMOVE THIS AFTER IMPLEMENTATION
         daggers_grey,
         axe_grey,
@@ -704,6 +707,13 @@ impl CharSelectionUi {
                     .font_id(self.fonts.cyri.conrod_id)
                     .color(TEXT_COLOR)
                     .set(self.ids.version, ui_widgets);
+                // Alpha Disclaimer
+                Text::new(&format!("Veloren Pre-Alpha {}", env!("CARGO_PKG_VERSION")))
+                    .font_id(self.fonts.cyri.conrod_id)
+                    .font_size(self.fonts.cyri.scale(10))
+                    .color(TEXT_COLOR)
+                    .mid_top_with_margin_on(ui_widgets.window, 2.0)
+                    .set(self.ids.alpha_text, ui_widgets);
 
                 // Resize character selection widgets
                 self.ids

voxygen/src/menu/main/mod.rs

@@ -205,9 +205,9 @@ impl PlayState for MainMenuState {
                     },
                     MainMenuEvent::Settings => {}, // TODO
                     MainMenuEvent::Quit => return PlayStateResult::Shutdown,
-                    MainMenuEvent::DisclaimerClosed => {
+                    /*MainMenuEvent::DisclaimerClosed => {
                         global_state.settings.show_disclaimer = false
-                    },
+                    },*/
                     MainMenuEvent::AuthServerTrust(auth_server, trust) => {
                         if trust {
                             global_state

voxygen/src/menu/main/ui.rs

@@ -32,14 +32,15 @@ widget_ids! {
         bg,
         v_logo,
         alpha_version,
+        alpha_text,
         banner,
         banner_top,
         // Disclaimer
-        disc_window,
+        //disc_window,
-        disc_text_1,
+        //disc_text_1,
-        disc_text_2,
+        //disc_text_2,
-        disc_button,
+        //disc_button,
-        disc_scrollbar,
+        //disc_scrollbar,
         // Login, Singleplayer
         login_button,
         login_text,
@@ -87,9 +88,6 @@ image_ids! {
 
         info_frame: "voxygen.element.frames.info_frame_2",
 
-
-
-
         <ImageGraphic>
         bg: "voxygen.background.bg_main",
         banner_top: "voxygen.element.frames.banner_top",
@@ -99,8 +97,7 @@ image_ids! {
         button_hover: "voxygen.element.buttons.button_hover",
         button_press: "voxygen.element.buttons.button_press",
         input_bg: "voxygen.element.misc_bg.textbox_mid",
-        disclaimer: "voxygen.element.frames.disclaimer",
+        //disclaimer: "voxygen.element.frames.disclaimer",
-
 
 
         <BlankGraphic>
@@ -129,7 +126,7 @@ pub enum Event {
     StartSingleplayer,
     Quit,
     Settings,
-    DisclaimerClosed,
+    //DisclaimerClosed,
     AuthServerTrust(String, bool),
 }
 
@@ -156,7 +153,7 @@ pub struct MainMenuUi {
     connecting: Option<std::time::Instant>,
     connect: bool,
     show_servers: bool,
-    show_disclaimer: bool,
+    //show_disclaimer: bool,
     time: f32,
     bg_img_id: conrod_core::image::Id,
     voxygen_i18n: std::sync::Arc<VoxygenLocalization>,
@@ -224,7 +221,7 @@ impl MainMenuUi {
             show_servers: false,
             connect: false,
             time: 0.0,
-            show_disclaimer: global_state.settings.show_disclaimer,
+            //show_disclaimer: global_state.settings.show_disclaimer,
             bg_img_id,
             voxygen_i18n,
             fonts,
@@ -285,7 +282,13 @@ impl MainMenuUi {
             .font_id(self.fonts.cyri.conrod_id)
             .font_size(self.fonts.cyri.scale(14))
             .set(self.ids.version, ui_widgets);
-
+        // Alpha Disclaimer
+        Text::new(&format!("Veloren Pre-Alpha {}", env!("CARGO_PKG_VERSION")))
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(10))
+            .color(TEXT_COLOR)
+            .mid_top_with_margin_on(ui_widgets.window, 2.0)
+            .set(self.ids.alpha_text, ui_widgets);
         // Popup (Error/Info/AuthTrustPrompt)
         let mut change_popup = None;
         if let Some(PopupData { msg, popup_type }) = &self.popup {
@@ -423,7 +426,7 @@ impl MainMenuUi {
                 .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.95)))
                 .set(self.ids.v_logo, ui_widgets);
 
-            if self.show_disclaimer {
+            /*if self.show_disclaimer {
                 Image::new(self.imgs.disclaimer)
                     .w_h(1800.0, 800.0)
                     .middle_of(ui_widgets.window)
@@ -459,7 +462,7 @@ impl MainMenuUi {
                     self.show_disclaimer = false;
                     events.push(Event::DisclaimerClosed);
                 }
-            } else {
+            } else {*/
             // TODO: Don't use macros for this?
             // Input fields
             // Used when the login button is pressed, or enter is pressed within input field
@@ -763,7 +766,6 @@ impl MainMenuUi {
                 self.show_servers = !self.show_servers;
             };
         }
-        }
 
         events
     }