Skip to content

Commit

Permalink
* use "background" sprite for buttons and textentry
Browse files Browse the repository at this point in the history
* create sprites_tiled.ufo to define tiled sprites
* move some sprites into /pics/banks (cause we can now split them into single splites)
* remove some useless properties from scripts
  • Loading branch information
bayo committed Apr 29, 2012
1 parent 0781326 commit 3ad7136
Show file tree
Hide file tree
Showing 30 changed files with 177 additions and 128 deletions.
10 changes: 5 additions & 5 deletions LICENSES
Expand Up @@ -2694,6 +2694,11 @@ base/pics/background/stats_bg.jpg | GNU General Public License 2.0 or later | |
base/pics/background/wingame_bg.jpg | GNU General Public License 2.0 or later | | Based on original menu artwork by SparX and Rasta
base/pics/background/won_bg.jpg | GNU General Public License 2.0 or later | | Based on original menu artwork by SparX and Rasta
base/pics/background/world_bg.png | GNU General Public License 2.0 or later
base/pics/banks/button_blue.png | GNU General Public License 2.0 or later | | Based on original menu artwork by SparX and Rasta
base/pics/banks/button_geoscape.png | GNU General Public License 2.0 or later | bayo
base/pics/banks/button_green_big.png | GNU General Public License 2.0 or later | bayo
base/pics/banks/button_green_small.png | GNU General Public License 2.0 or later | bayo
base/pics/banks/button_green_verysmall.png | GNU General Public License 2.0 or later | bayo
base/pics/banks/pack1.png | GNU General Public License 2.0 or later | MCR | based on images from http://sourceforge.net/projects/openiconlibrary
base/pics/banks/pack2.png | GNU General Public License 2.0 or later | MCR | based on images from http://sourceforge.net/projects/openiconlibrary
base/pics/banks/pack_hud.png | GNU General Public License 2.0 or later
Expand Down Expand Up @@ -3803,11 +3808,6 @@ base/pics/ui/base_lr.png | GNU General Public License 2.0 or later | | Based on
base/pics/ui/base_ul.png | GNU General Public License 2.0 or later | | Based on original menu artwork by SparX and Rasta
base/pics/ui/base_ur.png | GNU General Public License 2.0 or later | | Based on original menu artwork by SparX and Rasta
base/pics/ui/button_big_menu.png | GNU General Public License 2.0 or later | | Based on original menu artwork by SparX and Rasta
base/pics/ui/button_blue.png | GNU General Public License 2.0 or later | | Based on original menu artwork by SparX and Rasta
base/pics/ui/button_geoscape.png | GNU General Public License 2.0 or later | bayo
base/pics/ui/button_green_big.png | GNU General Public License 2.0 or later | bayo
base/pics/ui/button_green_small.png | GNU General Public License 2.0 or later | bayo
base/pics/ui/button_green_verysmall.png | GNU General Public License 2.0 or later | bayo
base/pics/ui/button_square.png | GNU General Public License 2.0 or later | | Based on original menu artwork by SparX and Rasta
base/pics/ui/checkbox_blue.png | GNU General Public License 2.0 or later | MCR | Source: Based on original menu artwork by SparX and Rasta and images from http://sourceforge.net/projects/openiconlibrary
base/pics/ui/checkbox_green.png | GNU General Public License 2.0 or later | bayo;MCR | Source: Based on original menu artwork by SparX and Rasta and images from http://sourceforge.net/projects/openiconlibrary
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
51 changes: 51 additions & 0 deletions base/ufos/sprites_tiled.ufo
@@ -0,0 +1,51 @@
// Contains tiles sprites usually used to display node background

sprite ui/button_blue {
image "banks/button_blue"
tiled_17_1_3 true
size "64 64"
texl "0 0"
hoveredtexl "64 0"
disabledtexl "64 64"
clickedtexl "0 64"
}

sprite ui/button_geoscape {
image "banks/button_geoscape"
tiled_17_1_3 true
size "64 64"
texl "0 0"
hoveredtexl "64 0"
disabledtexl "64 64"
clickedtexl "0 64"
}

sprite ui/button_green_big {
image "banks/button_green_big"
tiled_17_1_3 true
size "64 64"
texl "0 0"
hoveredtexl "64 0"
disabledtexl "64 64"
clickedtexl "0 64"
}

sprite ui/button_green_small {
image "banks/button_green_small"
tiled_17_1_3 true
size "64 64"
texl "0 0"
hoveredtexl "64 0"
disabledtexl "64 64"
clickedtexl "0 64"
}

sprite ui/button_green_verysmall {
image "banks/button_green_verysmall"
tiled_17_1_3 true
size "64 64"
texl "0 0"
hoveredtexl "64 0"
disabledtexl "64 64"
clickedtexl "0 64"
}
34 changes: 17 additions & 17 deletions base/ufos/ui/_menu.ufo
Expand Up @@ -10,7 +10,7 @@
component button cmpMenuButton
{
size "256 64"
image "ui/button_green_big"
background "ui/button_green_big"
font "f_menubig"
color "0 0.5 0 1"
selectcolor "1 1 1 1"
Expand Down Expand Up @@ -72,7 +72,7 @@ component panel cmpMapSlot

textentry slot_map
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
string *cvar:mn_svmapname
selectcolor "1 1 1 1"
Expand Down Expand Up @@ -219,7 +219,7 @@ component button cmpPopupButton
color "0 0.5 0 1"
selectcolor "1 1 1 1"
font "f_menu"
image "ui/button_green_small"
background "ui/button_green_small"
size "176 32"
}

