ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,623 Commits 9 Branches 28 Tags 433 MiB
8d07d26c25
Commit Graph

274 Commits

Author SHA1 Message Date
Flakebi
af6c121a22 Run whitespaces.py 2014-06-04 15:10:20 +02:00
hiker
49a9ac54d5 Added a 'non-abortable' flag to the signout request. Re-enabled cancelling 
ongoing downloads to allow for a quicker exit of STK.
 2014-06-04 17:05:35 +10:00
hiker
b18d7e75ac Rewrote insertionSort to only require operator< (no >), 
and removed the unnecessary operators.
 2014-05-28 21:41:07 +10:00
hiker
0494cc3164 1) Fixed saving of sessions ('save-session=1' was sent instead of 
'save-session=true').
2) Made logout request same priority as stk-quit request, which means
that the logout request will executed before the quit, resulting
in players properly being marked as logged out.
 2014-05-27 23:44:25 +10:00
hiker
36d705f021 Added 'always-show-login-screen' option, moved 'remember-password' 
option from UI-options to UserScreen.
 2014-05-27 15:36:44 +10:00
hiker
63bbf6e092 Converted files to standard unix format. 2014-05-24 12:00:25 +10:00
hiker
de8c6ac8b8 When a player logs in with an online account, reset any other saved 
session for this online account (since these token are now invalid).
 2014-05-22 08:21:41 +10:00
hiker
f4688fa621 Added support to change the online account for the same player. 2014-05-22 08:12:55 +10:00
hiker
498c6b46db Removed m_save_session, some code cleanup. 2014-05-22 07:44:26 +10:00
hiker
8441dbbd32 Fixed saving login credentials. It's now possible to switch 
user (and automatically a logout and login is triggered).
 2014-05-20 22:13:26 +10:00
hiker
40564534d2 Fixed callbacks in case of using the tabbed version of the UserScreen. 2014-05-17 12:17:19 +10:00
hiker
6f4579d55d Only auto-login player if last time they played they were online. 2014-05-17 12:05:49 +10:00
hiker
1946df97be Fixed start with no players (including aborting the create user screen), 
added 'lastWasOnline' flag to enable saving of a login token even
when the account is used offline in between.
 2014-05-17 11:43:05 +10:00
hiker
8d4b33f221 Removed tabs, and use a separate screen instead. Some more refactoring 
to make remember-me a global setting.
 2014-05-08 22:17:15 +10:00
hiker
d847e8de00 Renamed StoryModeLobby to UserScreen. 2014-05-05 21:17:46 +10:00
hiker
5ff9d7f198 Block new StoryModeLobbyScreen while login is in progress (and display ... 
while this is happening). This allows to show error messages (e.g. user can
re-enter the password if login failed, without having to go to another menu
or perhaps even missing the fact that they are not logged in).
 2014-05-05 08:59:27 +10:00
hiker
812da3e0c0 Some work on new login screen, though wip atm. 2014-04-29 09:02:44 +10:00
hiker
a8bf73633f Renamed CurrentUser to OnlinePlayerProfile. 2014-04-17 15:39:51 +10:00
hiker
056aa5ed6f Refactor so that PlayerProfile provides a proper interface plus 
function/states for local use, and CurrentUser implements the
missing functions.
 2014-04-17 08:19:04 +10: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
f33a9f7cf6 Fixed #1282: STK crash on startup for the first time. 2014-04-15 09:06:50 +10:00
hiker
71ddeda94f Tried to avoid compilation problem on travis (though afaik there are 
still other issues with building on travis atm), though atm only
by a quick hack.
 2014-04-12 01:48:55 +10:00
hiker
488c1231c9 Moved getUserState from CurrentUser to PlayerManager::getCurrentOnlineState(). 2014-04-11 16:37:48 +10:00
hiker
3a5a0a56b2 Moved isRegisteredUser from CurrentUser into PlayerManager::isCurrentLoggedIn. 2014-04-11 16:20:04 +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
25c96d88ec Moved saved session data from UserConfig to PlayerProfile - which 
means that now each player can individually save an online session.
 2014-04-09 08:33:42 +10:00
