hiker
2f126ab226
Moved NetworkPlayerProfile into its own file, added getter and
...
setters for it.
2015-11-26 07:41:37 +11:00
hiker
927969e720
Added new server state for 'selecting karts'.
2015-11-24 07:55:58 +11:00
hiker
078de5fe93
Server-side authorisation now implemented if client is on
...
same IP address.
2015-11-24 07:53:51 +11:00
hiker
981a4ab234
Fix crash when disconnecting.
2015-11-23 17:22:12 +11:00
hiker
3e9e9349c0
Removed commented out code.
2015-11-23 17:21:51 +11:00
hiker
07876a0899
Fixed linux compilation
2015-11-23 11:40:33 +11:00
hiker
064414afa3
Added server-side test to see if client is authorised to send commands.
2015-11-23 08:26:18 +11:00
hiker
da2671c6ee
An 'authorised' client can now tell the server to select karts.
2015-11-23 08:08:23 +11:00
hiker
0f38d6fb8a
Don't add same peer twice (which causes a crash when the peer disconnects etc)
2015-11-23 08:03:15 +11:00
hiker
093283c5b0
Avoid crash if networking was selected, but not actually started.
2015-11-21 12:20:05 +11:00
hiker
1700395dc2
Fixed crash when no votes for a category have been received.
2015-11-21 12:01:45 +11:00
hiker
68bcd4bde3
Cosmetic changes only.
2015-11-21 11:49:15 +11:00
hiker
10bed9a20d
Used more names for protocol commands, and use switch instead of if's.
2015-11-21 10:39:56 +11:00
hiker
3ab66592cd
Only minor cosmetic changes.
2015-11-20 17:02:47 +11:00
hiker
7a2c7125e5
Used enums instead of numbers for lobby protocol subcommands.
2015-11-20 16:41:54 +11:00
hiker
73e14a964a
Cosmetic changes only.
2015-11-20 08:16:41 +11:00
hiker
c3e74d344f
Add warning message in case of an unknown command, and do not send
...
it to the servrer (which typically just confuses it).
2015-11-20 08:07:31 +11:00
hiker
683f0fdc07
Fixed incorrect index.
2015-11-19 14:21:56 +11:00
hiker
b55b91edf1
Use const & for std::string, cosmetic changes.
2015-11-19 14:20:10 +11:00
hiker
2b687e1051
Avoid crash when voting.
2015-11-19 14:19:01 +11:00
hiker
e7cc868c85
Removed uneccesary vector copy.
2015-11-19 14:18:34 +11:00
hiker
4813637a37
Cosmetic changes only.
2015-11-19 09:21:28 +11:00
hiker
5994123b98
Fixed crash.
2015-11-19 09:21:03 +11:00
hiker
e6c2620c90
Print 'hide address' only in WAN mode; remove commented out code.
2015-11-18 13:44:25 +11:00
hiker
90b92419f3
Avoid crash in case that a player is not logged in online.
2015-11-18 08:15:22 +11:00
hiker
17f588bcf2
Fixed storing of EnetAddresses in TransportAddress.
2015-11-18 08:14:58 +11:00
hiker
29e0b50e14
Removed friend declaration; fixed crash caused by deleting the
...
ENetPeer when deleting an (STK) Event.
2015-11-17 08:11:07 +11:00
hiker
0ed22d0d6e
Fixed debug message.
2015-11-16 18:46:04 +11:00
hiker
785b9a9130
Don't try to hide address in LAN networking, other minor fixes.
2015-11-16 18:43:46 +11:00
hiker
4a3c4c552e
LAN clients now start to connect to the server.
2015-11-13 08:50:03 +11:00
hiker
af9018ea64
Moved Server and ServersManager into network directory.
2015-11-12 17:52:04 +11:00
hiker
2e65b23539
Don't poll stk server if this is a LAN server.
2015-11-12 09:58:21 +11:00
hiker
5fc830825f
Refactoring: Created a separate NetworkConfiguration class which stores
...
all information to create the STKHost.
2015-11-12 09:53:12 +11:00
hiker
51411a796a
Minor refactoring of lan handling, added client's ip address and port
...
to the answer from the client (which can later be used when the
client requests a connection from a server).
2015-11-10 17:00:47 +11:00
hiker
36ebe29649
Fixed typo.
2015-11-10 08:08:22 +11:00
hiker
cdbc5cf15d
One more linux compilation fix.
2015-11-09 21:51:05 +11:00
hiker
d4856f6d64
Added missing #include for memcpy.
2015-11-09 21:38:18 +11:00
hiker
453ce8cf60
Added LAN server discovery.
2015-11-09 20:51:00 +11:00
hiker
9d9b83059d
Fixed deadlock (when while handing a request another request was queued).
2015-11-07 00:19:16 +11:00
hiker
47a7bd1caf
Print correct protocol name in 'has been terminated" message.
2015-11-06 16:32:18 +11:00
hiker
00843b8685
Fixed typos.
2015-11-06 16:30:34 +11:00
hiker
541509f29a
Added new requestPause and requestUnpause commands for protocols,
...
minor code cleanups and improvements.
2015-11-06 16:11:12 +11:00
hiker
e14bc572b6
Fixed typo in comment (thanks to leyyin).
2015-11-05 23:35:37 +11:00
hiker
847a788a9c
Removed server creation request (which is now down automatically
...
from STKHost).
2015-11-05 23:34:27 +11:00
hiker
bec317b9ed
Added documentation to the table use and protocol between
...
game server/client and the stk server.
2015-11-05 08:03:06 +11:00
hiker
c99ad34cb0
Coding style changes.
2015-11-05 08:02:17 +11:00
hiker
73c59db858
Reverted to previous version of protocol (since it is not yet
...
supported by the server).
2015-11-05 08:01:37 +11:00
hiker
4fc46c510f
Fixed too early release of objects, and some state changes in finite state machine.
2015-11-05 08:00:45 +11:00
hiker
6946306c4c
Fixed memory leak (thanks to CruzR).
2015-11-02 10:55:17 +11:00
hiker
d7d2115abd
Removed setupClient (which is now done in the constructor).
2015-11-02 09:14:35 +11:00
hiker
0b62d2f82b
Created two different constructors for STKHost - one for server, one for client.
2015-11-02 08:11:51 +11:00
hiker
6add49b065
Allow WAN server creation from GUI.
2015-11-01 23:42:24 +11:00
hiker
f05ee47e2b
Moved lan/wan setting to static functions in STKHost.
2015-11-01 22:16:57 +11:00
hiker
1334a467e3
Don't start a STKHost if neither client nor server is requested.
2015-11-01 19:45:28 +11:00
hiker
f2ae36fc65
Simplified ConnectToPeer (no more fsm).
2015-10-31 11:40:41 +11:00
hiker
8585afb713
Minor code cleanup.
2015-10-30 17:00:57 +11:00
hiker
94bc18df52
Removed ShowPublicAddress protocol, instead submit blocking
...
request in ConnectToServer.
2015-10-30 16:45:43 +11:00
hiker
dd289dc1cd
Removed polling for GetPublicAddress with callback.
2015-10-29 18:58:18 +11:00
hiker
ef310a5666
Renamed types.hpp to transport_address.hpp.
2015-10-29 18:39:01 +11:00
hiker
83154ae3a7
Converted the CallbackObject to actually call a function. This
...
means that if protocol A starts protocol B and needs a result from B,
previously B would set a (potential private) variable in A. Now
B calls a callback in A, where the result can be set.
2015-10-29 18:27:55 +11:00
hiker
966d31dc45
Cosmetic changes, removed unused and unimplemented 'stop protocol' support.
2015-10-28 17:22:09 +11:00
hiker
cf9ce6674c
Removed unused class.
2015-10-28 17:08:01 +11:00
hiker
5df6c225ef
Cosmetic changes only.
2015-10-28 08:57:05 +11:00
hiker
e919b97037
Removed unnecessary getProtocolState functions.
2015-10-28 08:24:05 +11:00
hiker
2909e42a25
Minor code cleanup for ConnectToPeer handling.
2015-10-28 08:21:35 +11:00
hiker
7e202d94a8
Removed hardcoded maximum number of players.
2015-10-28 08:03:05 +11:00
hiker
60bbfe3ab3
Remved StartServer protocol, and used executeNow() in ServerLobby instead.
2015-10-28 08:01:46 +11:00
hiker
e212276dd2
Move enet initialisation into STKHost.
2015-10-27 16:58:40 +11:00
hiker
10f8f6b3a5
Removed unnecessary function, added some docs.
2015-10-27 16:46:26 +11:00
hiker
f7f12d5431
Renmated ServerConsole to NetworkConsole.
2015-10-27 16:38:22 +11:00
hiker
c511fc48af
Added leak checking.
2015-10-27 08:44:28 +11:00
hiker
b47b8bd196
Removed empty file.
2015-10-27 08:25:52 +11:00
hiker
6297d8c65d
Removed NetworkManager and ClientNetworkManager.
2015-10-27 08:23:59 +11:00
hiker
7d04cc78de
Fixed printing of type name.
2015-10-27 00:26:14 +11:00
hiker
90b8db9993
Start to remove ClientNetworkManager.
2015-10-27 00:23:20 +11:00
hiker
a58f408a99
Merge branch 'refactor_networking' of https://github.com/supertuxkart/stk-code into refactor_networking
2015-10-26 21:31:11 +11:00
hiker
1e9afd473d
Removed isClient/isServer from NetworkManager.
2015-10-26 21:30:41 +11:00
hiker
5564239773
Removed NetworkManager::run().
2015-10-26 18:33:23 +11:00
hiker
b788aa6e95
Removed NetworkManager::isConnectedTO
2015-10-26 18:31:32 +11:00
hiker
d45d5a1051
Fixed type name debug print.
2015-10-26 18:29:28 +11:00
hiker
334780b5d7
Moved sendPacket from NetworkManager to STKHost.
2015-10-26 18:26:53 +11:00
hiker
51d39879b4
Moved NetworkManager::connect and STKPeer::connextTo functions into STKHost.
2015-10-26 18:01:07 +11:00
hiker
0bd2b48ea0
Removed sendPacket function and destructor.
2015-10-26 17:55:19 +11:00
hiker
cf51d2f0e0
Added missing object deletions.
2015-10-26 17:54:19 +11:00
hiker
4c0a195fdd
Moved handling of peers from NetworkManager to STKHost.
2015-10-26 08:33:07 +11:00
hiker
c273e709eb
Fixed linux compilation.
2015-10-26 08:25:43 +11:00
hiker
f610573295
Removed unnecessary function.
2015-10-25 20:28:35 +11:00
hiker
85cca69113
Moved GameSetup handling from NetworkManager to STKHost.
2015-10-25 00:19:30 +11:00
hiker
34f0d1b349
Moved public address data from NetworkManager to STKHost.
2015-10-24 23:30:34 +11:00
hiker
350f434c37
Started to refactor network code.
2015-10-24 12:39:17 +11:00
hiker
b8cd9cfb81
Removed unused functions.
2015-10-22 23:41:49 +11:00
hiker
e6ae208b4f
Removed many unnecessary copies of NetworkString.
2015-10-22 21:43:06 +11:00
hiker
c59f958c2f
Removed unnecessary #include, and disabled copying of STKPeer.
2015-10-22 18:46:01 +11:00
hiker
a102d97e3a
Cosmetic changes, some minor refactoring.
2015-10-22 18:40:52 +11:00
hiker
1f4f2bce86
Coding style changes.
2015-10-22 16:03:11 +11:00
hiker
b8837d5d59
Coding style changes.
2015-10-22 14:54:12 +11:00
hiker
6213959f31
Cosmetic/coding style changes.
2015-10-22 11:03:41 +11:00
hiker
25ca5646ff
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-22 00:03:11 +11:00
hiker
d6e7ddf000
Avoid copying STK Events for networking.
2015-10-22 00:02:40 +11:00
hiker
f297c92039
Removed more includes of event.hpp in hpp files.
2015-10-21 17:39:53 +11:00
hiker
841d9b248e
Removed some unnecessary #includes.
2015-10-21 17:31:33 +11:00
hiker
1a0fb9fa4c
Renamed notifyEvent to propagateEvent for the manager to avoid
...
'duplicated' name (notifyEvent also exists in each protocol).
2015-10-21 17:18:27 +11:00
hiker
40629d9816
Changed Event's m_peer from STKPeer** to STKPeer *. Fixes some minor memory leaks.
2015-10-21 08:11:35 +11:00
hiker
814f248cbd
Fixed linux compilation.
2015-10-21 08:09:24 +11:00
hiker
9cdf7058a7
More coding style fixes.
2015-10-21 08:07:00 +11:00
hiker
94e87796f5
Coding style fixes.
2015-10-21 07:51:53 +11:00
hiker
54a0e50fe3
Try to fix linux compilation.
2015-10-21 00:18:51 +11:00
hiker
0dfa05227e
Cosmetic changes mostly, removed unused functions.
2015-10-20 22:42:57 +11:00
hiker
d5a9364ece
Minor cosmetic changes.
2015-10-19 17:06:14 +11:00
hiker
8d0c22346d
Cosmetic changes only.
2015-10-19 08:15:43 +11:00
hiker
e535afc9d8
Cosmetic changes only.
2015-10-19 08:11:28 +11:00
hiker
faf697ef5d
Made access to the public address thread safe, and simplified setting
...
of the public address.
2015-10-19 08:02:44 +11:00
hiker
aeec90fa0d
Removed many unnecessary copies of TransportAddress.
2015-10-16 23:55:54 +11:00
Daniel Butum
8cfa2f925a
Fix linux compilation
2015-10-16 11:22:20 +03:00
hiker
162bcced37
Make m_ip and m_port in TransportAddress private (adding setters and getters).
2015-10-16 16:59:42 +11:00
hiker
83811d2960
More compilation fixes :(
2015-10-16 10:37:20 +11:00
hiker
8183760cd9
Fix travis build.
2015-10-16 10:28:29 +11:00
hiker
517ba2c2df
Cosmetic changes, added some convenience functions.
2015-10-16 00:52:28 +11:00
hiker
9a55da5c2c
Reserve space for NetworkStrings (to reduce copying when reallocating).
2015-10-16 00:03:23 +11:00
hiker
e7860e1c14
Fixed compiler warnings.
2015-10-15 21:48:17 +11:00
hiker
beca77e94f
Use NetworkString for stun response data.
2015-10-14 00:18:13 +11:00
hiker
192e2f99b5
Merge branch 'konstin-dev'
2015-10-13 22:09:11 +11:00
hiker
7356958774
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2015-10-13 21:12:22 +11:00
hiker
86574e4521
Added comments and further cosmetic changes. Removed some duplicated functions.
2015-10-13 20:53:53 +11:00
Deve
375e7ea0ed
More fixes for 64-bit mingw
2015-10-13 01:05:41 +02:00
hiker
3a023776fd
Minor style changes.
2015-10-13 09:19:40 +11:00
hiker
356588e09a
Merge branch 'dev' of https://github.com/konstin/stk-code into konstin-dev
2015-10-12 22:42:34 +11:00
hiker
c1d280eaa1
Cosmetic changes only.
2015-10-12 21:37:22 +11:00
hiker
c0b7fec58a
Replaced another mutex with Sychronised.
2015-10-12 10:06:30 +11:00
hiker
47cb6ac2e3
Used Synchronised instead of pthread mutex.
2015-10-12 08:18:15 +11:00
hiker
124420b90a
Cosmetic changes only.
2015-10-12 08:02:20 +11:00
konstin
c78abbddf7
try to fix travis CI compilation
2015-08-15 15:10:30 +02:00
konstin
1eb3b6f74e
More small improvements
2015-08-15 15:04:31 +02:00
konstin
d9697cbbe0
order functions chronologically
2015-08-15 15:04:31 +02:00
konstin
a4fa65673e
huge amount of small improvements, most thanks to leyyin
2015-08-15 15:04:31 +02:00
konstin
1ce3be98ee
Move the STUN request creating and sending from GetPublicAddress::asynchronousUpdate() into its own function
2015-08-15 15:04:30 +02:00
konstin
5ec9fa38ab
Implement a consistent error managing for GetPublicAddress::asynchronousUpdate() by moving the STUN response parsing into its own function
2015-08-15 15:04:30 +02:00
konstin
ee06cd3ba2
Improve readability and add documentation for GetPublicAddress::asynchronousUpdate()
2015-08-15 15:04:29 +02:00
Flakebi
fbf26df23d
Merge branch 'master' into fixes
...
Conflicts:
src/graphics/2dutils.cpp
src/graphics/graphics_restrictions.cpp
src/graphics/render_skybox.cpp
src/graphics/rtts.hpp
2015-07-03 15:29:53 +02:00
hiker
8d07d26c25
Updated (c) year to include 2015.
2015-03-30 11:42:50 +11:00
hiker
bcd9654a86
Added missing GPL license.
2015-03-30 11:42:28 +11:00
hiker
c579eba6db
Removed empty file.
2015-03-30 09:58:28 +11:00
Flakebi
19ce806563
Fix warnings about shift size
2015-02-04 18:33:26 +01:00
Flakebi
d6fee72295
Merge branch 'origin/master' into fixes
...
Conflicts:
src/graphics/graphics_restrictions.cpp
2015-01-23 00:15:40 +01:00
hiker
f724369a8e
Merge branch 'freebsd-fixes' of https://github.com/leper/stk-code into leper-freebsd-fixes
2015-01-20 14:56:25 +11:00
Flakebi
9c6dd1c1b5
Fix some compiler warnings
2015-01-18 23:28:53 +01:00
Deve
d0f96a7673
Allow to cross-compile Windows build under Linux using MinGW.
...
It works fine on Ubuntu. You only need to use:
cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw.cmake
2015-01-08 21:46:59 +01:00
leper
1718cb2fce
FreeBSD build fixes.
...
Irrlicht change also submitted upstream https://sourceforge.net/p/irrlicht/patches/300/ .
2015-01-02 17:58:16 +01:00
hiker
006a7f95c9
Cherrypicked pull request #1743 (cppcheck performance fixes).
2014-12-01 15:14:27 +11:00
Flakebi
abf7bacfea
Merge branch 'upstream/master' into perPlayerDifficulties
...
Conflicts:
src/graphics/stkmesh.cpp
src/states_screens/kart_selection.cpp
2014-10-31 16:47:34 +01:00
hiker
b66fb2e56b
Removed unnecessary parameter for gamepads in processAndMapInput,
...
started a common virtual function for processAndMapInput. Removed
unnecessary #includes, cosmetic changes.
2014-10-28 09:00:22 +11:00
Flakebi
690e632e1b
Move handicap to ui options and to the player name spinner
2014-10-26 16:56:50 +01:00
hiker
ec908d85c6
Split GamepadDevice and KeyboarDevice from input_device into their
...
own files. Renamed InputManager::getDeviceList() to getDeviceManager().
2014-10-25 23:09:00 +11:00
Flakebi
57afd1d585
Merge remote-tracking branch 'origin/master' into perPlayerDifficulties, this time the right branch...
...
Conflicts:
data/gui/user_screen.stkgui
data/gui/user_screen_tab.stkgui
src/graphics/glwrap.cpp
src/graphics/weather.cpp
src/states_screens/user_screen.cpp
2014-10-20 22:36:54 +02:00
auriamg
3061123e3e
Merge pull request #1606 from Flakebi/fix
...
Fix some more bugs
2014-10-08 18:18:37 -04:00
deve
f8de826888
Fixed compiler warnings
2014-10-08 14:44:05 +02:00
Flakebi
069853b11f
Fix #1153 Cleanup logging code
2014-10-07 20:54:54 +02:00
Flakebi
47da30dd24
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-30 19:22:18 +02:00
Deve
b3c6cbf5d8
Fixed linux compilation
2014-09-29 18:19:22 +02:00
deve
226eeb2718
Add inet_ntop function for mingw compiler
2014-09-29 09:19:38 +02:00
hiker
cccf86e6a6
Bugfix: packet_log file would be overwritten at the end of a run.
2014-09-25 17:19:55 +10:00
hiker
679a6a7676
Fix #1567 (don't write packets_log.txt in cwd).
2014-09-25 17:15:05 +10:00
Flakebi
2cf9707294
Merge branch 'upstream/master' into perPlayerDifficulties
...
Conflicts:
src/states_screens/kart_selection.cpp
I hope I got everything
2014-09-24 17:58:12 +02:00
hiker
aa64f31f83
Added Screen::push() function to shorten the calls to pushScreen().
2014-09-23 16:43:50 +10:00
hiker
c28728d903
Removed more compiler warnings for 64 bit windows compilation.
2014-09-23 16:23:22 +10:00
hiker
e4f38fa244
Disable console thread from networking code - not needed atm, and
...
making this thread safe is not trivial.
2014-09-23 07:48:21 +10:00
hiker
a550f6bf6b
Try to make crash in #1529 unlikely - though it needs a proper fix still.
2014-09-22 23:57:37 +10:00
Flakebi
5858c05e74
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-05 22:46:17 +02:00
deve
e57b927c96
Allow to compile STK on Windows using MinGW compiler.
...
It needs vorbis dll's as additional dependencies.
TODO: add an alternative to inet_ntop function.
TODO: link wiimote library
2014-09-03 14:08:23 +02:00
Flakebi
dc4a30202f
Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties
2014-09-01 11:31:26 +02:00
hiker
46396f4a7e
Fix #1484 (crash on windows in release mode).
2014-08-27 13:46:42 +10:00
Daniel Butum
c6c0c6e590
Rename some API calls
2014-08-05 19:12:56 +03:00
Daniel Butum
c10ca31452
Use new API paths when calling the stk server
2014-08-04 21:55:56 +03:00
Daniel Butum
b3f9f9f407
Refactor online namespace. Define api php file names from a single place
2014-08-04 18:41:47 +03:00
Flakebi
a84094e55e
Add difficulty to karts
2014-07-29 22:54:42 +02:00
Flakebi
71f8766cb1
Add per-player difficulty
2014-07-28 18:32:39 +02:00
Flakebi
55090a0566
Unify log output
2014-07-22 12:54:11 +02:00
vlj
14e3ccd059
Duplicate singleton code for abstract/non abstract cases
2014-07-17 01:30:45 +02:00
Marianne Gagnon
415a502ef1
As requested by vlj, move singleton from networking to utils
2014-07-13 18:03:26 -04:00
konstin
acc32703ed
Merge branch 'master' of https://github.com/supertuxkart/stk-code into a
2014-06-05 18:26:28 +02:00
Flakebi
af6c121a22
Run whitespaces.py
2014-06-04 15:10:20 +02:00
konstin
0db8531a5d
Merge branch 'master' of https://github.com/supertuxkart/stk-code into a
2014-06-02 16:57:14 +02:00
konstin
ce661a4dd4
add a reverse spinner
2014-06-02 16:56:59 +02:00
hiker
e39f2164b5
Removed OnlineProfile from ActivePlayer, since it was not used at all.
2014-05-31 10:26:02 +10:00
Marianne Gagnon
03ad82267a
Fix OSX 10.7 compilation
2014-05-13 19:39:19 -04:00
hiker
447ca89c0a
Removed CurrentUser usage from all files except PlayerManager
...
and PlayerProfile.
2014-04-16 11:13:35 +10:00
hiker
5ec71c5b06
Moved getProfile from CurrentUser to PlayerManager::getCurrentOnlineProfile().
2014-04-15 16:25:55 +10:00
hiker
071aa01f35
Changed all calls to CurrentUser::getID() to PlayerManager::getCurrentOnlineId().
2014-04-11 16:06:51 +10:00
hiker
502987d3e0
Now each PlayerProfile has a (currently still called) CurrentUser
...
which manages online connection data. Work-in-progress to use
only one object for all player data (instead of two atm: PlayerProfile
and CurrentUser).
2014-04-10 16:32:58 +10:00
hiker
43593d6312
Made getCurrentUser() a static function.
2014-04-08 08:06:52 +10:00
hiker
d88f513ad6
Moved ServerJoinRequest from CurrentUser into RequestConnection
...
(from which file it is also used in online_screen). And cosmetic
changes everywhere.
2014-04-07 21:15:42 +10:00
konstin
7cc83e1475
running whitespaces.py update 1
2014-03-29 11:33:43 +01:00
konstin
663fffdebb
Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces"
...
This reverts commit 65e2dcf2f0
2014-03-29 11:32:04 +01:00
konstin
65e2dcf2f0
Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces
2014-03-28 20:08:39 +01:00
hiker
7cb7651c07
Renamed Profile to OnlineProfile to better distinguish the various profiles we use.
2014-03-07 11:02:07 +11:00
hiker
07a5d90aa0
Merge remote-tracking branch 'upstream/master' into new_login
2014-02-11 22:36:13 +11:00
hiker
8b7754cd4f
Merge remote-tracking branch 'upstream/master' into new_login
...
Conflicts:
src/challenges/game_slot.cpp
src/states_screens/kart_selection.cpp
src/tracks/track.cpp
2014-02-10 21:37:04 +11:00
hiker
8d1591b260
Removed all references to current user/slot from unlock manager.
2014-02-10 08:57:16 +11:00
KroArtem
33ea1a6ef5
fix coverity issues
2014-02-09 17:04:15 +04:00
KroArtem
c4fd2eda08
fixing some memleaks
2014-02-09 01:36:32 +04:00
