Merge branch master into kart-properties

CHANGELOG.md

@@ -1,3 +1,16 @@
+## SupertTuxKart 0.9.1
+* Many bug fixes
+* Started to use scripting in tracks
+* Significant audio performance improvements
+* Smaller tweaks and improvements to several tracks including 
+** Math class
+** XR591
+** Fort Magma
+** Gran Paradiso
+** Subsea
+* Tweak to challenges
+* Better support for driving tracks in reverse
+
 ## SupertTuxKart 0.9 (April 2015)
 * Fully shader-based rendering engine
 * New tracks Cocoa Temple and Gran Paradiso

CMakeLists.txt

@@ -19,6 +19,7 @@ option(USE_WIIUSE "Support for wiimote input devices" ON)
 option(USE_FRIBIDI "Support for right-to-left languages" ON)
 option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON)
 option(USE_SYSTEM_ANGELSCRIPT "Use system angelscript instead of built-in angelscript. If you enable this option, make sure to use a compatible version." OFF)
+option(ENABLE_NETWORK_MULTIPLAYER "Enable network multiplayer. This will replace the online profile GUI in the main menu with the network multiplayer GUI" OFF)
 
 if(MSVC AND (MSVC_VERSION LESS 1900))
     # Normally hide the option to build wiiuse on VS, since it depends
@@ -123,9 +124,15 @@ endif()
 
 
 # Build the angelscript library if not in system
+if(USE_SYSTEM_ANGELSCRIPT)
     find_package(Angelscript)
-if(USE_SYSTEM_ANGELSCRIPT AND ANGELSCRIPT_FOUND)
+    if(ANGELSCRIPT_FOUND)
         include_directories(${Angelscript_INCLUDE_DIRS})
+    else()
+        message(FATAL_ERROR "Angelscript not found. "
+            "Either install angelscript or use built-in version using "
+            "-DUSE_SYSTEM_ANGELSCRIPT=0")
+    endif()
 else()
     add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
     include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
@@ -205,6 +212,11 @@ if(MINGW AND CMAKE_BUILD_TYPE MATCHES Release)
     SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,windows")
 endif()
 
+# Netwowk Multiplayer
+if(ENABLE_NETWORK_MULTIPLAYER)
+  add_definitions(-DENABLE_NETWORK_MULTIPLAYER_SCREEN)
+endif()
+
 if(WIN32)
     # By default windows.h has macros defined for min and max that screw up everything
     add_definitions(-DNOMINMAX)
@@ -213,7 +225,7 @@ if(WIN32)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 
     # Avoid timespec structure redeclaration on Visual Studio 2015
-    if (MSVC_VERSION EQUAL 1900)
+    if (NOT (MSVC_VERSION LESS 1900))
         add_definitions(-DHAVE_STRUCT_TIMESPEC)
     endif()
 endif()
@@ -408,24 +420,6 @@ endif()
 add_subdirectory(tools/font_tool)
 
 
-# ==== Make dist target ====
-if(MSVC OR MINGW)
-  # Don't create a dist target for VS
-else()
-  add_custom_target(dist
-    COMMAND rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION} && rm -f ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2
-            && echo "Exporting..."
-            && svn export ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}
-            && echo "Compressing..."
-            && cd ${CMAKE_BINARY_DIR}
-            && tar -cjf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2 ./SuperTuxKart-${PROJECT_VERSION}
-            && echo "Done, cleaning up"
-            && rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
-endif()
-
-
 # ==== Checking if data folder exists ====
 if(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data)
   message( FATAL_ERROR "${CMAKE_CURRENT_SOURCE_DIR}/data folder doesn't exist" )

data/challenges/islandtrack.challenge

@@ -10,11 +10,11 @@
     </hard>
     <medium>
         <karts number="4"/>
-        <requirements position="2"/>
+        <requirements position="1"/>
     </medium>
     <easy>
         <karts number="3"/>
-        <requirements position="3"/>
+        <requirements position="1"/>
     </easy>
 </challenge>
 

data/challenges/olivermath.challenge

@@ -6,15 +6,15 @@
     
     <hard>
         <karts number="5"/>
-        <requirements position="1" time="50"/>
+        <requirements position="1" time="65"/>
     </hard>
     <medium>
         <karts number="5"/>
-        <requirements position="1" time="65"/>
+        <requirements position="1" time="85"/>
     </medium>
     <easy>
         <karts number="5"/>
-        <requirements position="1" time="80"/>
+        <requirements position="1" time="105"/>
     </easy>
 </challenge>
 

data/challenges/subsea.challenge

@@ -6,7 +6,7 @@
     
     <hard>
         <karts number="5"/>
-        <requirements position="1" time="200"/>
+        <requirements position="1" time="205"/>
     </hard>
     <medium>
         <karts number="4"/>