hiker
8c197a24b2 Fixed documentation. 2014-04-08 16:52:29 +10:00
hiker
384bdb1124 Removed unused parameters. 2014-04-08 08:19:14 +10:00
hiker
38051c0191 Removed signedInAs function. 2014-04-08 08:09:28 +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
hiker
9b1b66689b Moved achievement notification for server from CurrentUser to 
Achievement.
 2014-04-07 13:19:07 +10:00
hiker
cb959acb44 Added 'action' parameter to setUserDetail, and made it work when 
the user is not logged in, so that it can be used for the recovery request.
 2014-04-07 08:25:48 +10:00
hiker
6b7dcedc02 Don't log the value of 'current', 'new1' and 'new2' (which are used 
when changing passwords).
 2014-04-07 08:13:33 +10:00
hiker
0a107897ca Moved user search and password change from CurrentUser into the 
corresponding dialogs.
 2014-04-06 01:25:31 +11:00
hiker
4a3cf13bc4 Moved voting code from CurrentUser to VoteDialog. 2014-04-05 21:59:56 +11:00
hiker
21f145b951 Moved requestGetAddonVote from CurrentUser into VoteDialog. 
Some cosmetic only changes to VoteDialog to follow style guide.
 2014-04-04 16:46:28 +11:00
hiker
dcba93aa7e Moved canceling of friend requests into UserInfoDialog. 2014-04-04 08:15:48 +11:00
hiker
d9267a937a Moved 'removeFriendRequest' into UserInfoDialog. 2014-04-03 16:58:38 +11: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
3f738b60d5 Fixed crash in UserInfoDialog if an invalid response is received (friend id 
is not contained in the response --> profile not found --> crash. Now
the friend id is stored in the request itself, and not needed in the response
from the server). Moved RejectFriendRequest into UserInfoDialog.
 2014-03-15 11:54:04 +11:00
hiker
aa169d0191 Moved AcceptFriendRequest into UserInfoDialog. 2014-03-15 10:27:13 +11:00
hiker
f76536ca31 Moved FriendRequest into corresponding GUI object. 2014-03-15 10:13:44 +11:00
hiker
e77287d3ce Moved signup request from CurrentUser to register screen. 2014-03-15 09:34:23 +11:00
hiker
c0a70830c2 Moved ServerCreationRequest from CurrentUser into the server creation screen. 2014-03-14 22:18:02 +11:00
hiker
6afc12c866 Moved recovery request into recovery dialog. Fixed recovery dialog to 
work now (except the URL sent from the server is still wrong).
 2014-03-14 16:44:58 +11:00
