Merge branch 'master' into sqlmasters

.gitignore

@@ -6,6 +6,7 @@ datasrc/*.pyc
 objs
 src/game/generated
 SDL.dll
+SDL2.dll
 freetype.dll
 
 crapnet*

README.md

@@ -19,3 +19,5 @@ DDNet requires additional libraries, that are bundled for the most common platfo
 If you have the libraries installed, but still want to use the bundled ones instead, you can specify so by running `bam config curl.use_pkgconfig=false opus.use_pkgconfig=false opusfile.use_pkgconfig=false ogg.use_pkgconfig=false`.
 
 The MySQL server is not included in the binary releases and can be built with `bam server_sql_release`. It requires `libmariadbclient-dev`, `libmysqlcppconn-dev` and `libboost-dev`, which are also bundled for the common platforms.
+
+Note that the bundled MySQL libraries might not work properly on your system. If you run into connection problems with the MySQL server, for example that it connects as root while you chose another user, make sure to install your system libraries for the MySQL client and C++ connector. Make sure that `mysql.use_mysqlconfig` is set to `true` in your config.lua.

autoexec_server.cfg

@@ -91,7 +91,7 @@ sv_announcement_interval 120
 sv_announcement_random 1
 
 # Message of the day to display when joining the server (use "\n" to create new line)
-sv_motd "Testserver with DDraceNetwork Features!\nDon't forget to check server rules by using /rules\n\nWrite /kill to restart your race"
+sv_motd "Testserver with DDraceNetwork Features!\nDon't forget to check server rules by using /rules"
 
 # Use default DDRace rules
 sv_ddrace_rules 1

bam.lua

@@ -148,7 +148,7 @@ server_sql_depends = {}
 if family == "windows" then
 	if platform == "win32" then
 		table.insert(client_depends, CopyToDirectory(".", "other/freetype/lib32/freetype.dll"))
-		table.insert(client_depends, CopyToDirectory(".", "other/sdl/lib32/SDL.dll"))
+		table.insert(client_depends, CopyToDirectory(".", "other/sdl/lib32/SDL2.dll"))
 
 		table.insert(client_depends, CopyToDirectory(".", "other/curl/windows/lib32/libcurl.dll"))
 		table.insert(client_depends, CopyToDirectory(".", "other/curl/windows/lib32/libeay32.dll"))
@@ -163,7 +163,7 @@ if family == "windows" then
 		table.insert(client_depends, CopyToDirectory(".", "other/opus/windows/lib32/libopusfile-0.dll"))
 	else
 		table.insert(client_depends, CopyToDirectory(".", "other/freetype/lib64/freetype.dll"))
-		table.insert(client_depends, CopyToDirectory(".", "other/sdl/lib64/SDL.dll"))
+		table.insert(client_depends, CopyToDirectory(".", "other/sdl/lib64/SDL2.dll"))
 
 		table.insert(client_depends, CopyToDirectory(".", "other/curl/windows/lib64/libcurl.dll"))
 		table.insert(client_depends, CopyToDirectory(".", "other/curl/windows/lib64/libeay32.dll"))

circle.yml

@@ -1,7 +1,10 @@
 dependencies:
   pre:
     - |
-        sudo apt-get update; sudo apt-get build-dep teeworlds
+        sudo add-apt-repository -y ppa:zoogie/sdl2-snapshots
+        sudo apt-get update
+        sudo apt-get build-dep teeworlds
+        sudo apt-get install libsdl2-dev
 
         if [ ! -x ~/bam/bam ]; then
           git clone https://github.com/matricks/bam ~/bam/