Commit 711afad2 authored by Kegan's avatar Kegan

Merge branch '84-update-br-for-1-0' into 'staging'

Resolve "Update BR for 1.0"

See merge request DayZ/BattleRoyale!60
parents 413ea35c c1050c7b
......@@ -35,7 +35,7 @@ class CfgMods
/*
class imageSets
{
files[]={"fmdbr/gui/imagesets/dayzbr_gui.imageset"};
files[]={"dayzbr/gui/imagesets/dayzbr_gui.imageset"};
};
*/
......
This diff is collapsed.
......@@ -856,7 +856,7 @@ FrameWidgetClass main_menu_root {
hexactsize 1
vexactsize 1
style Normal
text "layout_xbox_trial_main_header_newsfeed_text1"
text "#layout_xbox_trial_main_header_newsfeed_text1"
font "gui/fonts/sdf_MetronLight24"
"exact text" 0
"text halign" center
......@@ -1167,12 +1167,12 @@ FrameWidgetClass main_menu_root {
visible 1
ignorepointer 1
position 0.05 130
size 0.2 400
size 400 400
halign right_ref
valign bottom_ref
hexactpos 0
vexactpos 1
hexactsize 0
hexactsize 1
vexactsize 1
priority 3
Padding 10
......@@ -1227,7 +1227,7 @@ FrameWidgetClass main_menu_root {
}
WrapSpacerWidgetClass top {
ignorepointer 1
color 0 0 0 0.7843
color 0 0 0 0.4314
position 0 0
size 1 48
hexactpos 1
......@@ -1502,15 +1502,16 @@ FrameWidgetClass main_menu_root {
}
}
ButtonWidgetClass message_button {
visible 0
visible 1
color 1 1 1 0
position 0.5 0
size 0.25 0.25
size 45 33
halign right_ref
valign center_ref
hexactpos 0
vexactpos 1
hexactsize 0
vexactsize 0
hexactsize 1
vexactsize 1
fixaspect inside
style Empty
"no focus" 1
......@@ -1521,14 +1522,14 @@ FrameWidgetClass main_menu_root {
{
ImageWidgetClass message_button_image {
ignorepointer 1
size 0.9 0.9
size 1 1
halign center_ref
valign center_ref
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 0
image0 "set:dayz_gui image:icon_feedback"
image0 "set:dayz_gui image:credits"
mode blend
"src alpha" 1
}
......@@ -1537,12 +1538,13 @@ FrameWidgetClass main_menu_root {
ButtonWidgetClass settings_button {
color 1 1 1 0
position 0.25 0
size 0.25 0.25
size 37 37
halign right_ref
valign center_ref
hexactpos 0
vexactpos 1
hexactsize 0
vexactsize 0
hexactsize 1
vexactsize 1
fixaspect inside
style Empty
"no focus" 0
......@@ -1555,14 +1557,14 @@ FrameWidgetClass main_menu_root {
{
ImageWidgetClass settings_button_image {
ignorepointer 1
size 1.5 1.5
size 1 1
halign center_ref
valign center_ref
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 0
image0 "set:ccgui_enforce image:HudRepair"
image0 "set:dayz_gui image:settings"
mode blend
"src alpha" 1
}
......@@ -1570,12 +1572,13 @@ FrameWidgetClass main_menu_root {
}
ButtonWidgetClass exit_button {
color 1 1 1 0
size 0.25 0.25
size 37 37
halign right_ref
valign center_ref
hexactpos 0
vexactpos 1
hexactsize 0
vexactsize 0
hexactsize 1
vexactsize 1
fixaspect inside
style Empty
"no focus" 0
......@@ -1595,10 +1598,9 @@ FrameWidgetClass main_menu_root {
vexactpos 1
hexactsize 0
vexactsize 0
image0 "set:ccgui_enforce image:IconHealth"
image0 "set:dayz_gui image:exit"
mode blend
"src alpha" 1
rotation 0 0 45
}
}
}
......@@ -1656,7 +1658,6 @@ FrameWidgetClass main_menu_root {
}
ButtonWidgetClass character_stats_open {
visible 0
disabled 0
color 0 0 0 0.8627
position 0 340
size 36 36
......@@ -1769,7 +1770,7 @@ FrameWidgetClass main_menu_root {
{
WrapSpacerWidgetClass ConsoleToolbar {
visible 1
clipchildren 1
clipchildren 0
position 0.05 0.1
size 0.45 0.45
halign right_ref
......@@ -1787,19 +1788,20 @@ FrameWidgetClass main_menu_root {
content_valign center
{
GridSpacerWidgetClass Select {
size 120 1
clipchildren 0
position -0.00001 0
size 0 30
halign right_ref
valign bottom_ref
hexactpos 1
vexactpos 1
hexactsize 1
vexactsize 0
priority 3
vexactsize 1
priority 1
Padding 4
Margin 0
"Size To Content H" 1
"Size To Content V" 1
content_halign center
content_valign center
Columns 2
Rows 1
......@@ -1808,7 +1810,6 @@ FrameWidgetClass main_menu_root {
clipchildren 0
inheritalpha 0
size 36 36
valign center_ref
hexactpos 1
vexactpos 1
hexactsize 1
......@@ -1825,28 +1826,33 @@ FrameWidgetClass main_menu_root {
nocache 0
}
TextWidgetClass SelectText {
position 40 0
size 80 22
valign center_ref
clipchildren 0
size 80 36
hexactpos 1
vexactpos 1
hexactsize 1
vexactsize 1
text "#layout_xbox_main_menu_toolbar_select"
font "gui/fonts/sdf_MetronLight24"
"exact text" 1
"exact text size" 22
"size to text h" 1
"size to text v" 0
"text halign" center
"text valign" center
}
}
}
GridSpacerWidgetClass Back {
size 86 1
visible 1
clipchildren 0
size 0 30
halign right_ref
valign bottom_ref
hexactpos 1
vexactpos 1
hexactsize 1
vexactsize 0
vexactsize 1
Padding 4
Margin 0
"Size To Content H" 1
......@@ -1877,8 +1883,9 @@ FrameWidgetClass main_menu_root {
nocache 0
}
TextWidgetClass BackText {
position 40 0
size 52 22
clipchildren 0
position 0 0
size 52 36
valign center_ref
hexactpos 1
vexactpos 1
......@@ -1886,6 +1893,72 @@ FrameWidgetClass main_menu_root {
vexactsize 1
text "#layout_xbox_main_menu_toolbar_back"
font "gui/fonts/sdf_MetronLight24"
"exact text" 1
"exact text size" 22
"size to text h" 1
"size to text v" 0
"text halign" center
"text valign" center
}
}
}
GridSpacerWidgetClass ChooseAccount {
visible 1
clipchildren 0
position -0.00002 0
size 0 30
halign right_ref
valign bottom_ref
hexactpos 1
vexactpos 1
hexactsize 1
vexactsize 1
priority 2
"no focus" 1
Padding 4
Margin 0
"Size To Content H" 1
"Size To Content V" 1
content_halign center
content_valign center
Columns 2
Rows 1
{
ImageWidgetClass ChooseAccountIcon {
clipchildren 0
inheritalpha 0
size 36 36
valign center_ref
hexactpos 1
vexactpos 1
hexactsize 1
vexactsize 1
scaled 1
image0 "set:xbox_buttons image:Y"
mode blend
"src alpha" 1
"no wrap" 1
stretch 0
"flip u" 0
"flip v" 0
filter 1
nocache 0
}
TextWidgetClass ChooseAccountText {
clipchildren 0
position 0 0
size 174 36
valign center_ref
hexactpos 1
vexactpos 1
hexactsize 1
vexactsize 1
text "Choose Account"
font "gui/fonts/sdf_MetronLight24"
"exact text" 1
"exact text size" 22
"size to text h" 1
"size to text v" 0
"text halign" center
"text valign" center
}
......
......@@ -142,7 +142,6 @@ class BattleRoyaleZone
start_area_size = 0;
max_playtime = 0;
start_player_count = 0;
MarkerSetup();
}
......@@ -221,8 +220,7 @@ class BattleRoyaleZone
return 0.0;
}
float CalculateMaxPlaytime(int start_player_count;
)
float CalculateMaxPlaytime(int start_player_count)
{
float min_playtime = m_BattleRoyaleData.shrink_min_playtime;
float max_playtime = m_BattleRoyaleData.shrink_max_playtime;
......
......@@ -34,21 +34,19 @@ modded class MainMenu
m_Stats = new MainMenuStats( layoutRoot.FindAnyWidget( "character_stats_root" ) );
m_Mission = MissionMainMenu.Cast( GetGame().GetMission() );
m_ScenePC = m_Mission.GetIntroScenePC();
if( m_ScenePC )
m_ScenePC.ResetIntroCamera();
m_PlayerName = TextWidget.Cast( layoutRoot.FindAnyWidget("character_name_text") );
Refresh();
string version;
GetGame().GetVersion( version );
version = "#main_menu_version" + " " + version;
m_Version.SetText( version );
GetGame().GetUIManager().ScreenFadeOut(0);
......@@ -56,6 +54,9 @@ modded class MainMenu
SetFocus( layoutRoot );
Refresh();
UpdateNewsFeed();
return layoutRoot;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment