Commit Graph

377 Commits

Author SHA1 Message Date
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +01:00
hiker
3c1a7b1c7b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-07 16:05:17 +11:00
hiker
c8749a3400 Fixed unnecessary include. 2014-03-07 16:04:59 +11:00
konstin
f7953f4f12 Adding debug messages for 1180 2014-03-06 20:30:52 +01:00
konstin
b561f440ba 1180 Loading Grand Prix's from locale directory 2014-03-06 11:30:51 +01:00
hiker
58a5928b17 Fixed #1228 (crash when no default player is set and -N, -R, ... is used). 2014-03-06 17:06:41 +11:00
konstin
c09a3172f1 Solving Issue 1180 - Load addon GPs from local folder 2014-03-05 12:11:20 +01:00
hiker
e79a46ef38 Fixed crash when --track or --kart is used and no default player exists.
Also only print an error message if --track or --kart do not work (e.g.
the track/kart is not unlocked, or no default player exists) instead of
aborting STK.
2014-03-01 17:14:56 +11:00
hiker
1c6d63acc7 Added separate create() function for ProfileManager, and some cosmetic changes. 2014-02-26 16:34:46 +11:00
hiker
a3a5d5fc3b Moved achievements data into PlayerProfile (and data is saved in players.xml
now instead of in a separate achievements.xml file).
2014-02-20 22:04:03 +11:00
hiker
2b4729a145 Renamed player.?pp to player_profile.?pp (to follow our style
guide); removed unnecessary #includes.
2014-02-17 20:10:29 +11:00
hiker
5acf3e1681 Various compilation fixes, some cosmetic changes. 2014-02-10 08:41:54 +11:00
hiker
97be85777d Started to move current player info from unlock manager into
player_manager.
2014-02-09 23:22:45 +11:00
hiker
045bfeaf13 Removed m_all_players from UserConfigParams (though there are stil
bugs in the new code).
2014-02-06 23:08:55 +11:00
hiker
78b73aa3c8 Added new player manager, and started to replace the saved data
from user_config with player manager.
2014-02-06 14:43:47 +11:00
hiker
0d51477f5b Disabled online menu by default (use --online to get access to it). 2014-01-22 08:52:22 +11:00
hikerstk
9ee06a5fe0 Replaced boolstr with toString specialisation for bool;
fixed translations in current user. Otherwise many many
cosmetic only changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15071 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-14 11:47:25 +00:00
hikerstk
428f74d859 Removed old network_http and related data structure. Its function
is now either in the addons/news_manager, or in Online::RequestManager.
Also added leack check and copy-preventing to online/Request.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15034 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-13 05:21:48 +00:00
hikerstk
b136e16f7a Preparation to remove network_http (its work will be
taken over by the reqeust manager).
Initialise news and addons manager in a separate thread
and not from the network_http thread anymore. Icons are
also downloaded now from the request manager instead
of the network_http.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15006 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-12 11:20:32 +00:00
hikerstk
54e6396df6 Renamed HTTPManager to RequestManager, and split request
into three files request, http_request and xml_request.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14978 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-09 04:57:58 +00:00
hikerstk
a1c964f71d Some refactoring and cleanup of the online request handling:
added setter/getter, renamed functions to have better names,
removed synchronousRequest from http_manager. Should be no
change in functionality.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14967 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-08 12:08:46 +00:00
hikerstk
7cdca13d7b Fixed all(?) warnings about signed and unsigned comparisons.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14950 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-07 00:09:19 +00:00
hikerstk
3e8741c442 Fixed typo.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14940 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 12:28:24 +00:00
hikerstk
6ee751e3c3 Added new class to handle command line parameters, which
simplifies parameter handling in main (e.g. it's not
necessary to list and ignore parameters in the 2nd
pass, when they were handled in the first pass).
Removed some command line options for which there
is a guy (e.g. --weather), or which are not really
useful (--list-karts). 

All parameters to options must now consistently be
specified using '=', e.g.: --log=1 and --kart=tux.

