Commit Graph

63 Commits

Author SHA1 Message Date
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
Csaba Molnar
ca19a428b2 merge, comment fix, never-consistence fix 2014-03-22 01:02:52 +01:00
Csaba Molnar
3a5812dd6c Merge branch 'master' of https://github.com/supertuxkart/stk-code
Conflicts:
	data/achievements.xml
2014-03-22 00:52:33 +01:00
cosmin.crecana
8616ce546a achievement_unstoppable 2014-03-20 15:30:11 +02:00
Marianne Gagnon
9042a4e0f2 Fix bogus merge, sorry 2014-03-18 19:26:36 -04:00
Marianne Gagnon
4948f5acb2 Merge branch 'master' of https://github.com/sudip1401/stk-code
Conflicts:
	data/achievements.xml
	src/achievements/achievement_info.hpp
2014-03-18 19:16:43 -04:00
hiker
3d5fbaa92f Merge branch 'master' of https://github.com/gupascal/stk-code into gupascal-master
Fixed some merging issues.
Conflicts:
	data/achievements.xml
	src/achievements/achievement_info.hpp
2014-03-18 10:44:11 +11:00
Csaba Molnar
60f1d8ae20 Achievement reset-after-lap beta 2014-03-17 22:07:55 +01:00
sudip1401
72920ab0ab Poweruplover achievement 2014-03-18 02:20:51 +05:30
sudip1401
89d7663112 Poweruplover achievement 2014-03-18 02:04:01 +05:30
Csaba Molnar
c175f2450e Tab fix 2014-03-15 19:58:25 +01:00
Guillaume P
8a34be1ab3 Add a new Gold Driver achievement. 2014-03-15 15:12:28 +01:00
Csaba Molnar
385f108b16 Skidding achievement 2014-03-15 00:38:16 +01:00
hiker
cecb725228 Display correct results for achieved achievements. 2014-03-13 17:12:51 +11:00
Guillaume P
955b27bf75 Add a Marathoner achievement. 2014-03-12 14:15:16 +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
hiker
642797bdde Cosmetic changes to follow our coding style. Also fixed incorrect
'waiting for friends' message while waiting for achievements.
2014-03-11 17:03:07 +11:00
hiker
36c9c4d6c3 Fix the display of achievement progress: avoid that a value can be
larger than the goal value (otherwise after racing one track 12 times
the progress for Christoffel would should 12/10).
2014-02-26 10:36:02 +11:00
hiker
ac2619007f Fixed translation. 2014-02-26 09:16:40 +11:00
hiker
f8a462a39f Added support for different types of achievement checking: besides
'all-at-least' (all keys must be >= the corresponding goal value) now also
'one-at-least' (at least one key is >= a constant goal value) is supported.
Implemented 'Arch Enemy' achievement: hit the same kart at least 5 times
in one race.
2014-02-25 17:20:24 +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
71f61f71c6 Fixed compilation errors - no idea why VS compiled it ok previously :( 2014-02-24 08:26:51 +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
90343ff276 Fixed missing initialisation of m_reset_after_race, and added
error message in case of missing achievement data.
2014-02-21 23:39:14 +11:00
hiker
b214799a35 Some refactoring in he Achievement classes, code style cleanup. 2014-02-21 22:15:36 +11:00
hiker
8f36220b61 Renamed AchievementsSlot to AchievementsStatus. 2014-02-20 23:03:25 +11:00
hiker
700953f295 Removed unnecessary save function. 2014-02-20 22:37:27 +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
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
5acf3e1681 Various compilation fixes, some cosmetic changes. 2014-02-10 08:41:54 +11:00
hiker
3fee08d743 Merge branch 'new_login' of github.com:hiker/stk-code into new_login 2014-02-06 23:09:49 +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
dd860f46f9 Fixed linux compilation. 2014-02-06 15:56:41 +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
gl3nn
06b7ba09f5 Bool to string fix for challenges. String to bool applied for
achievements.
2014-02-02 15:50:10 +01:00
Marianne Gagnon
3e253be31e Misc code improvements 2014-01-29 19:20:57 -05: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
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
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
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
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
90b8f6d0fc Description of the achievement now pops up when you click on one and some bug fixes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13663 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-11 20:25:13 +00:00
unitraxx
fc45d76d27 Special case for viewing your own achievements. (Shows the progress)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13662 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-11 19:23:54 +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
095d5a58c1 Core for viewing achievements of others
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13656 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 23:10:36 +00:00
unitraxx
add8007dcb Couple of bugfixes
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13650 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-09 15:37:35 +00:00