diff --git a/data/CREDITS b/data/CREDITS index 12438ffb9..dc0da5a67 100644 --- a/data/CREDITS +++ b/data/CREDITS @@ -62,6 +62,10 @@ Tobias Beyrer - Wilber kart - elePHPant kart +GUI Icons +- onyum.com, commissioned by OpenGameArt.org/Bart Kelsey +- yeKcim (Anthony Carré) + Ivar ten Cate (Varivar) - Old mine track - Tux Tollway track @@ -201,6 +205,7 @@ Donations - Phelippeau Rudy (rudy251079) - Carl Olsson - Tux_penguin +- OpenGameArt.org = Previous contributors = diff --git a/data/gui/License.txt b/data/gui/License.txt index 1871389a8..8c713c876 100644 --- a/data/gui/License.txt +++ b/data/gui/License.txt @@ -1,24 +1,15 @@ -All images in this directory come from the Tango icon project are Public Domain (http://tango.freedesktop.org) +All icons come from Open Game Art (art by onyum.com, comissionned by Bart Kelsey) Except : Logo and Logo_slim : under CC-BY-SA 3.0+ by 'rastapax' -background in glass skin : under CC-BY-SA by 'elisee' - -Logo and Logo_slim : under CC-BY-SA 3.0+ by 'rastapax' - main_*.png icons, released under Creative-Commons BY-SA 3, By yeKcim (Anthony Carré) -logo.png is released under GPL +difficulty_*.png icons, released under Creative-Commons BY-SA 3, By Conso (Constantin Pelikan) -main_race.png created by Andreas Bilng (c) 2008, with Tuxicon by Enrico Billing (c) 2008 - released under Creative Commons Attribution-Share Alike 3.0 Germany [http://creativecommons.org/licenses/by-sa/3.0/de/deed.en] - -mode_normal.png released under CC-BY-SA 3.0, based on work by MiniBjorn -FIXME - track*.png are temporary and should be [re]moved +==== -FIXME - mode_ftl.png has an unclear license, it combines a GPL kart and a CC kart. How does those licenses deal with this? - -track_random.png released under public domain, by Auria \ No newline at end of file +Glass Skin by Auria, under CC-BY-SA 3+ +except background, under CC-BY-SA, by 'elisee' diff --git a/data/gui/back.png b/data/gui/back.png index 71eb36751..070656e28 100644 Binary files a/data/gui/back.png and b/data/gui/back.png differ diff --git a/data/gui/challenge.png b/data/gui/challenge.png new file mode 100644 index 000000000..a9d74b571 Binary files /dev/null and b/data/gui/challenge.png differ diff --git a/data/gui/gamepad.png b/data/gui/gamepad.png index ceff379eb..1fa0d29ac 100644 Binary files a/data/gui/gamepad.png and b/data/gui/gamepad.png differ diff --git a/data/gui/keyboard.png b/data/gui/keyboard.png index 39704b0ab..d803620da 100644 Binary files a/data/gui/keyboard.png and b/data/gui/keyboard.png differ diff --git a/data/gui/mode_3strikes.png b/data/gui/mode_3strikes.png index a63befeab..08e2d4ee3 100644 Binary files a/data/gui/mode_3strikes.png and b/data/gui/mode_3strikes.png differ diff --git a/data/gui/mode_ftl.png b/data/gui/mode_ftl.png index 4698cee26..f623747a0 100644 Binary files a/data/gui/mode_ftl.png and b/data/gui/mode_ftl.png differ diff --git a/data/gui/mode_normal.png b/data/gui/mode_normal.png index cc0f7f86d..13cba4b9a 100644 Binary files a/data/gui/mode_normal.png and b/data/gui/mode_normal.png differ diff --git a/data/gui/options_audio_video.png b/data/gui/options_audio_video.png index a965e2ae3..1da5c1032 100644 Binary files a/data/gui/options_audio_video.png and b/data/gui/options_audio_video.png differ diff --git a/data/gui/options_input.png b/data/gui/options_input.png index df964952e..00305787a 100644 Binary files a/data/gui/options_input.png and b/data/gui/options_input.png differ diff --git a/data/gui/options_players.png b/data/gui/options_players.png index 998126dd8..b1819a7a3 100644 Binary files a/data/gui/options_players.png and b/data/gui/options_players.png differ diff --git a/data/gui/restart.png b/data/gui/restart.png index dad080ebf..5bfb09b94 100644 Binary files a/data/gui/restart.png and b/data/gui/restart.png differ diff --git a/data/gui/track_random.png b/data/gui/track_random.png index 7504f1d12..ce3a497d9 100644 Binary files a/data/gui/track_random.png and b/data/gui/track_random.png differ diff --git a/src/ide/Xcode/STK_XCode.xcodeproj/project.pbxproj b/src/ide/Xcode/STK_XCode.xcodeproj/project.pbxproj index 0eed52827..5ab6ad762 100644 --- a/src/ide/Xcode/STK_XCode.xcodeproj/project.pbxproj +++ b/src/ide/Xcode/STK_XCode.xcodeproj/project.pbxproj @@ -2617,6 +2617,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; + GCC_VERSION = 4.0; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_UNUSED_FUNCTION = NO; @@ -2650,6 +2651,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; + GCC_VERSION = 4.0; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_UNUSED_FUNCTION = NO; diff --git a/src/states_screens/challenges.cpp b/src/states_screens/challenges.cpp index e58b82e3c..069a528fd 100644 --- a/src/states_screens/challenges.cpp +++ b/src/states_screens/challenges.cpp @@ -65,10 +65,9 @@ namespace GUIEngine char buffer[64]; for (int n=0; naddItem(activeChallenges[n]->getName() + L"\n" + activeChallenges[n]->getChallengeDescription(), - buffer, file_manager->getTextureFile("speedback.png")); + buffer, file_manager->getGUIDir() + "/challenge.png"); } for (int n=0; n