Merge remote-tracking branch 'origin/master' into curved

CHANGELOG.md

@@ -1,3 +1,7 @@
+## SuperTuxKart 0.9.4
+* Better random item distribution for various numbers of karts
+* Improved powerup handling in AI
+
 ## SuperTuxKart 0.9.3
 * Reduced RAM and VRAM usage, reducing load times by Auria and Benau
 * New mesh format optimized for space and hardware skinning

android/README.ANDROID

@@ -32,7 +32,7 @@ after some tweaks, but atm. only linux is supported.
 Dependencies list (may be incomplete):
 
     autoconf, automake, make, python, gradle, ant, imagemagick, cmake, 
-    vorbis-tools
+    vorbis-tools, pngquant
 
 Additionally some dependencies for optimize_data script:
 

android/generate_assets.sh

@@ -14,8 +14,8 @@
 # value greater than 0.
 # The CONVERT_TO_JPG variable enables converting all images that are safe to 
 # convert and keeps other images untouched.
-# The script needs imagemagick and ogg utils installed to use DECREASE_QUALITY
-# feature
+# The script needs imagemagick, pngquant and ogg utils installed in order to 
+# use DECREASE_QUALITY feature
 
 ################################################################################
 
@@ -203,7 +203,7 @@ convert_image()
     fi
 
     convert $SCALE_CMD $QUALITY_CMD "$FILE" "tmp.$FILE_TYPE"
-
+    
     if [ -s "tmp.$FILE_TYPE" ]; then
         SIZE_OLD=`du -k "$FILE" | cut -f1`
         SIZE_NEW=`du -k "tmp.$FILE_TYPE" | cut -f1`
@@ -259,10 +259,23 @@ convert_sound()
     rm -f tmp.wav tmp.ogg
 }
 
