ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added error message type for skins, which is atm only used to display

Browse Source 
automatic login failures. Added Arthur's new icons for errors, and
friend+achievement icons for Ocean skin.
This commit is contained in:
hiker 2015-03-02 18:51:50 +11:00
parent 07116006a6
commit b21dafc12b
7 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/skins/Ocean.stkskin
View File

@ -76,6 +76,10 @@ when the border that intersect at this corner are enabled.
left_border="128" right_border="13" top_border="13" bottom_border="13" left_border="128" right_border="13" top_border="13" bottom_border="13"
preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/> preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
<element type="error-message" image="ocean/error.png"
left_border="128" right_border="13" top_border="13" bottom_border="13"
preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
<element type="button" state="neutral" image="ocean/glassbutton.png" <element type="button" state="neutral" image="ocean/glassbutton.png"
left_border="13" right_border="13" top_border="13" bottom_border="13" left_border="13" right_border="13" top_border="13" bottom_border="13"
preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/> preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>

4
data/skins/Peach.stkskin
View File

@ -76,6 +76,10 @@ when the border that intersect at this corner are enabled.
left_border="128" right_border="13" top_border="13" bottom_border="13" left_border="128" right_border="13" top_border="13" bottom_border="13"
preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/> preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
<element type="error-message" image="peach/error.png"
left_border="128" right_border="13" top_border="13" bottom_border="13"
preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>
<element type="button" state="neutral" image="peach/glassbutton.png" <element type="button" state="neutral" image="peach/glassbutton.png"
left_border="13" right_border="13" top_border="13" bottom_border="13" left_border="13" right_border="13" top_border="13" bottom_border="13"
preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/> preserve_h_aspect_ratios="true" hborder_out_portion="0" vborder_out_portion="0"/>

BIN
data/skins/ocean/achievement.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 27 KiB

BIN
data/skins/ocean/error.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
data/skins/ocean/friend.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
data/skins/peach/error.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

2
src/guiengine/message_queue.cpp
View File

@ -53,7 +53,7 @@ public:
if(mt==MessageQueue::MT_ACHIEVEMENT) if(mt==MessageQueue::MT_ACHIEVEMENT)
m_render_type = "achievement-message::neutral"; m_render_type = "achievement-message::neutral";
else if (mt==MessageQueue::MT_ERROR) else if (mt==MessageQueue::MT_ERROR)
m_render_type = "achievement-message::neutral"; m_render_type = "error-message::neutral";
else else
m_render_type = "friend-message::neutral"; m_render_type = "friend-message::neutral";
} // Message } // Message