diff --git a/.gitignore b/.gitignore index 23a5fa5f6..1ba98ce23 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,14 @@ bld*/ build*/ cmake_build/ +cmake_build*/ dependencies/ CMakeFiles/ stk-editor/ .config/ supertuxkart-64 +make*.bat data/editor data/karts @@ -16,6 +18,7 @@ data/music data/sfx data/textures data/tracks +data/wip-tracks data/.svn # Ignore doxygen output @@ -41,6 +44,9 @@ src/html *~ *.swp +# Ignore QtCreator project file +CMakeLists.txt.user + packets_log.txt history.dat README.dependencies diff --git a/CHANGELOG.md b/CHANGELOG.md index 960ff5cd2..ace19a2ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,31 @@ -##SuperTuxKart 0.8.1 +## 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 +* Graphical improvements to many other tracks +* New karts amanda and gavroche +* New and improved tux, adiumy, sara the wizard and the racer, xue kart +* Online login which allows to: +** connect with friends and see when they are playing +** vote for addons +** collect online achievements +* Grand Prix editor, including creation of random GPs +* Different kart physics + + +## SuperTuxKart 0.8.1 (26. November 2013) * New track STK Enterprise * Updated track The old mines * Updated Lighthouse track @@ -18,8 +45,7 @@ * Wiimote support - -##SuperTuxKart 0.8 +## SuperTuxKart 0.8 (11. December 2012) * Story mode and new challenge set * Improved AI * Skidding and better collision physics @@ -34,7 +60,7 @@ * New music -##SuperTuxKart 0.7.3 +## SuperTuxKart 0.7.3 (2. November 2011) * New Zen Garden and Subsea tracks * New Island battle arena * New Suzanne kart @@ -50,7 +76,7 @@ * Better placement of rescued karts * Transition track-making to blender 2.5/2.6 -##SuperTuxKart 0.7.2 +## SuperTuxKart 0.7.2 (15. July 2011) * Added in-game addon manager * Fixed major memory leaks * New Snow Peak track by Samuncle @@ -60,11 +86,11 @@ * Improve gamepad configuration under Windows (add ability to tell gamepads apart) * Various other tweaks done and glitches fixed -##SuperTuxKart 0.7.1b +## SuperTuxKart 0.7.1b (21. April 2011) * Fix circular dependency in challenges * Updated translations -##SuperTuxKart 0.7.1 +## SuperTuxKart 0.7.1 (15. April 2011) * Particle (smoke, splash, fire) and weather effects * New Fort Magma by Samuncle, new Shiny Suburbs track by Horace * New Beagle kart by wolterh @@ -83,7 +109,7 @@ * Full RTL (right to left) support * Various other tweaks done and glitches fixed -##SuperTuxKart 0.7 (December 2010) +## SuperTuxKart 0.7 (December 2010) Too many to list them all. Main points: * Irrlicht: @@ -97,11 +123,11 @@ Too many to list them all. Main points: * New art: - New tracks farm, hacienda, scotland, secret garden -##SuperTuxKart 0.6.2a (October 2009) +## SuperTuxKart 0.6.2a (October 2009) * Bugfix: STK would crash while trying to save the config file on Windows Vista. -##SuperTuxKart 0.6.2 (July 2009) +## SuperTuxKart 0.6.2 (July 2009) * Bugfix: Game could crash in rare circumstances. * Bugfix: Restarting a GP (with the in-race menu ESC) would not subtract already allocated points. * Bugfix: A race could be finished with an invalid shortcut. @@ -111,10 +137,10 @@ Too many to list them all. Main points: * Bugfix: GP result showed kart identifier instead of name. * Improvement: there is now 1 1 sec. wait period for the race result screen, avoiding the problem that someone presses space/enter at the end of a race, immediately quitting the menu before it can be read. -##SuperTuxKart 0.6.1a (February 2009) +## SuperTuxKart 0.6.1a (February 2009) * Bugfix: battle mode would not display track groups. -##SuperTuxKart 0.6.1 (February 2009) +## SuperTuxKart 0.6.1 (February 2009) * Added new kart ("Puffy"), new battle map ("Cave"), and new music for Snow Mountain. * Fixed bug in track selection screen that could cause a crash when track groups were used. * Fixed crash in character selection that could happen if an old user config file existed. @@ -124,7 +150,7 @@ Too many to list them all. Main points: * Added slow-down for karts driving backwards. * Somewhat reduced 'shaking' of AI driven karts. -##SuperTuxKart 0.6 (January 2009) +## SuperTuxKart 0.6 (January 2009) * New improved physics and kart handling * Added sharp turns and nitro speed boost (replacing wheelies and jump) * Totally rewrote powerups (plunger, bowling ball, cake, bubblegum) and new look for bananas @@ -147,7 +173,7 @@ Too many to list them all. Main points: - Fixed 'joystick locks' (kart would turn even if the joystick is in neutral), thanks to Samjam for the patch. -##SuperTuxKart 0.5 (May 2008) +## SuperTuxKart 0.5 (May 2008) * Six new tracks and one improved track: Fort Magma, SnowTux Peak, Amazonian Journey, City, Canyon, Crescent Crossing and StarTrack * Complete Challenges to unlock game modes, new tracks and a skidding preview * New Follow the Leader game mode @@ -161,7 +187,7 @@ Too many to list them all. Main points: - an AI crash fix (Chris Morris) -##SuperTuxKart 0.4 (February 2008) +## SuperTuxKart 0.4 (February 2008) * New physics handling using the bullet physics engine * New kart: wilber * Improved 'Shifting Sands' and 'Lighthouse' tracks @@ -172,7 +198,7 @@ Too many to list them all. Main points: * Additional music and main theme -##SuperTuxKart 0.3 (May 2007) +## SuperTuxKart 0.3 (May 2007) * Highscore lists * Shortcut detection * Improved AI diff --git a/CMakeLists.txt b/CMakeLists.txt index c64383c61..052827310 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ project(SuperTuxKart) set(PROJECT_VERSION "0.8.1") -cmake_minimum_required(VERSION 2.8.1) +cmake_minimum_required(VERSION 2.8.4) if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3)) cmake_policy(SET CMP0043 OLD) endif() @@ -16,13 +16,13 @@ if (NOT CMAKE_BUILD_TYPE) endif() option(USE_WIIUSE "Support for wiimote input devices" ON) +option(USE_FREETYPE "Use Freetype to render text" 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(UNIX OR MINGW) - option(USE_CPP2011 "Activate C++ 2011 mode (GCC only)" OFF) -endif() -if(MSVC OR MINGW) +if(MSVC AND (MSVC_VERSION LESS 1900)) # Normally hide the option to build wiiuse on VS, since it depends # on the installation of the Windows DDK (Driver Developer Kit), # which also needs an absolute path :( @@ -32,7 +32,7 @@ else() set(WIIUSE_BUILD ON) endif() -if(MINGW) +if(MINGW OR CYGWIN) set(USE_WIIUSE OFF) endif() @@ -124,9 +124,21 @@ elseif(MSVC) endif() -# Build the angelscript library -add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake") -include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include") +# Build the angelscript library if not in system +if(USE_SYSTEM_ANGELSCRIPT) + find_package(Angelscript) + 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") + set(Angelscript_LIBRARIES angelscript) +endif() # OpenAL if(APPLE) @@ -153,6 +165,17 @@ else() include_directories(${OGGVORBIS_INCLUDE_DIRS}) endif() +# Freetype +if(USE_FREETYPE) + find_package(Freetype) + if(FREETYPE_FOUND) + include_directories(${FREETYPE_INCLUDE_DIRS}) + else() + message(FATAL_ERROR "Freetype not found. " + "Either install freetype or disable freetype rendering support with -DUSE_FREETYPE=0 ") + endif() +endif() + # Fribidi if(USE_FRIBIDI) find_package(Fribidi) @@ -172,13 +195,6 @@ if (OPENMP_FOUND) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") endif() - -if(UNIX OR MINGW) -# if(USE_CPP2011) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x") -# endif() -endif() - # OpenGL find_package(OpenGL REQUIRED) include_directories(${OPENGL_INCLUDE_DIR}) @@ -198,18 +214,32 @@ if(UNIX AND NOT APPLE) endif() endif() - # Set some compiler options if(UNIX OR MINGW) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") endif() +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) # And shut up about unsafe stuff add_definitions(-D_CRT_SECURE_NO_WARNINGS) + + # Avoid timespec structure redeclaration on Visual Studio 2015 + if (NOT (MSVC_VERSION LESS 1900)) + add_definitions(-DHAVE_STRUCT_TIMESPEC) + endif() endif() if(MSVC) @@ -278,7 +308,7 @@ else() if(MSVC) set(PTHREAD_NAMES pthreadVC2) elseif(MINGW) - set(PTHREAD_NAMES "winpthread-1" pthreadGC2) + set(PTHREAD_NAMES "winpthread-1" "libwinpthread-1" "pthreadGC2") endif() find_library(PTHREAD_LIBRARY NAMES pthread ${PTHREAD_NAMES} PATHS ${PROJECT_SOURCE_DIR}/dependencies/lib) mark_as_advanced(PTHREAD_LIBRARY) @@ -316,11 +346,12 @@ target_link_libraries(supertuxkart enet glew stkirrlicht - angelscript + ${Angelscript_LIBRARIES} ${CURL_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${OPENAL_LIBRARY} ${OPENGL_LIBRARIES} + ${FREETPYE_LIBRARIES} ) if(UNIX AND NOT APPLE) @@ -351,6 +382,11 @@ if(USE_FRIBIDI) add_definitions(-DENABLE_BIDI) endif() +if(USE_FREETYPE) + target_link_libraries(supertuxkart ${FREETYPE_LIBRARIES}) + add_definitions(-DENABLE_FREETYPE) +endif() + # Wiiuse # ------ if(USE_WIIUSE) @@ -380,25 +416,23 @@ if(MSVC OR MINGW) add_custom_target(stkshaders SOURCES ${STK_SHADERS}) endif() -# Optional tools -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} - ) +if(MINGW) + find_library(LIBGCC NAMES "libgcc_s_dw2-1.dll" "libgcc_s_sjlj-1.dll" "libgcc_s_seh-1.dll" PATHS ${CMAKE_FIND_ROOT_PATH}) + if(LIBGCC) + file(COPY ${LIBGCC} DESTINATION ${CMAKE_BINARY_DIR}/bin/) + endif() + find_library(LIBSTDCPP NAMES "libstdc++-6.dll" PATHS ${CMAKE_FIND_ROOT_PATH}) + if(LIBSTDCPP) + file(COPY ${LIBSTDCPP} DESTINATION ${CMAKE_BINARY_DIR}/bin/) + endif() + find_library(LIBOPENMP NAMES "libgomp-1.dll" PATHS ${CMAKE_FIND_ROOT_PATH}) + if(LIBOPENMP) + file(COPY ${LIBOPENMP} DESTINATION ${CMAKE_BINARY_DIR}/bin/) + endif() + find_library(LIBPTHREAD NAMES "winpthread-1.dll" "libwinpthread-1.dll" "pthreadGC2.dll" PATHS ${CMAKE_FIND_ROOT_PATH}) + if(LIBPTHREAD) + file(COPY ${LIBPTHREAD} DESTINATION ${CMAKE_BINARY_DIR}/bin/) + endif() endif() @@ -438,7 +472,12 @@ if(STK_ASSETS_DIR AND CHECK_ASSETS) install(DIRECTORY ${STK_ASSETS_DIR} DESTINATION ${STK_INSTALL_DATA_DIR}/data PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE) endif() install(FILES ${STK_DATA_DIR}/supertuxkart.desktop DESTINATION share/applications) -install(FILES data/supertuxkart_32.png DESTINATION share/icons/hicolor/32x32 RENAME supertuxkart.png) -install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128 RENAME supertuxkart.png) +install(FILES data/supertuxkart_32.png DESTINATION share/icons/hicolor/32x32/apps RENAME supertuxkart.png) +install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME supertuxkart.png) install(FILES data/supertuxkart_32.png data/supertuxkart_128.png DESTINATION share/pixmaps) install(FILES data/supertuxkart.appdata.xml DESTINATION share/appdata) + +if(MINGW) + install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/ DESTINATION ${STK_INSTALL_BINARY_DIR} + FILES_MATCHING PATTERN "*.dll") +endif() diff --git a/TODO.md b/TODO.md index fecc2019d..5ed25b4ce 100644 --- a/TODO.md +++ b/TODO.md @@ -1,8 +1,5 @@ ##TODO -THIS IS A 2nd TEST. -THIS IS A TEST. - SuperTuxKart is looking for additional man power to make this one of the best free linux games out there :) We need (in no particular order): @@ -15,17 +12,13 @@ no particular order): - Create additional art work for tracks, background images 3. Developers - - See todo list below - it's rather long at the moment :) -4. Web master + - Check our bug and enhancement request tracker on + https://github.com/supertuxkart/stk-code/issues - Extend the current web page, keep it up to date -5. Tester +4. Tester - For just about everything - - Esp. different platforms -6. Package creators - - Create packages for - - most common Linux distributions - - Windows -7. Writers + - Esp. different platforms and graphics cards +5. Writers - Write documentation, ranging from man page, to a description for the web, to a design document, ... diff --git a/cmake/FindAngelscript.cmake b/cmake/FindAngelscript.cmake new file mode 100644 index 000000000..8cfa56bd9 --- /dev/null +++ b/cmake/FindAngelscript.cmake @@ -0,0 +1,33 @@ +# - Try to find angelscript +# Once done this will define +# +# ANGELSCRIPT_FOUND - system has angelscript +# Angelscript_INCLUDE_DIRS - the angelscript include directory +# Angelscript_LIBRARIES - the libraries needed to use angelscript +# + +FIND_PATH(Angelscript_INCLUDE_DIRS angelscript.h + PATHS + /usr/local + /usr + PATH_SUFFIXES include + ) + +FIND_LIBRARY(Angelscript_LIBRARY + NAMES angelscript angelscript_s + PATHS + /usr/local + /usr + PATH_SUFFIXES lib lib64 lib32 + ) + +# handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Angelscript DEFAULT_MSG Angelscript_LIBRARY Angelscript_INCLUDE_DIRS) + +IF (ANGELSCRIPT_FOUND) + SET(Angelscript_LIBRARIES ${Angelscript_LIBRARY}) +ENDIF (ANGELSCRIPT_FOUND) + +MARK_AS_ADVANCED(Angelscript_LIBRARY Angelscript_LIBRARIES Angelscript_INCLUDE_DIRS) diff --git a/cmake/FindFreetype.cmake b/cmake/FindFreetype.cmake new file mode 100644 index 000000000..279b646e5 --- /dev/null +++ b/cmake/FindFreetype.cmake @@ -0,0 +1,29 @@ +# - Find Freetype +# Find the Freetype includes and libraries +# +# Following variables are provided: +# FREETYPE_FOUND +# True if Freetype has been found +# FREETYPE_INCLUDE_DIRS +# The include directories of Freetype +# FREETYPE_LIBRARIES +# Freetype library list + +if(WIN32) + find_path(FREETYPE_INCLUDE_DIRS NAMES freetype/freetype.h PATHS "${PROJECT_SOURCE_DIR}/dependencies/include") + find_library(FREETPYE_LIBRARY NAMES freetype PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib") + set(FREETYPE_FOUND 1) + set(FREETPYE_LIBRARIES ${FREETPYE_LIBRARY}) +elseif(APPLE) + find_path(FREETYPE_INCLUDE_DIRS NAMES freetype/freetype.h PATHS "/Library/Frameworks/FreeType.Framework/Versions/2.4/unix/include") + find_library(FREETPYE_LIBRARY NAMES freetype PATHS "/Library/Frameworks/FreeType.Framework/Versions/2.4/") + include_directories(/Library/Frameworks/FreeType.Framework/Versions/2.4/unix/include) + set(FREETYPE_FOUND 1) + set(FREETPYE_LIBRARIES ${FREETPYE_LIBRARY}) +elseif(UNIX) + include(FindPkgConfig) + pkg_check_modules(FREETYPE freetype2) +else() + set(FREETYPE_FOUND 0) +endif() + diff --git a/cmake/Toolchain-mingw-64bit.cmake b/cmake/Toolchain-mingw-64bit.cmake new file mode 100644 index 000000000..048acad55 --- /dev/null +++ b/cmake/Toolchain-mingw-64bit.cmake @@ -0,0 +1,20 @@ +# Usage: +# cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw-64bit.cmake + +# the name of the target operating system +SET(CMAKE_SYSTEM_NAME Windows) + +# which compilers to use for C and C++ +SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix) +SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix) +SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) + +# here is the target environment located +SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32 /usr/lib/gcc/x86_64-w64-mingw32/4.9-posix ${PROJECT_SOURCE_DIR}/dependencies) + +# adjust the default behaviour of the FIND_XXX() commands: +# search headers and libraries in the target environment, search +# programs in the host environment +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ALWAYS) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/cmake/Toolchain-mingw.cmake b/cmake/Toolchain-mingw.cmake index 1ecb47ac2..9d3337d56 100644 --- a/cmake/Toolchain-mingw.cmake +++ b/cmake/Toolchain-mingw.cmake @@ -1,3 +1,6 @@ +# Usage: +# cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw.cmake + # the name of the target operating system SET(CMAKE_SYSTEM_NAME Windows) @@ -7,11 +10,11 @@ SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++-posix) SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres) # here is the target environment located -SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 ${PROJECT_SOURCE_DIR}/dependencies) +SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 /usr/lib/gcc/i686-w64-mingw32/4.9-posix ${PROJECT_SOURCE_DIR}/dependencies) # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search # programs in the host environment set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) \ No newline at end of file +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ALWAYS) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/data/CREDITS b/data/CREDITS old mode 100644 new mode 100755 index e27fbb540..64991a2a6 Binary files a/data/CREDITS and b/data/CREDITS differ diff --git a/data/achievements.xml b/data/achievements.xml index f2c94caa8..3673a160c 100644 --- a/data/achievements.xml +++ b/data/achievements.xml @@ -2,16 +2,26 @@ + + - - - - - - - + + + - + + + + + + + + + + + + + @@ -30,7 +40,7 @@ + name="Gold driver" description="Win against at least 3 opponents in all single player modes."> diff --git a/data/challenges/hacienda.challenge b/data/challenges/hacienda.challenge index c92c72108..c351d98b6 100644 --- a/data/challenges/hacienda.challenge +++ b/data/challenges/hacienda.challenge @@ -10,7 +10,7 @@ - + diff --git a/data/challenges/islandtrack.challenge b/data/challenges/islandtrack.challenge index 3b04e9e3a..bc9b888d6 100644 --- a/data/challenges/islandtrack.challenge +++ b/data/challenges/islandtrack.challenge @@ -1,6 +1,6 @@ - + @@ -10,11 +10,11 @@ - + - + diff --git a/data/challenges/jungle.challenge b/data/challenges/jungle.challenge index 3c7fbb76e..46ec0a924 100644 --- a/data/challenges/jungle.challenge +++ b/data/challenges/jungle.challenge @@ -1,19 +1,19 @@ - + - + - + - + diff --git a/data/challenges/lighthouse.challenge b/data/challenges/lighthouse.challenge index 326588621..8303cb977 100644 --- a/data/challenges/lighthouse.challenge +++ b/data/challenges/lighthouse.challenge @@ -10,11 +10,11 @@ - + - + diff --git a/data/challenges/mansion.challenge b/data/challenges/mansion.challenge index 06cc9795e..662a15879 100644 --- a/data/challenges/mansion.challenge +++ b/data/challenges/mansion.challenge @@ -10,7 +10,7 @@ - + diff --git a/data/challenges/mines.challenge b/data/challenges/mines.challenge index b50d24143..9d577f030 100644 --- a/data/challenges/mines.challenge +++ b/data/challenges/mines.challenge @@ -14,6 +14,6 @@ - + diff --git a/data/challenges/olivermath.challenge b/data/challenges/olivermath.challenge index 6eb1d72b7..2176a2b5c 100644 --- a/data/challenges/olivermath.challenge +++ b/data/challenges/olivermath.challenge @@ -6,15 +6,15 @@ - + - + - + diff --git a/data/challenges/sandtrack.challenge b/data/challenges/sandtrack.challenge index 9010c3732..189418b8e 100644 --- a/data/challenges/sandtrack.challenge +++ b/data/challenges/sandtrack.challenge @@ -10,10 +10,10 @@ - + - + diff --git a/data/challenges/scotland.challenge b/data/challenges/scotland.challenge index aece8b5a1..a5ad68208 100644 --- a/data/challenges/scotland.challenge +++ b/data/challenges/scotland.challenge @@ -10,10 +10,10 @@ - + - + diff --git a/data/challenges/snowmountain.challenge b/data/challenges/snowmountain.challenge index e4ac0c61e..db4319738 100644 --- a/data/challenges/snowmountain.challenge +++ b/data/challenges/snowmountain.challenge @@ -10,10 +10,10 @@ - + - + diff --git a/data/challenges/snowpeak.challenge b/data/challenges/snowpeak.challenge index e9e1aa4da..e6c05e284 100644 --- a/data/challenges/snowpeak.challenge +++ b/data/challenges/snowpeak.challenge @@ -10,7 +10,7 @@ - + diff --git a/data/challenges/startrack.challenge b/data/challenges/startrack.challenge index 59f905063..80f317d86 100644 --- a/data/challenges/startrack.challenge +++ b/data/challenges/startrack.challenge @@ -1,6 +1,6 @@ - + diff --git a/data/challenges/subsea.challenge b/data/challenges/subsea.challenge index 3fa34185a..05082e2c3 100644 --- a/data/challenges/subsea.challenge +++ b/data/challenges/subsea.challenge @@ -6,14 +6,14 @@ - + - + - + diff --git a/data/challenges/xr591.challenge b/data/challenges/xr591.challenge index 4f8bc4b0b..44efb0539 100644 --- a/data/challenges/xr591.challenge +++ b/data/challenges/xr591.challenge @@ -6,15 +6,15 @@ - + - + - + diff --git a/data/fonts/AR_PL_SungtiL_GB0.png b/data/fonts/AR_PL_SungtiL_GB0.png deleted file mode 100644 index 17bca4541..000000000 Binary files a/data/fonts/AR_PL_SungtiL_GB0.png and /dev/null differ diff --git a/data/fonts/BigDigitFont.xml b/data/fonts/BigDigitFont.xml deleted file mode 100755 index 8ae41eeeb..000000000 Binary files a/data/fonts/BigDigitFont.xml and /dev/null differ diff --git a/data/fonts/LayneHansom0.png b/data/fonts/LayneHansom0.png deleted file mode 100644 index 0a95d96e7..000000000 Binary files a/data/fonts/LayneHansom0.png and /dev/null differ diff --git a/data/fonts/LayneHansomBigDigits.png b/data/fonts/LayneHansomBigDigits.png deleted file mode 100644 index 63995e7dd..000000000 Binary files a/data/fonts/LayneHansomBigDigits.png and /dev/null differ diff --git a/data/fonts/Mplus2p_JP0.png b/data/fonts/Mplus2p_JP0.png deleted file mode 100644 index df680d859..000000000 Binary files a/data/fonts/Mplus2p_JP0.png and /dev/null differ diff --git a/data/fonts/StkChineseFont.xml b/data/fonts/StkChineseFont.xml deleted file mode 100755 index 5485aeecb..000000000 Binary files a/data/fonts/StkChineseFont.xml and /dev/null differ diff --git a/data/fonts/StkFont.xml b/data/fonts/StkFont.xml deleted file mode 100644 index 8653367f0..000000000 Binary files a/data/fonts/StkFont.xml and /dev/null differ diff --git a/data/fonts/StkJapaneseFont.xml b/data/fonts/StkJapaneseFont.xml deleted file mode 100644 index 6bd67b8d1..000000000 Binary files a/data/fonts/StkJapaneseFont.xml and /dev/null differ diff --git a/data/fonts/comix.png b/data/fonts/comix.png deleted file mode 100644 index c1ac074e1..000000000 Binary files a/data/fonts/comix.png and /dev/null differ diff --git a/data/fonts/materials.xml b/data/fonts/materials.xml deleted file mode 100644 index b33a66186..000000000 --- a/data/fonts/materials.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/fonts/rasheeq.xml b/data/fonts/rasheeq.xml deleted file mode 100644 index c8aedd16c..000000000 Binary files a/data/fonts/rasheeq.xml and /dev/null differ diff --git a/data/fonts/rasheeq0.png b/data/fonts/rasheeq0.png deleted file mode 100644 index 0899fe412..000000000 Binary files a/data/fonts/rasheeq0.png and /dev/null differ diff --git a/data/fonts/rasheeq1.png b/data/fonts/rasheeq1.png deleted file mode 100644 index 6aa3cb07b..000000000 Binary files a/data/fonts/rasheeq1.png and /dev/null differ diff --git a/data/fonts/rasheeq3.png b/data/fonts/rasheeq3.png deleted file mode 100644 index 8260832df..000000000 Binary files a/data/fonts/rasheeq3.png and /dev/null differ diff --git a/data/fonts/rasheeq4.png b/data/fonts/rasheeq4.png deleted file mode 100644 index f036a6b92..000000000 Binary files a/data/fonts/rasheeq4.png and /dev/null differ diff --git a/data/fonts/sigmar0.png b/data/fonts/sigmar0.png deleted file mode 100755 index 1b6939531..000000000 Binary files a/data/fonts/sigmar0.png and /dev/null differ diff --git a/data/fonts/title_font.png b/data/fonts/title_font.png deleted file mode 100644 index f22628a00..000000000 Binary files a/data/fonts/title_font.png and /dev/null differ diff --git a/data/fonts/title_font.xml b/data/fonts/title_font.xml deleted file mode 100644 index f7abb3e2e..000000000 Binary files a/data/fonts/title_font.xml and /dev/null differ diff --git a/data/fonts/title_font_2.png b/data/fonts/title_font_2.png deleted file mode 100644 index 720cea071..000000000 Binary files a/data/fonts/title_font_2.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei0.png b/data/fonts/wqyMicroHei0.png deleted file mode 100755 index 3f12274a1..000000000 Binary files a/data/fonts/wqyMicroHei0.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei1.png b/data/fonts/wqyMicroHei1.png deleted file mode 100755 index 22051fde5..000000000 Binary files a/data/fonts/wqyMicroHei1.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei2.png b/data/fonts/wqyMicroHei2.png deleted file mode 100755 index d38f128e0..000000000 Binary files a/data/fonts/wqyMicroHei2.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei3.png b/data/fonts/wqyMicroHei3.png deleted file mode 100755 index 6c4244eaa..000000000 Binary files a/data/fonts/wqyMicroHei3.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei4.png b/data/fonts/wqyMicroHei4.png deleted file mode 100755 index 7fc3f46d6..000000000 Binary files a/data/fonts/wqyMicroHei4.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei5.png b/data/fonts/wqyMicroHei5.png deleted file mode 100755 index f0050c28e..000000000 Binary files a/data/fonts/wqyMicroHei5.png and /dev/null differ diff --git a/data/fonts/wqyMicroHei6.png b/data/fonts/wqyMicroHei6.png deleted file mode 100755 index 2af5bc3a1..000000000 Binary files a/data/fonts/wqyMicroHei6.png and /dev/null differ diff --git a/data/gfx/black_smoke.xml b/data/gfx/black_smoke.xml index 156bd6d20..1aae15080 100644 --- a/data/gfx/black_smoke.xml +++ b/data/gfx/black_smoke.xml @@ -4,25 +4,27 @@ - + - + - + diff --git a/data/gfx/confetti.xml b/data/gfx/confetti.xml new file mode 100644 index 000000000..451d7d61e --- /dev/null +++ b/data/gfx/confetti.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/gfx/confetti_bleu.xml b/data/gfx/confetti_bleu.xml new file mode 100644 index 000000000..e74ea8fdc --- /dev/null +++ b/data/gfx/confetti_bleu.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/gfx/gfx_blueNebula_a.xml b/data/gfx/gfx_blueNebula_a.xml new file mode 100644 index 000000000..8c7508a9e --- /dev/null +++ b/data/gfx/gfx_blueNebula_a.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/gfx/gfx_bubbleFast_a.xml b/data/gfx/gfx_bubbleFast_a.xml new file mode 100644 index 000000000..035c72c5e --- /dev/null +++ b/data/gfx/gfx_bubbleFast_a.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/gfx/gfx_bubble_a.xml b/data/gfx/gfx_bubble_a.xml new file mode 100644 index 000000000..3c44ccda5 --- /dev/null +++ b/data/gfx/gfx_bubble_a.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/gfx/gfx_fireworkExplosion_a.xml b/data/gfx/gfx_fireworkExplosion_a.xml new file mode 100644 index 000000000..1522a06d4 --- /dev/null +++ b/data/gfx/gfx_fireworkExplosion_a.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/gfx/gfx_fireworkGreen_a.xml b/data/gfx/gfx_fireworkGreen_a.xml new file mode 100644 index 000000000..336924ee7 --- /dev/null +++ b/data/gfx/gfx_fireworkGreen_a.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/gfx/gfx_fireworkSmoke_a.xml b/data/gfx/gfx_fireworkSmoke_a.xml new file mode 100644 index 000000000..ca6de1aae --- /dev/null +++ b/data/gfx/gfx_fireworkSmoke_a.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/gfx/gfx_firework_a.xml b/data/gfx/gfx_firework_a.xml new file mode 100644 index 000000000..a93a58f21 --- /dev/null +++ b/data/gfx/gfx_firework_a.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/gfx/gfx_sandExplosion_a.xml b/data/gfx/gfx_sandExplosion_a.xml new file mode 100644 index 000000000..5ad4df9ef --- /dev/null +++ b/data/gfx/gfx_sandExplosion_a.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/gfx/gfx_smallWaterFlow.xml b/data/gfx/gfx_smallWaterFlow.xml new file mode 100644 index 000000000..5203ff9ac --- /dev/null +++ b/data/gfx/gfx_smallWaterFlow.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/gfx/gfx_sparkBlue_a.xml b/data/gfx/gfx_sparkBlue_a.xml new file mode 100644 index 000000000..533b01ce8 --- /dev/null +++ b/data/gfx/gfx_sparkBlue_a.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/gfx/gfx_sparkFire_a.xml b/data/gfx/gfx_sparkFire_a.xml index af9f4d14d..eae403120 100644 --- a/data/gfx/gfx_sparkFire_a.xml +++ b/data/gfx/gfx_sparkFire_a.xml @@ -1,9 +1,9 @@ - + - + - diff --git a/data/grandprix/2_offthebeatentrack.grandprix b/data/grandprix/2_offthebeatentrack.grandprix index abb51915f..a53170f6b 100644 --- a/data/grandprix/2_offthebeatentrack.grandprix +++ b/data/grandprix/2_offthebeatentrack.grandprix @@ -1,7 +1,7 @@ - + diff --git a/data/grandprix/3_tothemoonandback.grandprix b/data/grandprix/3_tothemoonandback.grandprix index 9fd8315ab..2d0f4b104 100644 --- a/data/grandprix/3_tothemoonandback.grandprix +++ b/data/grandprix/3_tothemoonandback.grandprix @@ -1,11 +1,11 @@ - - - - - + + + + + diff --git a/data/graphical_restrictions.xml b/data/graphical_restrictions.xml index 0d8ad3477..16bb60729 100644 --- a/data/graphical_restrictions.xml +++ b/data/graphical_restrictions.xml @@ -2,6 +2,8 @@ + + @@ -10,6 +12,14 @@ - + + + + + + + + diff --git a/data/gui/challenges.stkgui b/data/gui/challenges.stkgui deleted file mode 100644 index a109ad5a8..000000000 --- a/data/gui/challenges.stkgui +++ /dev/null @@ -1,20 +0,0 @@ - - - - -
- -
- - - - - - - - - - -
- diff --git a/data/gui/custom_video_settings.stkgui b/data/gui/custom_video_settings.stkgui index 2ae3c8eed..35039a75a 100644 --- a/data/gui/custom_video_settings.stkgui +++ b/data/gui/custom_video_settings.stkgui @@ -25,9 +25,20 @@
-
diff --git a/data/gui/gpedit.stkgui b/data/gui/edit_gp.stkgui similarity index 100% rename from data/gui/gpedit.stkgui rename to data/gui/edit_gp.stkgui diff --git a/data/gui/enter_player_name_dialog.stkgui b/data/gui/enter_player_name_dialog.stkgui deleted file mode 100644 index 45176b442..000000000 --- a/data/gui/enter_player_name_dialog.stkgui +++ /dev/null @@ -1,21 +0,0 @@ - - -
- -
- diff --git a/data/gui/gpeditor.stkgui b/data/gui/grand_prix_editor.stkgui similarity index 100% rename from data/gui/gpeditor.stkgui rename to data/gui/grand_prix_editor.stkgui diff --git a/data/gui/help1.stkgui b/data/gui/help1.stkgui index 3b9be504b..ee9d19613 100644 Binary files a/data/gui/help1.stkgui and b/data/gui/help1.stkgui differ diff --git a/data/gui/help2.stkgui b/data/gui/help2.stkgui index 4eff122aa..c3fb7f712 100644 Binary files a/data/gui/help2.stkgui and b/data/gui/help2.stkgui differ diff --git a/data/gui/help3.stkgui b/data/gui/help3.stkgui index cda9a7991..dfe2f9dfd 100644 Binary files a/data/gui/help3.stkgui and b/data/gui/help3.stkgui differ diff --git a/data/gui/main.stkgui b/data/gui/main_menu.stkgui similarity index 86% rename from data/gui/main.stkgui rename to data/gui/main_menu.stkgui index 11769b286..ab4bac2f7 100644 --- a/data/gui/main.stkgui +++ b/data/gui/main_menu.stkgui @@ -39,31 +39,31 @@ - - - - - - - - - - - - - diff --git a/data/gui/online/create_server.stkgui b/data/gui/online/create_server.stkgui index c8f539388..5187f73e2 100644 --- a/data/gui/online/create_server.stkgui +++ b/data/gui/online/create_server.stkgui @@ -1,7 +1,7 @@
-
+
diff --git a/data/gui/online/main.stkgui b/data/gui/online/main.stkgui deleted file mode 100644 index 37d7d2f36..000000000 --- a/data/gui/online/main.stkgui +++ /dev/null @@ -1,46 +0,0 @@ - - -
- -
- - -
- -
- - - - - - - - - - - - - -
- - - diff --git a/data/gui/online/lobby.stkgui b/data/gui/online/networking_lobby.stkgui similarity index 97% rename from data/gui/online/lobby.stkgui rename to data/gui/online/networking_lobby.stkgui index a86e226d7..6daff0e57 100644 --- a/data/gui/online/lobby.stkgui +++ b/data/gui/online/networking_lobby.stkgui @@ -7,7 +7,7 @@
-
diff --git a/data/gui/online/online_screen.stkgui b/data/gui/online/online_screen.stkgui new file mode 100644 index 000000000..b8ee57373 --- /dev/null +++ b/data/gui/online/online_screen.stkgui @@ -0,0 +1,63 @@ + + +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/data/gui/online/profile_achievements_tab.stkgui b/data/gui/online/profile_achievements_tab.stkgui index 33b0900d1..7d519d661 100644 --- a/data/gui/online/profile_achievements_tab.stkgui +++ b/data/gui/online/profile_achievements_tab.stkgui @@ -9,7 +9,7 @@ - diff --git a/data/gui/online/profile_friends.stkgui b/data/gui/online/profile_friends.stkgui index 50e933392..e0e49473b 100644 --- a/data/gui/online/profile_friends.stkgui +++ b/data/gui/online/profile_friends.stkgui @@ -9,7 +9,7 @@ - + diff --git a/data/gui/online/profile_overview.stkgui b/data/gui/online/profile_overview.stkgui index 158d95f43..eed9c717b 100644 --- a/data/gui/online/profile_overview.stkgui +++ b/data/gui/online/profile_overview.stkgui @@ -12,7 +12,7 @@ - + diff --git a/data/gui/online/profile_settings.stkgui b/data/gui/online/profile_settings.stkgui index d021747ba..d89d52c23 100644 --- a/data/gui/online/profile_settings.stkgui +++ b/data/gui/online/profile_settings.stkgui @@ -8,7 +8,7 @@ - + @@ -17,7 +17,7 @@
-
diff --git a/data/gui/online/register.stkgui b/data/gui/online/register.stkgui index 3a64972c6..fb6803e7f 100644 --- a/data/gui/online/register.stkgui +++ b/data/gui/online/register.stkgui @@ -18,7 +18,7 @@
diff --git a/data/gui/online/registration_terms.stkgui b/data/gui/online/registration_terms.stkgui index cf6d202a4..1447495be 100644 --- a/data/gui/online/registration_terms.stkgui +++ b/data/gui/online/registration_terms.stkgui @@ -7,7 +7,7 @@ - +
diff --git a/data/gui/options_input.stkgui b/data/gui/options_input.stkgui index e4a230d5f..ec6ed5271 100644 --- a/data/gui/options_input.stkgui +++ b/data/gui/options_input.stkgui @@ -30,7 +30,7 @@
diff --git a/data/gui/options_ui.stkgui b/data/gui/options_ui.stkgui index 1e7273744..2c654be7b 100644 --- a/data/gui/options_ui.stkgui +++ b/data/gui/options_ui.stkgui @@ -58,7 +58,7 @@
-
diff --git a/data/gui/racesetup.stkgui b/data/gui/race_setup.stkgui similarity index 100% rename from data/gui/racesetup.stkgui rename to data/gui/race_setup.stkgui diff --git a/data/gui/scripting_console.stkgui b/data/gui/scripting_console.stkgui new file mode 100644 index 000000000..f900753a9 --- /dev/null +++ b/data/gui/scripting_console.stkgui @@ -0,0 +1,17 @@ + + +
+ +
+ diff --git a/data/gui/select_challenge.stkgui b/data/gui/select_challenge.stkgui index 931b51db8..2d8e562b8 100644 --- a/data/gui/select_challenge.stkgui +++ b/data/gui/select_challenge.stkgui @@ -7,7 +7,7 @@
-
diff --git a/data/gui/tutorial.stkgui b/data/gui/tutorial.stkgui deleted file mode 100644 index a8b92bc03..000000000 --- a/data/gui/tutorial.stkgui +++ /dev/null @@ -1,19 +0,0 @@ - - - - -
- -
- - - - - - - - -
- -