hiker
be9d7292f2 Replaced template function to simplify setting online request data with 
function (since template doesn't compile on linux without -std=gnu++0x or so).
 2014-03-11 17:13:37 +11:00
hiker
796d43ebb2 For now avoid the use of the template, since it doesn't work on linux. 2014-03-08 12:24:44 +11:00
hiker
56b53cc3c0 Another try to fix linux compilation. 2014-03-08 11:49:18 +11:00
hiker
51f3a6d555 Added static template function to CurrentUser to create html requests, 
which will prefill the HTML request with the details of the current user.
So far used only in online_profile.
 2014-03-08 10:29:40 +11:00
hiker
7cb7651c07 Renamed Profile to OnlineProfile to better distinguish the various profiles we use. 2014-03-07 11:02:07 +11:00
hiker
ebc2299150 Added more comments, code style cleanup only. 2014-03-06 08:04:43 +11:00
hiker
eba8fd1e45 Remove passwords and tokens from Log:: output. 2014-03-05 10:34:28 +11:00
hiker
586641120c Fixed crash in online user search (triggered when pressing ESC while the 
search is being executed).
 2014-03-05 08:21:19 +11:00
hiker
4fd6d29462 Removed debug code. 2014-03-03 16:37:54 +11:00
hiker
c1afacfc38 Added support for limited resizing of the online profile cache 
if too many search results are found. Print warning (instead of
assert) to console if search results should be missing (because of
cache eviction).
 2014-03-03 16:32:05 +11:00
hiker
0ddeb3b434 More documentation, and usage of typedef instead of std::vector<...>. 2014-02-28 09:19:10 +11:00
hiker
bef02c116c Bugfix: addPersistent/addToCache would call Profile::merge(), which 
deletes the original profile --> the profile accessed after this call
was invalid.
 2014-02-28 08:51:02 +11:00
hiker
76787599d9 Moved some class declarations into functions. Added comments. 2014-02-28 08:48:07 +11:00
hiker
db0c75b988 Make sure that the used bit of a profile is always set when updating 
the cache bits (even though it probably doesn't matter, but that's
hard to understand, this way is cleaner).
 2014-02-28 08:12:03 +11:00
hiker
efdb78f012 Added comments, sorted some functions so that all cache functions 
are next to each other etc. No actual code change.
 2014-02-27 16:55:32 +11:00
hiker
42b72cc2a8 Added comments, minor code changes only. 2014-02-27 15:29:30 +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
KroArtem
49d14e5046 copy-paste error 2014-02-09 01:50:02 +04:00
Marianne Gagnon
b7e7808500 Fix failed override attempt 2014-01-29 19:08:17 -05:00
hiker
50ef878e39 Enabled at least VERIFYPEER. 2014-01-21 11:24:07 +11:00
hiker
f33d547c54 Moved verbose option to be done even if a file is downloaded. 2014-01-21 08:12:08 +11:00
hiker
260f4f148d Reworked the login and register dialog to be a screen - still 
work in progress (and guest login does not work yet).
 2014-01-20 21:39:59 +11:00
hiker
da7bad92e6 Don't return error code if a file to be removed does not exist. 
Improved error handling in addons.xml download.
 2014-01-16 15:29:47 +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
d53e3180ac Fixed enabling internet in the GUI (i.e. re-init of 
news manager and addons manager will happen now).
For online menu a dialog is now presented to explain why 
it can't be selected if internet is disabled. Addons can
be selected with internet is disabled if there are
existing addons (so that it's possible to remove addons
without internet access).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15035 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 11:35:12 +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
a49d85fa3e Replaced pop_back, which is not available on all compilers (for 
std::string).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15025 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 22:43:45 +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
c5c17747cb Fixed linux compilation. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14968 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-08 12:13:26 +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
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
723c4683ce Fixed STK hanging on exit (at least in one case ;) ). 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14645 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 13:13:16 +00:00
hikerstk
b074dc5f09 Moved all VS specific math code (i.e. for round(), isnan) into vs.hpp 
and used it everywhere (I hope).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14640 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 03:49:55 +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
7c2e48e2c6 Fixed VS compilation (MAX_PRIORITY is a #define somewhere), and while 
it can probably be disabled, it's just annoying to search the reason for
a rather incomprehensible error message all over again.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14622 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-03 23:54:11 +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
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
unitraxx
0979de10c5 Documentation for CurrentUser and Messages 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13700 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-16 18:31:00 +00:00
unitraxx
8b6cf84748 Documentation for online requests 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13696 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-16 00:09:38 +00:00
unitraxx
b0ba070140 HTTPManager documentation 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13694 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-15 19:30:50 +00:00
unitraxx
f836df5eba More small fixes 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13693 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-15 19:16:36 +00:00
unitraxx
a855752f0c Initial documenting for the profile manager and profiles and some FIXME's fixed 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13692 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-15 18:08:32 +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
99e7b565bc Password changing done! (and some other small fixes) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13679 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-14 01:07:22 +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
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
ed37d53be6 improvements regarding save-session (client-side) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13665 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-12 00:29:38 +00:00