491 Commits

Author SHA1 Message Date
konstin
663fffdebb Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces"
This reverts commit 65e2dcf2f09e979b39f8d115da7d17dabac0b957.
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
4eb4ce1511 Bugfix: onRaceEnd was not called for achievements (resulting in
achievements not being reset at end of a race).
2014-03-12 22:40:43 +11:00
konstin
b561f440ba 1180 Loading Grand Prix's from locale directory 2014-03-06 11:30:51 +01:00
konstin
c09a3172f1 Solving Issue 1180 - Load addon GPs from local folder 2014-03-05 12:11:20 +01:00
hiker
0ec7542175 Added more comments. 2014-03-01 17:16:23 +11:00
hiker
7e9682bde6 Merge branch 'master' of https://github.com/dimitrijejankov/stk-code into dim 2014-03-01 09:47:59 +11:00
Dimitrije Jankov
a354648497 Fix for
Author: hikerstk

Atm the user config.xml file is in UTF (since previously it stored the
name of players which requires special characters). The player
information is now stored in a separate file, so the config.xml can be
written as ascii now (avoiding problems some people have that they can't
see or edit the file)
2014-02-28 15:32:38 +01:00
Bart Cools
89a336ff9a Tweaked the logic of parachutes to be more modifiable. There now is an upper bound percentage and lower bound percentage which will be applied if you are driving faster and slower respectively. Also added those values in stk_config.xml to make playtesting easier (ticket #1135) 2014-02-28 11:10:25 +01:00
Dimitrije Jankov
9fc0d5be77 This fixes the issues my patch has caused...
1) if I start without existing user config files, it crashes (current
player is NULL)
2) the m_remember_me variable is not used
3) if I understand the code correctly, it sets the current player to a
guest player to indicate that there is no current player atm (which is
then used to start the login window). If this correct, then it would be
better to indicate this by setting the current player to NULL. Reason is
that this way we can easily detect incorrect usage elsewhere (since we
will get a crash, instead of storing data in the guest player, and we
will only later detect that something was not saved as expected).
2014-02-28 10:23:09 +01:00
hiker
14d6e6ae7e Added missing initialisation of m_is_default. 2014-02-28 19:01:40 +11:00
Dimitrije Jankov
d0f93d3b98 Fixed the skiping of the lobby screen :) 2014-02-28 02:36:53 +01:00
Dimitrije Jankov
2ef991e9e7 Removed the m_default_player from the user_config.hpp because the
default user is loaded from the players.xml file
2014-02-28 00:38:35 +01:00
hiker
4d6b110e56 Removed unnecessary #include of user_config.hpp in other hpp files
(to reduce the amount of recompilation when user_config.hpp is changed).
2014-02-26 12:52:16 +11:00
hiker
0b33474f2f For now disable shader by default, to avoid people not being able to
run stk at all (#1212).
2014-02-26 10:24:09 +11:00
hiker
4139d145cf Create a default user config file if no user config file exists.
This is for now useful for crash problems (e.g. to disable shaders).
2014-02-26 09:41:38 +11:00
hiker
99fe4388d4 Added an enum to reference the achievements by a name instead of
an integer number.
2014-02-24 17:14:42 +11:00
hiker
5fc300d7bb Removed Single and MapAchievent (and Singe/MapAchievementInfo), instead
using the generic key-value mapping Map* has provided for everything.
Changed format of achievements.xml to be more compact.
2014-02-24 08:21:15 +11:00
hiker
8307e0d8a3 Fixed memory leak. 2014-02-21 16:54:52 +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
8cd1e2e491 Renamed the node name in the player.xml file to better describe what
it is, removed unused variable.
2014-02-18 07:38:44 +11:00
hiker
94da45238c Renamed GameSlot to StoryModeStatus to better describe its function. 2014-02-17 23:16:53 +11:00
hiker
f2e6126f8d Renamed Challenge to ChallengeStatus (to better describe what
this class is doing).
2014-02-17 22:20:23 +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
ff585e4c73 Automatically compute active challenges when changing the current player. 2014-02-11 22:35:23 +11:00
hiker
83bc8c83e6 Fixed empty user config.xml files. 2014-02-11 08:54:44 +11:00
hiker
810c536d43 Fixed various minor bugs. 2014-02-11 08:12:10 +11:00
hiker
230e1789f2 Made sorting of players descending (instead of using > in operator<),
removed kart and unique id from game slot, replaced some forgotten calls to
unlock_manager with calls to PlayerManager.
2014-02-10 17:00:16 +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
62d46b7ec0 Renamed XMLWriter to UTFWriter (which is the correcter name). 2014-02-05 08:22:38 +11:00
hiker
5e8c8f2715 Fixed linux compilation. 2014-01-31 11:31:26 +11:00
Marianne Gagnon
a38a3b1b9a Try to fix compilation 2014-01-30 19:14:19 -05:00
Marianne Gagnon
87f5fd988e Don't use raw char*, use std::string instead. Fixes leaks. 2014-01-29 19:39:38 -05:00
hiker
d4b95e81b4 Moved hash function from StringUtils into player, there is no
other use of that function.
2014-01-23 09:54:48 +11: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
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
deveee
1a2d26b894 - Fixed crash when goal is scored after time limit
- Set time max value to 15 - playing one game 45 minutes doesn't have a sense
- Remember time value in user config
- Little beter look of soccer setup
- Set goal-limit mode as default

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14743 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-21 17:04:46 +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
09dc33d07e Moved the glowing data from stk_config.xml to items.xml.
Unfortunately I can't test (since the shaders don't work for me).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 12:24:26 +00:00
samuncle
627004a536 Add glow support for banana and bubblegum
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14648 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-06 23:19:43 +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
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
hilnius
0bddb320cd Adding packet logging + fixing lost packets (that are now kept for 2 seconds while waiting protocols that should receive them to be started).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13652 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 19:15:31 +00:00
curaga
efe3b59bc5 Rename Time to StkTime, X11 has a type called Time
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13604 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-30 12:24:12 +00:00
hilnius
8233b8067d merging uni's and trunk branches. Not everything tested right now
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13577 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-27 01:02:41 +00:00