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

Clean icon name (Improve PR#4073) (#4081)

Browse Source 
* fix icon names

* add file mode_weapon.png
This commit is contained in:
riso 2019-10-05 12:14:09 -05:00 committed by Benau
parent 4a3dfd975f
commit 657e02efe4
12 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/gui/dialogs/online/server_configuration_dialog.stkgui
View File

@ -25,7 +25,7 @@
I18N="Multiplayer game mode" text="Normal Race"/> I18N="Multiplayer game mode" text="Normal Race"/>
<icon-button id="timetrial" width="128" height="128" icon="gui/icons/mode_tt.png" <icon-button id="timetrial" width="128" height="128" icon="gui/icons/mode_tt.png"
I18N="Multiplayer game mode" text="Time Trial"/> I18N="Multiplayer game mode" text="Time Trial"/>
<icon-button id="3strikes" width="128" height="128" icon="gui/icons/weapons.png" <icon-button id="3strikes" width="128" height="128" icon="gui/icons/mode_weapons.png"
I18N="Multiplayer game mode" text="Battle"/> I18N="Multiplayer game mode" text="Battle"/>
<icon-button id="soccer" width="128" height="128" icon="gui/icons/mode_soccer.png" <icon-button id="soccer" width="128" height="128" icon="gui/icons/mode_soccer.png"
I18N="Multiplayer game mode" text="Soccer"/> I18N="Multiplayer game mode" text="Soccer"/>

0
data/gui/icons/weapons.png → data/gui/icons/mode_weapons.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

2
data/gui/screens/grand_prix_editor.stkgui
View File

@ -34,7 +34,7 @@
I18N="Menu item" text="New" /> I18N="Menu item" text="New" />
<icon-button id="copy" width="128" height="128" icon="gui/icons/gp_copy.png" <icon-button id="copy" width="128" height="128" icon="gui/icons/gp_copy.png"
I18N="Menu item" text="Copy" /> I18N="Menu item" text="Copy" />
<icon-button id="edit" width="128" height="128" icon="gui/icons/edit.png" <icon-button id="edit" width="128" height="128" icon="gui/icons/gp_edit.png"
I18N="Menu item" text="Edit" /> I18N="Menu item" text="Edit" />
<icon-button id="remove" width="128" height="128" icon="gui/icons/gp_remove.png" <icon-button id="remove" width="128" height="128" icon="gui/icons/gp_remove.png"
I18N="Menu item" text="Remove" /> I18N="Menu item" text="Remove" />

4
data/gui/screens/help2.stkgui
View File

@ -8,7 +8,7 @@
<div width="100%" height="92%" layout="horizontal-row" > <div width="100%" height="92%" layout="horizontal-row" >
<vertical-tabs id="category" height="100%" width="18%"> <vertical-tabs id="category" height="100%" width="18%">
<icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png" <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
I18N="Tab in help menu" text="General"/> I18N="Tab in help menu" text="General"/>
<icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png" <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
I18N="Tab in help menu" text="Game Modes"/> I18N="Tab in help menu" text="Game Modes"/>
@ -56,7 +56,7 @@
</div> </div>
<div width="100%" proportion="2" layout="horizontal-row"> <div width="100%" proportion="2" layout="horizontal-row">
<icon align="center" width="64" height="64" icon="gui/icons/mode_3strikes.png"/> <icon align="center" width="64" height="64" icon="gui/icons/mode_weapons.png"/>
<spacer width="25" height="25"/> <spacer width="25" height="25"/>
<bubble proportion="1" height="100%" <bubble proportion="1" height="100%"
I18N="In the help menu" I18N="In the help menu"

2
data/gui/screens/help3.stkgui
View File

@ -8,7 +8,7 @@
<div width="100%" height="92%" layout="horizontal-row" > <div width="100%" height="92%" layout="horizontal-row" >
<vertical-tabs id="category" height="100%" width="18%"> <vertical-tabs id="category" height="100%" width="18%">
<icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png" <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
I18N="Tab in help menu" text="General"/> I18N="Tab in help menu" text="General"/>
<icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png" <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
I18N="Tab in help menu" text="Game Modes"/> I18N="Tab in help menu" text="Game Modes"/>

2
data/gui/screens/help4.stkgui
View File

@ -8,7 +8,7 @@
<div width="100%" height="92%" layout="horizontal-row" > <div width="100%" height="92%" layout="horizontal-row" >
<vertical-tabs id="category" height="100%" width="18%"> <vertical-tabs id="category" height="100%" width="18%">
<icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png" <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
I18N="Tab in help menu" text="General"/> I18N="Tab in help menu" text="General"/>
<icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png" <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
I18N="Tab in help menu" text="Game Modes"/> I18N="Tab in help menu" text="Game Modes"/>

2
data/gui/screens/help5.stkgui
View File

@ -8,7 +8,7 @@
<div width="100%" height="92%" layout="horizontal-row" > <div width="100%" height="92%" layout="horizontal-row" >
<vertical-tabs id="category" height="100%" width="18%"> <vertical-tabs id="category" height="100%" width="18%">
<icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png" <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
I18N="Tab in help menu" text="General"/> I18N="Tab in help menu" text="General"/>
<icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png" <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
I18N="Tab in help menu" text="Game Modes"/> I18N="Tab in help menu" text="Game Modes"/>

2
data/gui/screens/help6.stkgui
View File

@ -8,7 +8,7 @@
<div width="100%" height="92%" layout="horizontal-row" > <div width="100%" height="92%" layout="horizontal-row" >
<vertical-tabs id="category" height="100%" width="18%"> <vertical-tabs id="category" height="100%" width="18%">
<icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png" <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
I18N="Tab in help menu" text="General"/> I18N="Tab in help menu" text="General"/>
<icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png" <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
I18N="Tab in help menu" text="Game Modes"/> I18N="Tab in help menu" text="Game Modes"/>

2
data/gui/screens/help7.stkgui
View File

@ -8,7 +8,7 @@
<div width="100%" height="92%" layout="horizontal-row" > <div width="100%" height="92%" layout="horizontal-row" >
<vertical-tabs id="category" height="100%" width="18%"> <vertical-tabs id="category" height="100%" width="18%">
<icon-button id="page1" width="128" height="128" icon="gui/icons/track_random.png" <icon-button id="page1" width="128" height="128" icon="gui/icons/options_general.png"
I18N="Tab in help menu" text="General"/> I18N="Tab in help menu" text="General"/>
<icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png" <icon-button id="page2" width="128" height="128" icon="gui/icons/mode_ftl.png"
I18N="Tab in help menu" text="Game Modes"/> I18N="Tab in help menu" text="Game Modes"/>

2
data/gui/screens/online/create_server.stkgui
View File

@ -42,7 +42,7 @@
I18N="Multiplayer game mode" text="Normal Race"/> I18N="Multiplayer game mode" text="Normal Race"/>
<icon-button id="timetrial" width="128" height="128" icon="gui/icons/mode_tt.png" <icon-button id="timetrial" width="128" height="128" icon="gui/icons/mode_tt.png"
I18N="Multiplayer game mode" text="Time Trial"/> I18N="Multiplayer game mode" text="Time Trial"/>
<icon-button id="3strikes" width="128" height="128" icon="gui/icons/weapons.png" <icon-button id="3strikes" width="128" height="128" icon="gui/icons/mode_weapons.png"
I18N="Multiplayer game mode" text="Battle"/> I18N="Multiplayer game mode" text="Battle"/>
<icon-button id="soccer" width="128" height="128" icon="gui/icons/mode_soccer.png" <icon-button id="soccer" width="128" height="128" icon="gui/icons/mode_soccer.png"
I18N="Multiplayer game mode" text="Soccer"/> I18N="Multiplayer game mode" text="Soccer"/>

4
src/race/race_manager.hpp
View File

@ -166,8 +166,8 @@ public:
case MINOR_MODE_TIME_TRIAL: return "/gui/icons/mode_tt.png"; case MINOR_MODE_TIME_TRIAL: return "/gui/icons/mode_tt.png";
case MINOR_MODE_FOLLOW_LEADER: return "/gui/icons/mode_ftl.png"; case MINOR_MODE_FOLLOW_LEADER: return "/gui/icons/mode_ftl.png";
case MINOR_MODE_3_STRIKES: return "/gui/icons/mode_3strikes.png"; case MINOR_MODE_3_STRIKES: return "/gui/icons/mode_3strikes.png";
case MINOR_MODE_FREE_FOR_ALL: return "/gui/icons/weapons.png"; case MINOR_MODE_FREE_FOR_ALL: return "/gui/icons/mode_weapons.png";
case MINOR_MODE_CAPTURE_THE_FLAG: return "/gui/icons/weapons.png"; case MINOR_MODE_CAPTURE_THE_FLAG: return "/gui/icons/mode_weapons.png";
case MINOR_MODE_EASTER_EGG: return "/gui/icons/mode_easter.png"; case MINOR_MODE_EASTER_EGG: return "/gui/icons/mode_easter.png";
case MINOR_MODE_SOCCER: return "/gui/icons/mode_soccer.png"; case MINOR_MODE_SOCCER: return "/gui/icons/mode_soccer.png";
default: assert(false); return NULL; default: assert(false); return NULL;

2
src/states_screens/race_gui.cpp
View File

@ -120,7 +120,7 @@ RaceGUI::RaceGUI()
m_blue_flag = irr_driver->getTexture(FileManager::GUI_ICON, "blue_flag.png"); m_blue_flag = irr_driver->getTexture(FileManager::GUI_ICON, "blue_flag.png");
m_soccer_ball = irr_driver->getTexture(FileManager::GUI_ICON, "soccer_ball_normal.png"); m_soccer_ball = irr_driver->getTexture(FileManager::GUI_ICON, "soccer_ball_normal.png");
m_heart_icon = irr_driver->getTexture(FileManager::GUI_ICON, "heart.png"); m_heart_icon = irr_driver->getTexture(FileManager::GUI_ICON, "heart.png");
m_champion = irr_driver->getTexture(FileManager::GUI_ICON, "gp_new.png"); m_champion = irr_driver->getTexture(FileManager::GUI_ICON, "cup_gold.png");
} // RaceGUI } // RaceGUI
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------