Expand Down Expand Up @@ -349,7 +349,7 @@ component panel cmpTeamPanel

button slot_team0
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CC
Expand All @@ -364,7 +364,7 @@ component panel cmpTeamPanel

button slot_team1
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CC
Expand All @@ -379,7 +379,7 @@ component panel cmpTeamPanel

button slot_team2
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CC
Expand All @@ -394,7 +394,7 @@ component panel cmpTeamPanel

button slot_team3
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CC
Expand All @@ -409,7 +409,7 @@ component panel cmpTeamPanel

button slot_team4
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CC
Expand All @@ -424,7 +424,7 @@ component panel cmpTeamPanel

button slot_team5
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CC
Expand All @@ -441,7 +441,7 @@ component panel cmpTeamPanel

button slot_team6
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CC
Expand All @@ -456,7 +456,7 @@ component panel cmpTeamPanel

button slot_team7
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CC
Expand All @@ -471,7 +471,7 @@ component panel cmpTeamPanel

button slot_team8
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CC
Expand All @@ -486,7 +486,7 @@ component panel cmpTeamPanel

button slot_team9
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CC
Expand All @@ -501,7 +501,7 @@ component panel cmpTeamPanel

button slot_team10
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CC
Expand All @@ -516,7 +516,7 @@ component panel cmpTeamPanel

button slot_team11
{
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CC
Expand All @@ -539,7 +539,7 @@ component panel cmpTeamPanel
size "200 40"
tooltip "_Generate a new random team"
onClick { cmd "game_autoteam;ui_push game_team_edit;" }
image "ui/button_green_small"
background "ui/button_green_small"
font "f_menusmall"
color "0 0.5 0 1"
selectcolor "1 1 1 1"
Expand All @@ -552,7 +552,7 @@ component panel cmpTeamPanel
size "200 40"
tooltip "_Save the current team"
onClick { cmd "ui_push game_team_save_popup;" }
image "ui/button_green_small"
background "ui/button_green_small"
font "f_menusmall"
color "0 0.5 0 1"
selectcolor "1 1 1 1"
Expand Down
5 changes: 2 additions & 3 deletions base/ufos/ui/aircraft_equip.ufo
Expand Up @@ -136,7 +136,6 @@ window aircraft_equip extends iaircraft
string warning
{
string *cvar:mn_aircraft_item_warning
image "ui/button_green_small"
pos "19 269"
size "215 32"
padding 0
Expand All @@ -150,7 +149,7 @@ window aircraft_equip extends iaircraft
button button_add
{
string "_Equip this item"
image "ui/button_green_small"
background "ui/button_green_small"
pos "26 271"
size "200 25"
color "0 0.5 0 1"
Expand All @@ -167,7 +166,7 @@ window aircraft_equip extends iaircraft
button button_remove
{
string "_Remove this item"
image "ui/button_green_small"
background "ui/button_green_small"
pos "26 271"
size "200 25"
onClick {
Expand Down
2 changes: 1 addition & 1 deletion base/ufos/ui/aircraft_soldiers.ufo
Expand Up @@ -104,7 +104,7 @@ window team extends iaircraft
string "_Equip soldiers"
pos "482 129"
size "198 40"
image "ui/button_blue"
background "ui/button_blue"
color "1 1 1 0.8"
selectcolor "1 1 1 1"

Expand Down
10 changes: 5 additions & 5 deletions base/ufos/ui/basedefence.ufo
Expand Up @@ -159,7 +159,7 @@ window basedefence extends objectinfo
icon "icons/varrow_swap"
string "_Add"
tooltip "_Equip the selected slot with this weapon"
image "ui/button_green_small"
background "ui/button_green_small"
pos "10 130"
size "200 32"
onClick {
Expand All @@ -171,7 +171,7 @@ window basedefence extends objectinfo
icon "icons/varrow_top_bottom"
string "_Remove"
tooltip "_Remove weapon from the selected slot"
image "ui/button_green_small"
background "ui/button_green_small"
pos "230 130"
size "200 32"
onClick {
Expand Down Expand Up @@ -316,7 +316,7 @@ window basedefence extends objectinfo
string *cvar:mn_installation_title
pos "310 90"
size "256 34"
image "ui/button_green_verysmall"
background "ui/button_green_verysmall"
color "0 .78 0 1"
selectcolor "1 1 1 1"
contentalign ALIGN_CL
Expand Down Expand Up @@ -374,7 +374,7 @@ window basedefence extends objectinfo
tooltip "_Destroy installation"
color "0 0.5 0 1"
font "f_menu"
image "ui/button_green_small"
background "ui/button_green_small"
pos "50 250"
size "200 32"
onClick { cmd "ui_pop; mn_installation_destroy;" }
Expand All @@ -384,7 +384,7 @@ window basedefence extends objectinfo
string "_Close"
color "0 0.5 0 1"
font "f_menu"
image "ui/button_green_small"
background "ui/button_green_small"
pos "549 250"
size "200 32"
onClick { cmd "ui_pop;" }
Expand Down
2 changes: 1 addition & 1 deletion base/ufos/ui/bases.ufo
Expand Up @@ -4,7 +4,7 @@

component button cmpBaseButton
{
image "ui/button_green_small"
background "ui/button_green_small"
size "230 35"
color "0 0.8 0 1"
selectcolor "1 1 1 1"
Expand Down

0 comments on commit 3ad7136

Please sign in to comment.