+optimize_png()
+{
+    FILE="$1"
+    echo "Optimize file: $FILE"
+
+    if [ ! -f "$FILE" ]; then
+        echo "  File doesn't exist."
+        return
+    fi
+    
+    pngquant --force --skip-if-larger --output "$FILE" -- "$FILE"
+}
+
 convert_to_jpg()
 {
     FILE="$1"
-    echo "Convert file: $FILE"
+    echo "Convert file to jpg: $FILE"
 
     if [ ! -f "$FILE" ]; then
         echo "  File doesn't exist."
@@ -347,7 +360,7 @@ convert_to_jpg()
 convert_to_jpg_extract_b3dz()
 {
     FILE="$1"
-    echo "Convert file: $FILE"
+    echo "Extract b3dz file: $FILE"
 
     if [ ! -f "$FILE" ]; then
         echo "  File doesn't exist."
@@ -368,7 +381,7 @@ convert_to_jpg_extract_b3dz()
 convert_to_jpg_update_b3d()
 {
     FILE="$1"
-    echo "Convert file: $FILE"
+    echo "Update b3d file: $FILE"
 
     if [ ! -f "$1" ]; then
         echo "  File doesn't exist."
@@ -448,7 +461,7 @@ convert_to_jpg_update_b3d()
 convert_to_jpg_update_spm()
 {
     FILE="$1"
-    echo "Convert file: $FILE"
+    echo "Update spm file: $FILE"
 
     if [ ! -f "$1" ]; then
         echo "  File doesn't exist."
@@ -520,7 +533,7 @@ convert_to_jpg_update_spm()
 convert_to_jpg_update_xml()
 {
     FILE="$1"
-    echo "Convert file: $FILE"
+    echo "Update xml file: $FILE"
 
     if [ ! -f "$FILE" ]; then
         echo "  File doesn't exist."
@@ -568,6 +581,10 @@ if [ $CONVERT_TO_JPG -gt 0 ]; then
     fi
 fi
 
+if [ $DECREASE_QUALITY -gt 0 ]; then
+    find assets/data -iname "*.png" | while read f; do optimize_png "$f" "png"; done
+fi
+
 
 # Copy data directory
 echo "Copy data directory"

data/CREDITS

@@ -41,7 +41,11 @@ Lead graphical artist
 - Thanks to my family and especially my father
 - Jean Claude Clemençon
 
+= Alayan =
 
+Developer
+- Improved item distribution 
+- AI improvements
 
 = Magne Djupvik (Arthur) =
 

data/gui/credits.stkgui

@@ -2,11 +2,19 @@
 <stkgui>
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 
-    <div x="2%" y="2%" width="98%" height="96%" layout="vertical-row" >
+    <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
 
         <icon id="logo" align="center" proportion="4" width="100%" icon="gui/logo_slim.png"/>
 
-        <header I18N="Title in credits screen" text="Credits" width="100%" />
+        <div x="0" y="0" width="100%" proportion="1" layout="horizontal-row" >
+
+            <header I18N="Title in credits screen" text="Credits" />
+
+            <spacer proportion="1" />
+
+            <button id="donate" width="fit" align="center" text="Donate to help keep SuperTuxKart going!"/>
+
+        </div>
 
         <box id="animated_area" width="100%" proportion="10" padding="0">
         </box>

data/gui/online/networking_lobby.stkgui

@@ -2,22 +2,21 @@
 <stkgui>
     <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
         <header id="lobby-text" text_align="center" width="80%" align="center" I18N="In networking lobby" text="Lobby"/>
-        <spacer height="15" width="10"/>
-        <div proportion="4" x="2%" width="96%" layout="vertical-row">
+        <spacer height="1%" width="10"/>
+        <div proportion="9" x="2%" width="96%" layout="vertical-row">
             <div width="100%" proportion="2" layout="horizontal-row">
                 <box id="info" proportion="2" height="100%" layout="vertical-row">
                     <label word_wrap="true" id="text" proportion="3" width="100%" height="100%" text_valign="top"/>
                 </box>
-                <spacer width="20" height="20"/>
+                <spacer width="3%" height="20"/>
                 <box proportion="1" height="100%" layout="vertical-row">
                     <list id="players" width="100%" height="100%"/>
                 </box>
             </div>
         </div>
-        <spacer height="20"/>
-        <div width="100%" proportion="1" layout="horizontal-row">
-            <spacer width="20" height="20"/>
-            <box proportion="2" height="100%" layout="vertical-row">
+        <spacer height="2%"/>
+        <div proportion="2" x="2%" width="96%" layout="horizontal-row">
+            <box proportion="4" height="100%" layout="vertical-row">
                 <textbox id="chat" width="100%" height="30%"/>
                 <spacer height="10"/>
                 <div width="100%" height="30%" proportion="1" layout="horizontal-row">
@@ -26,15 +25,13 @@
                     <label id="timeout-message" width="80%" height="fit"/>
                 </div>
             </box>
-            <spacer width="40"/>
-            <buttonbar id="actions" proportion="1" width="75%" height="75%">
-                <icon-button id="start" width="64" height="64" icon="gui/green_check.png" align="center"
-                    I18N="In the network lobby" text="Start race"/>
-                <icon-button id="exit" width="64" height="64" icon="gui/main_quit.png" align="center"
-                    I18N="In the network lobby" text="Exit"/>
-            </buttonbar>
+            <spacer width="3%"/>
+            <icon-button id="start" proportion="1" width="64" height="64" icon="gui/green_check.png" align="top"
+                I18N="In the network lobby" text="Start race"/>
+            <icon-button id="exit" proportion="1" width="64" height="64" icon="gui/main_quit.png" align="top"
+                I18N="In the network lobby" text="Exit"/>
         </div>
-        <spacer height="10"/>
+        <spacer height="1%"/>
     </div>
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
 </stkgui>

data/gui/online/register.stkgui

@@ -52,6 +52,9 @@
                     <textbox id="email_confirm" proportion="2" height="fit" I18N="In the registration dialog"/>
                 </div>
 -->
+
+                <button id="password_reset" width="fit" text="Reset password"/>
+
                 <label id="info" height="20%" width="100%" align="center" text_align="center" word_wrap="true"
                    I18N="In the registration dialog" 
                        text="You can play without creating an online account by selecting an offline account. Though then you can not connect to friends, vote for addons etc. Please read our privacy statement at http://privacy.supertuxkart.net"/>