Also removed support for 'classic' camera (which was
not used anymore). Removed now unneccessary #include
in user_config.hpp, which made some #include changes
in other files necessary.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14939 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-06 12:23:16 +00:00
hikerstk
c450c97472 Allowed the music directory to be external. Renamed
getMusicFile to searchMusic and getTextureFile to
searchTexture. Removed m_root_dir from file_manager.
Added convenience function getTexture to irr_driver
which takes an asset type, so now less code is needed
to load textures (though that's proably not used
everywhere yet).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-18 22:29:08 +00:00
hikerstk
73c498daf3 Start to support 'externa' data directories. Most directories
from data can now be moved out (except music). STK prints
an overview of which directory is taken from where. More 
cleanups and improvements will come.
Also moved skins into a separate directory under data (from
data/skins), since it's likely that skins will be part
of a binary package (i.e. changes to skins not really
related to code), while gui files will more likely stay
with the code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 23:48:47 +00:00
hikerstk
f7cf407208 Deallocated http manager earlier (in case that it is using a command
which needs any of the objects that have been deleted while cleaning up).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14644 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 13:12:45 +00:00
deveee
ec13bcf802 Merge branch 'hilnius'
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-05 17:28:55 +00:00
hikerstk
bced8cdb9f Merged with trunk, part 1 (due to previous failures I am splitting this
patch).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:27:55 +00:00
hikerstk
c0783283e0 Fixed VS compilation (without WIN32_LEAN_AND_MEAN
VS defines MAX_PRIORITY as a macro).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14384 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-04 09:58:24 +00:00
hikerstk
41804c99da Fixed windows compilation (without WIN32_LEAN_AND_MEAN
windows will define a macro MAX_PRIORITY, which clashes
with the constant of the same name in http_manaher).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14281 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-21 04:29:40 +00:00
hilnius
a637ce6e36 some buxfixes + implementation of the max player count
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14127 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-21 20:56:39 +00:00
hilnius
0ce03186ee merging uni's branch and fixing compilation problems
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13690 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 10:12:54 +00:00
hilnius
262f70205c merging trunk and fixing compilation issues
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13689 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 10:05:34 +00:00
unitraxx
c775662e4a fix rfc for achievements when no default profile is selected
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13685 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-14 22:52:21 +00:00
unitraxx
2c1d02095a Changes to HTTPManager and it's clean-up sequence. Main thread now "joins" the network thread and thus waits for all the requests to be done. (Remember me to start a discussion on the memory leak checker!)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13671 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 18:23:56 +00:00
hilnius
20418a82af Lot of changes to make a cleaner startup in no-graphics mode and having a clean exit with all threads being stopped etc...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13669 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 15:54:32 +00:00
unitraxx
e71d99aa2d small clean up improvement
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13668 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 02:44:52 +00:00
unitraxx
5ba1493990 Some fixes in the sequence of quiting STK. Though the thread still gets killed before the request is done.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13667 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-12 02:29:05 +00:00
unitraxx
cbca9404e3 Big ass commit regarding achievement viewing of other people via their profile.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13658 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-10 20:41:57 +00:00
unitraxx
c67c5a6fb1 Achievements progress now actually gets saved.. how cool is that?
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13634 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-05 23:20:39 +00:00
unitraxx
03be63ea5b Even more achievements stuff. Unlock manager is a mess!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13630 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-04 19:44:10 +00:00
unitraxx
91e77a14c3 Lots of additions to achievements! core almost done.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13616 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-02 20:53:55 +00:00
curaga
fe9d2ec86c Mark the main clean function static
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13600 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 11:39:40 +00:00
unitraxx
7e8d167a89 Decent clean-up when closing STK. Send a message to the server if still signed in. (Server-code will not be pushed immediately, so testers might experience errors.)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 22:45:11 +00:00
hikerstk
298bd078fb Applied Deve's patch for #1042 - thanks!
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13588 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 13:58:45 +00:00
curaga
97232fe314 Invalid params should go to console
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-28 13:51:12 +00:00
hilnius
98f3b20bcb merging uni's branch and trunk
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13485 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 12:35:23 +00:00
unitraxx
2711744ed8 merge with trunk
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13477 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 00:20:28 +00:00
hikerstk
f9fa721a22 Minor bugfix: if an invalid kart name was specified on the
command line, it was not ignored (as stated), it would
result in STK aborting. Now this is just ignored.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13400 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 06:06:09 +00:00