data/fonts/materials.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0"?>
 <materials>
   <!-- Fonts -->
-  <material name="title_font.png"           shader="unlit" lazy-load="Y"/>
-  <material name="title_font_2.png"         shader="unlit" lazy-load="Y"/>
-  <material name="sigmar0.png"              shader="unlit" lazy-load="Y"/>
-  <material name="comix.png"                shader="unlit" lazy-load="Y"/>
-  <material name="LayneHansom0.png"         shader="unlit" lazy-load="Y"/>
-  <material name="Mplus2p_JP0.png"          shader="unlit" lazy-load="Y"/>
-  <material name="rasheeq0.png"             shader="unlit" lazy-load="Y"/>
-  <material name="rasheeq3.png"             shader="unlit" lazy-load="Y"/>
-  <material name="rasheeq4.png"             shader="unlit" lazy-load="Y"/>
-  <material name="wqyMicroHei0.png"         shader="unlit" lazy-load="Y"/>
-  <material name="wqyMicroHei1.png"         shader="unlit" lazy-load="Y"/>
-  <material name="wqyMicroHei2.png"         shader="unlit" lazy-load="Y"/>
-  <material name="wqyMicroHei3.png"         shader="unlit" lazy-load="Y"/>
-  <material name="wqyMicroHei4.png"         shader="unlit" lazy-load="Y"/>
-  <material name="wqyMicroHei5.png"         shader="unlit" lazy-load="Y"/>
-  <material name="AR_PL_SungtiL_GB0.png"    shader="unlit" lazy-load="Y"/>
-  <material name="LayneHansomBigDigits.png" shader="unlit" lazy-load="Y"/>
+  <material name="title_font.png"           shader="unlit" dont-load="Y"/>
+  <material name="title_font_2.png"         shader="unlit" dont-load="Y"/>
+  <material name="sigmar0.png"              shader="unlit" dont-load="Y"/>
+  <material name="comix.png"                shader="unlit" dont-load="Y"/>
+  <material name="LayneHansom0.png"         shader="unlit" dont-load="Y"/>
+  <material name="Mplus2p_JP0.png"          shader="unlit" dont-load="Y"/>
+  <material name="rasheeq0.png"             shader="unlit" dont-load="Y"/>
+  <material name="rasheeq3.png"             shader="unlit" dont-load="Y"/>
+  <material name="rasheeq4.png"             shader="unlit" dont-load="Y"/>
+  <material name="wqyMicroHei0.png"         shader="unlit" dont-load="Y"/>
+  <material name="wqyMicroHei1.png"         shader="unlit" dont-load="Y"/>
+  <material name="wqyMicroHei2.png"         shader="unlit" dont-load="Y"/>
+  <material name="wqyMicroHei3.png"         shader="unlit" dont-load="Y"/>
+  <material name="wqyMicroHei4.png"         shader="unlit" dont-load="Y"/>
+  <material name="wqyMicroHei5.png"         shader="unlit" dont-load="Y"/>
+  <material name="AR_PL_SungtiL_GB0.png"    shader="unlit" dont-load="Y"/>
+  <material name="LayneHansomBigDigits.png" shader="unlit" dont-load="Y"/>
 
 </materials>

data/gfx/confetti.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="box" randomize-initial-y="true" box_x="100.0" box_y="100" box_z="120.0">
+
+    <spreading angle="3"           />
+    
+    <velocity  x="-0.00"
+               y="-0.005"
+               z="-0.00"             />
+    
+    <material  file="confetti.png" clampu="Y" clampv="Y" />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="500"
+               max="1000"           />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="8500"
+               max="9500"          />
+    
+    <!-- Size of the particles -->
+    <size      min="0.10"
+               max="0.30"          />
+    
+    <color     min="40 40 255"
+               max="255 255 255"   />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="100"          />
+
+    <wind      speed="0.16"
+               flips="Y"           />
+
+</particles>

data/gfx/confetti_bleu.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="box" randomize-initial-y="true" box_x="100.0" box_y="100" box_z="120.0">
+
+    <spreading angle="3"           />
+    
+    <velocity  x="-0.00"
+               y="-0.005"
+               z="-0.00"             />
+    
+    <material  file="snowflake.png" clampu="Y" clampv="Y" />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="500"
+               max="1000"           />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="8500"
+               max="9500"          />
+    
+    <!-- Size of the particles -->
+    <size      min="0.10"
+               max="0.30"          />
+    
+    <color     min="40 40 255"
+               max="255 255 255"   />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="100"          />
+
+    <wind      speed="0.16"
+               flips="Y"           />
+
+</particles>

