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

365 Commits

Author SHA1 Message Date
unitraxx
40de2f62ae More rating bar and addon voting geniousness (server-side still needs update) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13412 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-03 01:54:39 +00:00
hilnius
057c8f46be adding things in order to be able to leave the world at the end of a network race 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13397 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-01 01:03:07 +00:00
unitraxx
a4c5c4b8ec Some advancements with the addon voting 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13396 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-01 01:02:35 +00:00
unitraxx
9a4c93f2de Implemented a callback listener for the login dialog. Added a vote dialog for addons. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13395 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-31 20:47:06 +00:00
hilnius
ea2b52a663 merging hilnius's branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-31 18:03:11 +00:00
hilnius
1b5c6fd804 merging trunk 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13392 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-31 17:06:15 +00:00
hikerstk
57183584ff Fixed VS compilation, and sorted includes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13389 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-30 13:04:29 +00:00
hilnius
a20c200b77 merging uni's branch. one bug appeared back 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13386 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-30 00:41:47 +00:00
unitraxx
6699284237 Some preparations to make the merge with the addons' network manager go smoothly. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13374 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-28 14:11:20 +00:00
hikerstk
151535cc79 Fixed VS compilation errors and warnings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13370 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-28 05:22:02 +00:00
hikerstk
5efcb986e4 Fixed VS compilation (mostly by including winsock2.h before libcurl). 
Also replaced binary numbers (non-standard) with hex numbers, and a few
minor cosmetic changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13367 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-28 01:28:14 +00:00
unitraxx
4091c4c965 Recovery dialog finally added. Some additional GUI changes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13361 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-27 20:55:10 +00:00
unitraxx
328e186014 Small bug fix + removing the private user state getter 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13352 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 14:53:25 +00:00
unitraxx
ea11bfa725 CurrentUser doesn't use acquire and releqse anymore. Mutexes added to the members. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13351 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 14:01:20 +00:00
unitraxx
261957bf72 acquire/release approach removed for ServersManager. Added MutexLocker to synchronised.hpp. CurrentUser will folow after sleepy times. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13346 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 02:22:53 +00:00
hilnius
d95065b685 quick join now works. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13345 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 01:40:52 +00:00
hilnius
cc2a967969 adding back some things in uni's code that i had removed for debugging 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13342 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 01:14:22 +00:00
hilnius
1ebfd0ada4 fixed server connection 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13340 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 01:07:42 +00:00
hilnius
ddc9e8d5ba update 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13339 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 00:26:44 +00:00
hilnius
c5c6c6195f merging uni's branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13337 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-24 15:43:54 +00:00
unitraxx
aba6b9f0e6 add a synchronousRequest option to the HTTPManager 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13336 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-24 13:08:45 +00:00
unitraxx
85579c3d9b Client-side code related to previous commit 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13334 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-23 23:54:55 +00:00
unitraxx
cdab5caf35 Replaced all non-related GUI code actions done after a reply to request callbacks. Servers manager now allows getting by ID and sort index. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13326 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-23 16:34:38 +00:00
unitraxx
182cd15477 Fixed the bug in rejoining a lobby. Added a lot of mutex stuff, which wasn't actually related to the problem at all. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13323 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-23 01:37:49 +00:00
unitraxx
311fb7bf4b Fixed reloading bug in server selection 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-22 20:00:08 +00:00
unitraxx
bf2d907ccf small fixes to let server joining work. (temporary version though.) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13315 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-22 00:23:42 +00:00
unitraxx
20e6fe74b2 server creating and joining. (server side code not complete) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13313 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 23:30:04 +00:00
unitraxx
c2159306e8 Some documentation and thread-safeness. ___Remind me to ask some questions about mutex___! 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 20:26:27 +00:00
unitraxx
8360c06b15 Deprecated old internet access method. Adapted my servers_manager and users to the new system. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 17:41:02 +00:00
unitraxx
1cdad60b17 Another enhancement for my HTTPManager which needed a lot of changes. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13307 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 15:21:48 +00:00
unitraxx
3a630d4985 Some memory management 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13303 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 01:17:00 +00:00
unitraxx
e84159f0c9 Made a response queue for the http manager. Adapted everything to use it. Enhanced registration process. Loading messages use the global timer. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13302 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-21 00:47:48 +00:00
unitraxx
e065870037 Server joining and creating is now asynchronous. Enhanced LabelWidget to use (error) colors. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13295 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-20 14:21:17 +00:00
unitraxx
ac40b8111b Decent killing of the network singleton and thread. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13294 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-20 02:14:36 +00:00
unitraxx
ebc3696de1 Signing out is now also asynchronous. Made the extending of the requests easier. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13293 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-20 01:38:44 +00:00
unitraxx
8c9834a236 Automatically signing in, is now very smooth. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13292 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-19 22:41:54 +00:00
unitraxx
54333c17b0 Fix. Asynchronous calls can now have callbacks. Thead-safeness improved. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13291 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-19 22:12:36 +00:00
unitraxx
ad198a6e70 Temporary commit so that I can easily revert if shit goes down. And it will go down. Thread callbacks madness! 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13290 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-19 21:20:32 +00:00
unitraxx
ae6bc57b95 Added Server and ServersManager to the online namespace and edited everything that uses those. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13279 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-18 23:02:18 +00:00
unitraxx
3724fc3dae First working version of asynchronous http requests. It's still a mess! Renamed some files and made use of an online namespace. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13274 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-18 21:18:40 +00:00
unitraxx
c2c314a2c2 Fixed issue that requesting to join a server signed you out. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13228 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-15 01:20:06 +00:00
unitraxx
67854a7efd You need to sign in now, for the features where it's needed. Also made a temporary implementation for quick play. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13224 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-15 00:25:56 +00:00
unitraxx
ec34fcafa7 Stay signed in works now (with checkbox in sign in dialog.) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13204 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-13 22:25:17 +00:00
unitraxx
3463a01e85 Remember session (without GUI) and starting to integrate online-multiplayer and addons networking code. (Limited to config file for now.) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13202 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-13 15:59:27 +00:00
unitraxx
200127102d Big commit related to server joining. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13196 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-12 23:12:31 +00:00
unitraxx
8dd9314eaf server fetching and selection 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13193 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-12 01:07:26 +00:00
hilnius
212b77fef3 adding features in the client lobby room protocol, separating client and server lobby room protocols in their own files to have clearer code 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13162 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-10 20:15:17 +00:00
hilnius
6199524440 fixing buts appearing after some time being connected 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13158 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-09 23:46:09 +00:00
hikerstk
49631c0027 Updated VS 9 project file, and fixed compilation problems. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13139 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-09 01:22:58 +00:00
hilnius
9aa25a4e97 Modifications in protocols to use the http connector and xml to get information from the database. Correcting the --server option which wasn't working. Now launching supertuxkart --server will connect the user 'server':'serverpass' and start automatically a ServerLobbyRoomProtocol that listens to incoming peer connections. 
Improvement of logging. Some were fatal whereas they shouldn't.
Improvement of the protocol system. There were mutex permanent locking.
Protocols that do not use http are now non-blocking (except maybe one).
A user can 'quick join' the server by logging then pressing the 'quick play' button in the online panel.
Improvement of packet serialization/unserialization
Added a ping protocol to ping peers as long as they don't respond


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13112 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-07 19:49:51 +00:00
unitraxx
2bf2ed0002 Start of creating servers 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13108 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-07 00:45:31 +00:00
unitraxx
5ecf73d90f Fixed sign out issue. I forgot that asserts only get checked with debug builds. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13050 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-30 23:41:30 +00:00
unitraxx
4e2ef1347a [_GSoC Uni_] Updated the interface code for the online part and some small adjustments to the underlying code. -- Ready for user testing! Can connect to the api server now. Activation not yet needed, mail addresses will not be saved, don't pick an important password. (Users will sometimes be deleted during development anyway.) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13031 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-29 22:55:15 +00:00
unitraxx
dea6a6d721 [_GSoC Uni_] Extended ribbon_widget to only take in mind active children. Overall improvement of GUI and code organization. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13027 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-29 02:27:56 +00:00
unitraxx
f99f27cbf1 [_GSoC Uni_] Signing out. Online screen (beta) improvements. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13001 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-28 01:33:15 +00:00
unitraxx
075b3aa3c7 [GSoC Uni_] Enhanced online_screen. Let 'Sign In' and 'Register' connect to the server. Renaming GUI file. Added debug code to connector. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12991 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-27 01:38:16 +00:00
unitraxx
18828d5668 [GSoC Uni_] Sign-In Dialog fixed. Removed debug code in http_connector. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12973 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-25 00:08:03 +00:00
unitraxx
7e36035228 [GSoC Uni_] Several improvements. No point in having a decent commit message, if it's for me only ;) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12967 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-24 19:20:16 +00:00
unitraxx
fe47e50341 [GSoC Uni_] Writing and fetching from database (registering) works. Lots of debug code to be cleaned up. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12913 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-22 02:47:28 +00:00
unitraxx
295a86017a [GSoC Uni] XML parsing of the server reply. Username & Password back to std::string. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12910 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-21 02:12:38 +00:00
unitraxx
2e35f293df [GsoC Uni_] Small commit to ask a question concerning stringw 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12906 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-20 22:49:46 +00:00
unitraxx
ffb23fbc6d [GSoC uni] temporarily removed connection with server. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12903 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-20 14:40:33 +00:00
unitraxx
a3ec5c3d97 [GSoC uni] Small increment. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12900 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-20 02:15:05 +00:00
unitraxx
be11ce1cd0 [uni GSoC] Connection with server OK. Remark : won't work if you don't have a locally set up server, change the adress in the config accordingly and have the code of my stkaddons branch running. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12889 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-19 18:49:20 +00:00
unitraxx
98274f59d5 Base for having users and connection with server. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12884 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-19 01:12:45 +00:00