data/gfx/gfx_blueNebula_a.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="20.5">
+
+    <spreading angle="120"      />
+    
+    <velocity  x="0.002"
+               y="0.000"
+               z="0.000"         />
+    
+    <material  file="stktex_nebulaCloud_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="1"
+               max="2"         />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="20000"
+               max="30000"         />
+    
+    <!-- Size of the particles -->
+   <size min="20.5"
+         max="45.0"
+         x-increase-factor="1.6"
+         y-increase-factor="1.6" />    
+    
+    <color     min="0 0 0"
+               max="255 255 255" />
+
+    <fadeout   time="5000" />
+
+
+</particles>

data/gfx/gfx_bubbleFast_a.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<particles emitter="box" box_x="0.5" box_y="0.5" box_z="0.5">
+
+    <spreading angle="45"      />
+    
+    <velocity  x="0.000"
+               y="0.005"
+               z="0.000"         />
+    
+    <material  file="gfx_bubble_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="8"
+               max="15"         />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="2000"
+               max="3000"         />
+    
+    <!-- Size of the particles -->
+   <size min="0.5"
+         max="0.8"
+         x-increase-factor="1.6"
+         y-increase-factor="1.6" />    
+    
+    <color     min="0 0 0"
+               max="255 255 255" />
+
+    <fadeout   time="2000" />
+
+
+</particles>

data/gfx/gfx_fireworkExplosion_a.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="0.5">
+
+    <spreading angle="180"         />
+    
+    <velocity  x="0.003"
+               y="0.0003"
+               z="0.003"           />
+    
+    <material  file="gfx_sparkFire_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="65"
+               max="100" />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="700"
+               max="700"         />
+    
+    <!-- Size of the particles -->
+    <size      min="0.2"
+               max="0.3"
+               x-increase-factor="1.1"
+               y-increase-factor="1.3"
+               />
+    
+    <color     min="255 255 255"
+               max="255 0 0"  />
+    
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="50"         />
+
+</particles>

data/gfx/gfx_sandExplosion_a.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="0.5">
+
+    <spreading angle="90"      />
+    
+    <velocity  x="0.000"
+               y="0.003"
+               z="0.000"        />
+    
+    <material  file="gfx_earthJetblast_a.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="900"
+               max="1000"         />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="300"
+               max="1000"         />
+    
+    <!-- Size of the particles -->
+   <size min="0.3"
+         max="0.7"
+         x-increase-factor="1.2"
+         y-increase-factor="1.2" />    
+    
+    <color     min="0 0 0"
+               max="255 255 255" />
+
+    <fadeout   time="500" />
+
+
+</particles>

data/gfx/gfx_smallWaterFlow.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<particles emitter="sphere" radius="0.1">
+
+    <spreading angle="12"      />
+    
+    <velocity  x="0.000"
+               y="0.000"
+               z="0.005"         />
+    
+    <material  file="particle_water.png"  />
+    
+    <!-- Amount of particles emitted per second -->
+    <rate      min="30"
+               max="50"         />
+    
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="500"
+               max="1000"         />
+    
+    <!-- Size of the particles -->
+    <size      min="0.1"
+               max="0.2"       
+               x-increase-factor="1.3"
+               y-increase-factor="1.3" />
+    
+    <color     min="255 255 255"
+               max="255 255 255" />
+
+    <fadeout   time="3000" />
+
+
+</particles>

data/gui/tutorial.stkgui

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
-    <div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" >
-
-        <header I18N="Title for tutorials screen" text="Tutorial - Selection Room" text_align="center" width="100%" />
-
-        <spacer proportion="1" width="100%"/>
-
-        <list id="tutorials" proportion="5" width="75%" align="center"/>
-
-        <spacer proportion="1" width="100%"/>
-        <spacer width="100%" height="45"/>
-
-    </div>
-
-    <button id="play" x="-200" y="-40" height="35" align="right" text="Play all"/>
-</stkgui>

data/po/.gitattributes

@@ -0,0 +1 @@
+*.sh -crlf

data/po/.gitignore

@@ -1,2 +1,3 @@
 transifex
 tx.exe
+gui_strings.h

data/po/da_DK.po

@@ -3366,4 +3366,4 @@ msgstr ""
 
 #: src/states_screens/credits.cpp:209
 msgid "translator-credits"
-msgstr "Launchpad Contributions:"
+msgstr ""

data/po/update_pot.sh

@@ -52,7 +52,7 @@ xgettext  -j  -d supertuxkart --keyword=_ --keyword=N_ --keyword=_LTR \
                                --package-name=supertuxkart
 
 # Angelscript files (xgettext doesn't support AS so pretend it's c++)
-xgettext  -j  -d supertuxkart -s --keyword="translate" --add-comments="I18N:" \
+xgettext  -j  -d supertuxkart --keyword="translate" --add-comments="I18N:" \
                                -p ./data/po -o supertuxkart.pot $ANGELSCRIPT_FILE_LIST \
                                --package-name=supertuxkart --language=c++