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
unitraxx
217ec5ce9c
Lots of improvements, mainly related to login (dialog)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13576 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-27 00:07:29 +00:00
hikerstk
1591eb4126
1) Bugfix: member variables where accessed after deleting this
...
2) Removed unnecessary member variable, some code cleanup.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13575 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 23:02:06 +00:00
hilnius
93ec81f309
now to know the public ip address, the GetPublicAddress protocol uses randomly selected STUN servers from the UserConfig file. If the server doesn't answer after two seconds, the protocol will reset and pick a random server again.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13574 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 14:14:52 +00:00
unitraxx
fe85a75036
small fix for polling result
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13573 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 14:06:19 +00:00
hikerstk
74c819fd8d
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13572 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 13:27:03 +00:00
hikerstk
c2e11c5783
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13571 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 13:24:58 +00:00
hikerstk
7b970b643a
Added (somewhat experimental) code to detect the local
...
IP address on windows (and to discover if 127.0.0.1 can
be used to connect to a client on the local machine).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13570 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 11:09:39 +00:00
hikerstk
96c04daa6a
Fixed VS compilation error.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13569 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 11:07:20 +00:00
hikerstk
d08583b19f
Applied same patch from hilnius branch to fix compilation (to
...
avoid conflicts when merging later).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13568 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 04:38:05 +00:00
unitraxx
616fc2b5be
dialog bug fix
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13565 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-26 00:06:30 +00:00
hikerstk
ee8ec31e62
Fixed VS compilation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13564 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-25 23:37:12 +00:00
unitraxx
5fa970b517
Fixed registration dialog bug and changed event checking in online screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13563 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-25 23:22:28 +00:00
hikerstk
ce67d78d1e
Fixed compiler warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13562 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-25 13:24:49 +00:00
hikerstk
9896c7ae3b
Fixed usage of usleep and round for visual studio.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13561 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-25 12:02:18 +00:00
hilnius
ff1ef8b0b6
addded a List UserConfigParam and a StringListUserConfigParam that contains a list of STUN servers (to avoid hard-coding the STUN server domain name.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13560 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-24 16:47:56 +00:00
unitraxx
b3a905dcc2
Related to previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13559 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-24 00:06:36 +00:00
unitraxx
f9f4047155
Glitch fix
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13557 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-23 23:47:48 +00:00
unitraxx
2ee5a1b188
Small adjustments to the notification and user info dialog
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13556 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-23 19:53:03 +00:00
unitraxx
639d79fa10
Some general improvements. There is still a bug somewhere that on rare occasions triggers an assertion when signing in.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13555 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-23 19:37:39 +00:00
hilnius
39a0e7a67e
fixed a bug in the algorithm that sorts players at the end of the race
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13554 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-23 15:14:56 +00:00
unitraxx
bfc32bdd14
Remove friend and cancel request added in the client. Server-side still need to be implemented.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13553 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-23 00:49:46 +00:00
unitraxx
ed7b4b875a
Some dialog queue improvement.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13552 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 16:57:04 +00:00
curaga
5d7e846969
Parallelize SFX loading, 7% speedup in load time
...
Vorbis and AL are thread-safe.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13549 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 15:43:24 +00:00
unitraxx
5ada92b251
Cache issues fixed.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13545 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 15:35:40 +00:00
hikerstk
ebea0a49f9
Merged soccer branch with trunk, fixed (at least some) tabs
...
usage.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13543 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 03:54:52 +00:00
hikerstk
8ec6b13eee
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13542 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 03:50:50 +00:00
unitraxx
136185969f
Another bugfix (Todo constraints and cache issues)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13541 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 02:25:08 +00:00
unitraxx
225994df55
Small sequence fault in setting the error color, when a server mistake occurs.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13539 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 01:50:39 +00:00
unitraxx
ff877b60ca
And you now get immediate notifications for new friend requests! (easily extendable for future personal message notifications)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13537 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 01:22:09 +00:00
unitraxx
c3c1e1b054
When someone accepts your friend request while you are online, besides the notification, the status in the friendlist gets also updated.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13536 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 00:43:53 +00:00
hikerstk
35b58661e5
Minor cosmetic changes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13535 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 00:00:40 +00:00
hilnius
8e7338a13e
game no longer crashes at the end of the race, the end of race sequence seems ok for 1 player at least
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13532 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-21 19:04:46 +00:00
hilnius
e3261775e3
forgottent commit on former computer
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13531 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-21 13:54:50 +00:00
unitraxx
1f45958323
Fixed some iterator issue and a bug in the notification messages
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13530 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-21 01:15:00 +00:00
unitraxx
fc789d6b3d
When you ask someone to be your friend, it now shows immediately in your friends list. (as pending of course)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13526 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-21 00:06:13 +00:00
unitraxx
72a3015e1a
Dialog screens now pop up when a friend comes online ! hurray
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13523 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-20 20:58:34 +00:00
unitraxx
a4bb17d2ca
Some bugs/things I forgot
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13521 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-20 18:13:52 +00:00
unitraxx
8e6495139e
Related to previous commit. Changes to the modal dialog core. (Not 100% sure if every dialog still works.) Some core changes to profile, profile manager, and the related callbacks for friending.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13520 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-20 17:36:20 +00:00
unitraxx
445706793e
Big commit. Everything related to friending & friendslist GUI, dialog queue and callbacks for the 3 requests.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13518 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-20 01:10:07 +00:00
unitraxx
d40dd67e96
Some additions to some stuff. Mostly the profile manager, where I've added a separate queue for persistent profiles. (I.e. the current user and his friends.) We should definitely put a max on the number of friends. (Pretty low, and remove the limit for premium ;) )
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13515 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-19 19:31:50 +00:00
unitraxx
f43c5c915f
GUIEngine addition. Now a queue of dialog windows.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13514 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-19 18:08:51 +00:00
unitraxx
ac6ce5a4f0
Cleaning up some obsolete code.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13513 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-19 16:24:15 +00:00
unitraxx
ea7d42c1b8
Friendslist gets automatically fetched after signing in. And some general bugfixes.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13507 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-19 00:19:18 +00:00
unitraxx
c758ecbe43
Polling timer depends on whether you're in game or in menu.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13506 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 23:46:36 +00:00
unitraxx
0c4780a39e
Auto signing in, happens in the background on startup now.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13505 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 23:42:44 +00:00
unitraxx
2428a5f3b0
CurrentUser is now linked to a profile. Thread safeness obsolete, so removed. User class deleted. Adapted hilnius' code to conform.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13504 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 22:59:23 +00:00
unitraxx
37f3f55da8
Face one of the refactoring! callbacks on http requests get now called by the main thread. So absolutely zero thread-safety has to be taken care of, outside of HTTPManager and its requests.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13503 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 22:22:00 +00:00
unitraxx
17b9479fce
Quite the mess I'm committing, but it's kind of a back up for the massive refactoring I'm about to do now. It will be great! (hope so)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13502 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 21:08:27 +00:00
unitraxx
70bb8df317
Start of the GUI additions. Need some refactoring first.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13501 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 14:54:41 +00:00
unitraxx
9003af59e1
Additions to user memory mananegement in cache. Added the add, accept and decline friend core to the client.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13500 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 14:31:38 +00:00
yasin-ghannam
a400e48c57
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13499 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 12:43:19 +00:00
yasin-ghannam
43f8963a01
Goal SFX added.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13498 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 12:25:08 +00:00
yasin-ghannam
51a7b2b387
Goal scoring corrected. "GOAL!" appears when a goal is scored (Music will be added soon). Karts start positions fixed so that each kart faces the goal of the opposite team, not its own.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13497 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-18 07:36:32 +00:00
unitraxx
66c9c1fac7
More info shown now in the friendslist. Client now knows when a friend request is pending etc.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13494 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-17 21:39:51 +00:00
unitraxx
f0cf45b9b4
Client core for relationship info.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13493 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-17 20:22:55 +00:00
unitraxx
05a495810e
Some general useability improvements
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13491 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-17 00:27:35 +00:00
unitraxx
0f0caf5f35
Lots of changes. When you click a user name now (in friends-list or search result), you get a pop-up, where you can click to join and watch the profile.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13490 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-17 00:11:03 +00:00
unitraxx
10600e94f9
Memory management in friends fetching back ok. Something weird happened with my commit this morning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13488 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-16 01:19:12 +00:00
unitraxx
c8df03e7ce
first SSL layer
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13487 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-16 01:11:19 +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
hikerstk
05c47f83ca
Fixed compiler warnings, layout, and removed tabs.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13481 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 05:57:48 +00:00
unitraxx
eb1bd40c0c
small update to the friends fetching. The server request deletes itself in its callback.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13480 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 01:51:21 +00:00
unitraxx
c15f5537d4
Textbox border change. GUI changes accordingly. Checkbox in login dialog isn't properly aligned though.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13479 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 01:24:49 +00:00
auria
9f0bc16ebf
Make text boxes perfectly respect the allocated size
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13478 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-15 00:36:25 +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
auria
9fb7593efe
Remove accidentally committed debug test
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13474 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-13 00:41:00 +00:00
auria
2693043395
The hayball in farm will now flatten you (exporter still left to do)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13473 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-13 00:36:37 +00:00
unitraxx
c1e36b02de
User searching! Very close to adding friends now ;)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13469 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-12 23:58:22 +00:00
unitraxx
b2a0198c34
Small fix in server selection
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13461 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-11 21:39:36 +00:00
unitraxx
c687151d11
Stable version of profile where your friends are actually showed with their username in a small list.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13459 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-11 19:47:25 +00:00
unitraxx
098b191e9e
see previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13458 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-11 17:24:36 +00:00
unitraxx
c8eea98342
The actual fetchitng and showing of your friends in the friendslist
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13456 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-11 01:22:27 +00:00
unitraxx
d8734acbe6
Profile fetching implementation as cache
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13455 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-11 00:59:10 +00:00
auria
91e1fb3111
Minor tweak so that a single nitro buttle is fully consumed when using the nitro button (before, there would be a very tiny little amount left)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13454 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-10 00:55:27 +00:00
auria
9d05adbacf
Fix bug #1037
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13453 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-10 00:51:44 +00:00
auria
b72f0bf625
A few small tweaks to soccer mode, show message when a goal is made, resize down soccer ball a little
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13452 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-10 00:23:51 +00:00
auria
d3e6569a54
merge soccer branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13450 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-09 23:48:13 +00:00
curaga
8eaabdb77b
Move the spot to the front
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13449 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-09 18:33:38 +00:00
curaga
38accf6205
Up the kart selection screen ambient light
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-09 18:33:16 +00:00
hilnius
23dba6ec0e
lan works now automatically. needs a fix for windows
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13447 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-09 18:21:14 +00:00
hikerstk
df9d90b342
Merged bubble bum branch into trunk. The new bubble gum
...
shield is still work in progress.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13444 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-08 03:11:03 +00:00
unitraxx
aa5c5a9f6b
Ok client-side everything now works perfect for addon voting. Be sure to use the new config file and change to server_addons= http://downloads.tuxfamily.org/stkaddons/assets-uni/xml if you want to test
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13440 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-08 00:42:35 +00:00
unitraxx
c111165703
Halfway friends list fetching. (Yeah it's quite a mess atm.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13438 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-08 00:19:11 +00:00
unitraxx
b0ff13299c
GUI work for profiles. A common inherited base screen for the different tabs. Friends screen added.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13434 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-07 15:03:33 +00:00
hilnius
d265c7e7be
adding code to synchronize also hits on bananas
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13433 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-07 12:48:16 +00:00
hilnius
372689f0bb
fixing multiple bugs in item selection events protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13432 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-07 12:32:38 +00:00
hilnius
367892e055
working powerup synchronization (not tested but should work ;p)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13428 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 23:46:15 +00:00
hilnius
7bf6b3cc25
removing a mistake that was making karts not do item checks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13427 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 23:38:57 +00:00
unitraxx
bf5eccf4ed
Some nice optimization update to the rating widget. The calculation of the stars was quite weird?
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13426 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 23:17:00 +00:00
unitraxx
366ae7009d
Lots of stuff. Mutex optimization. Addon voting. Some profile stuff continued. Progress+++
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13424 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 22:45:33 +00:00
hilnius
149875d83c
moving some code to make the server execute it
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13423 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 20:59:19 +00:00
hilnius
67c2cb2395
fixing a problem in the server lobby room protocol (that bug had been introduced some revisions ago
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 20:44:25 +00:00
hilnius
46c994f6fb
fixing a problem in the server lobby room protocol (that bug had been introduced some revisions ago
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13421 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 20:42:41 +00:00
hilnius
9e77350108
adding small debug info
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13420 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 19:16:27 +00:00
hilnius
9151770aa0
fillig the GameEventsProtocol with events that concern powerup collect
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13419 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 19:10:33 +00:00
yasin-ghannam
a3be77aa30
added above team leader's head a red/blue ball to indicate team.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13418 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 03:30:42 +00:00
unitraxx
856a21a47e
start of profiles
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13416 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-05 02:03:33 +00:00
unitraxx
757d9e3683
Some general dialog improvements
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13415 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-04 13:33:14 +00:00
unitraxx
63e927b277
Responsibility shifting for the deactivated case
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13413 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-03 01:58:29 +00:00
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
curaga
a3bfed004e
When you click the video slider, the slider text needs updating
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13410 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-02 14:18:11 +00:00
curaga
144c5cc0b4
The custom gfx tooltip must be updated when the slider is
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13409 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-02 14:17:34 +00:00
unitraxx
6198c43728
Awesome rating bar widget is awesome
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13408 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-02 02:25:58 +00:00
unitraxx
ed689232e0
Quick commit to save my progress as my internet connection is clearly unstable
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13407 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-02 01:28:50 +00:00
hilnius
9ec58bbcb1
working karts online selection
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13405 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 23:28:21 +00:00
hilnius
55bd9e18fd
lot of code refactoring, now protocols can choose whether they receive network messages (and more generally events) in a synchronous mode (along with the main loop) or in an asynchronous mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13404 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 19:55:09 +00:00
hilnius
b394bd9295
lot of code refactoring, now protocols can choose whether they receive network messages (and more generally events) in a synchronous mode (along with the main loop) or in an asynchronous mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13403 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 19:49:57 +00:00
hilnius
a51f7bfb74
modify the race_id management to ensure that we always have ids between 0 and the number of players
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13402 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 11:51:23 +00:00
hikerstk
3187937496
Simplified #includes, and changed order to follow our style guide.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13401 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 06:11:10 +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
hikerstk
5efa7c8ad2
Removed apparently unnecessary #include <io.h>, since
...
it will actually include io.h from wiiuse, not the
internal one from VS (which results in some warnings
about RAD_TO_DEGREE already defined).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13399 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 06:02:44 +00:00
unitraxx
f4c7cf439e
Fixed a small issue. The main issue is still the bad allignment of the widget though.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13398 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 01:04:51 +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
unitraxx
8656a12d12
Undoing last commit which was not what I wanted after all.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13391 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-30 22:05:06 +00:00
unitraxx
75e286932f
An attempt to merge with hilnius' branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13390 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-30 21:39:27 +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
hilnius
bcd15a8851
now network GUI interacts properly with the server, can go up to the selection (still cannot ask for selection)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13385 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 23:43:28 +00:00
hilnius
840faec44b
missing include
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13383 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 15:30:17 +00:00
hilnius
8a79bbadfd
better control of events to leave the server properly if the user is in the kart selection phase and decides to leave
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13382 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 15:27:25 +00:00
hilnius
ad18d9299d
fixing last issues with the inherited kart selection screen : the screen is now deleted when back is pressed, and re-instantiated when it's loaded again. If not, there was a problem with two screens instantiating the same '.stkgui' file. The screen is not deleted when the user clicks a kart (eg when starting normal game) to allow a working popScreen()
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13378 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 12:42:21 +00:00
unitraxx
8c1d84ce74
Some fixes to my GUI Engine additions, so that they are compatible with the rest of the game.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13377 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 19:31:17 +00:00
unitraxx
1d90f554e8
Merging with trunk, aesthetic changes, and added virtual keyword to the destructor of Track_object.hpp because of errors.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13376 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 17:27:06 +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
hilnius
79c5fc03e9
moving class declarations of objects used by the KartSelectionScreen to kart_selection.hpp
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13373 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 12:28:26 +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
hilnius
f3b03488c4
as always had forgotten to add the new files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13364 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-27 23:13:34 +00:00
hilnius
b737ad753a
adding a way to have a network kart selection screen inheriting the normal kart_selection_screen
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-27 23:13:03 +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
hilnius
0f469cd3d9
fixing server joining issues
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13356 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-26 23:47:43 +00:00
hilnius
8c6c1d2c4d
adding forgotten files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13355 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-26 13:02:35 +00:00
hilnius
3e0fcb6d00
adding possibility for the server to decide when to start the selection
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13354 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-26 12:49:05 +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
hikerstk
2d504379ca
Removed reference to logging stderr (which is not done anymore).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13348 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 07:13:36 +00:00
hikerstk
6c210a8c09
Added assert to Log::fail so that a debugger breakpoint can
...
be triggered. Added Log:: calls to string_utils.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13347 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 07:12:49 +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
yasin-ghannam
a908f4d3f9
Game ends when goal target is reached.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13344 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:25:35 +00:00
hilnius
87e9deea78
established back login from command line
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13343 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:21:03 +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
hikerstk
bb249d1681
Made lock/unlock const.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13341 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-25 01:10:16 +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
auria
dfb9de9733
Apply parts of patch by Deveee to better indicate new nitro consumption rules, with additions by myself for the race GUI
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13338 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-24 23:14:22 +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
0979eb009c
WillemS had a compilation error concerning the namespace os of irrlicht. Tried a fix, waiting for confirmation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13335 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-24 12:53:19 +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
auria
27a1509532
Allow navigating with TAB in menus
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13332 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 22:53:21 +00:00
unitraxx
7bd614ab12
Registration process fine-tuned. Using icons now and the asynchronous layer. Still TODO : activation and recovery.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13331 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 22:29:05 +00:00
hikerstk
f6685af2e1
Added support for looped jumping animation; renamed
...
begin/end_jump to jump_start/end to be more consistent.
Added a test loop to Sara's animation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13330 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 22:11:12 +00:00
unitraxx
a632aca9c9
Some "create server" improvements in both screen and flow. Creating one doesn't actually let you join the server, but pops up the server info dialog of it, which gives you the option to join.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13329 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 20:58:24 +00:00
curaga
8c406172cf
Remove kart selection flicker
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13328 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 18:53:12 +00:00
curaga
0157e83fe9
Much nicer kart selection light
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13327 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-23 17:06:51 +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
yasin-ghannam
b53e0c4fe3
Slight modification to score display.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13322 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 23:07:45 +00:00
hikerstk
729fb64cb0
Added support for animations without a loop part (esp. jump).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13321 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 22:04:33 +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
yasin-ghannam
88b6b4b5c4
Kart positions fixed. Karts on the same team appear on the same side.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13318 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 17:50:39 +00:00
hilnius
66b4724a76
fix a bug that appeared when starting a normal race
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13317 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-22 09:38:04 +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
hilnius
84a2df059b
adding rotations to the kart updates protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13309 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 15:34:16 +00:00
unitraxx
af12be28fa
Login dialog can't be closed now during a sign in request.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13308 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 15:25:17 +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
dea145952b
Apparently the onEscapePressed callback for a dialog didn't operate as advertised. I fiex.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13306 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 15:19:15 +00:00
hilnius
a4a3e486d1
modifications that were done on server
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13305 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 14:03:36 +00:00
hilnius
0de91b3612
working protocol for controller events
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13304 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 14:00:46 +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
hilnius
b206aeb0bc
adding log to debug
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13301 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-21 00:17:45 +00:00
hilnius
3bf42045f6
correcting a bug in the controller events protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13300 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 23:07:15 +00:00
yasin-ghannam
d314ee2d0d
Team indicators added.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13299 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 20:34:37 +00:00
hilnius
38f32b14cc
adding protocols for game events (still not written) and controller events (partially written)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13298 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 17:32:23 +00:00
unitraxx
eafcbc7103
Client side checking for the client and deactivating actions during sign in request.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13297 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 15:52:59 +00:00
unitraxx
4a96c67697
Added method to check if a widget is active or not
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13296 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-20 15:46:25 +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
hilnius
07d0e5560b
server changes
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13289 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 16:09:32 +00:00
hilnius
5c3251e797
stupid pointer not initialized error made the server crash when a second person was connecting to it
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13288 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 16:04:44 +00:00
hilnius
2567602ef3
adding address printing debug info
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13287 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 15:36:52 +00:00
hilnius
1940387f9a
adding info to debug easier
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13286 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 15:18:08 +00:00
hilnius
2574c28c5c
fix to avoid the lag
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13285 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 14:40:32 +00:00
hilnius
68336bdcdc
increased the update rate to let the game be playable
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13284 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 14:18:21 +00:00
hilnius
c6ef045f2a
had forgot to initiate the btTransform
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13283 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 14:15:13 +00:00
hilnius
4c14995c72
fix to move karts for real
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13282 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-19 13:46:17 +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
auria
ec4c55de73
Move nitro min consumption to kart properties
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13278 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 22:58:40 +00:00
auria
7afaad013a
Reduce minimal nitro consumption a little, I think I was too harsh in previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13277 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 22:49:38 +00:00
unitraxx
8ec5adeec0
Signin in now fully uses asynchronous http requesting. Implemented a nice "loading dots" gimmick for loading.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13276 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 22:49:19 +00:00
auria
bfad6cc851
Use a required minimal amount of nitro each time the key is used. May need some playtesting to balance but the base is there and shouldn't penalize normal use
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13275 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 22:46:46 +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
hilnius
cd063a8eb2
moving log to more relevant places
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13273 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 18:04:47 +00:00
hilnius
3327e609c6
stupid mistake in a line was making everything bug
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13272 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 17:56:32 +00:00
hilnius
97891cd5ef
fix a bug that was making the position updates protocol do too much updates (normally it's 1 per second
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13271 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 16:37:40 +00:00
hilnius
b9bf6b9e12
more debug info
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13270 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 16:29:27 +00:00
hilnius
28241f66b2
adding variables to debug easier
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13269 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 16:13:10 +00:00
hilnius
176c175206
dually enhanced thread protocols management to avoid protocols asking their own deletion multiple times (which of course causes a segfault)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13268 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 15:58:46 +00:00
hilnius
ea1c6947ab
adding more thread-safety
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13267 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 14:20:09 +00:00
hilnius
8edf1b6f9e
trying to fix a bug concerning the state modification during asynchronous messages
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13266 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 13:55:42 +00:00
hikerstk
2ff62c4d97
Added support for jump animation, which will triggered
...
if either the estimated jump duration is long enough,
or the texture the kart was on before it jumped has
a jump property set.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13265 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 07:24:47 +00:00
auria
8f77aac50a
Apply small patch by lennartack to fix leak in --no-graphic mode
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13264 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-17 22:37:45 +00:00
hilnius
93bad9b586
fix a bug that made the server crash during an assertion
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13263 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 22:50:00 +00:00
hilnius
75e75c43ee
adding a workaround to be able to start a network client from a server (with --no-graphics option)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13262 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 22:27:28 +00:00
hilnius
766f9dfe70
correcting some bugs in the kart position update protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13261 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 15:00:49 +00:00
hilnius
ddae296064
had forgot the important files in last commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13260 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 14:46:54 +00:00
hilnius
3be0d70ce0
adding a protocol to update positions over network during a race
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13259 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 14:45:48 +00:00
hilnius
9e712c87b7
finally when a game starts online the online player karts are set-up successfully
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13258 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-16 12:50:59 +00:00
hilnius
0625379706
slight modification in the synchronization protocol to handle correctly multiple clients on the server (token management was not working).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13257 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 23:28:20 +00:00
hilnius
e139380a59
cleaning the logs now everything works. Now a player can connect to a server, select a kart (all in console), and the server can start a game. The game starts on clients when the server tells it.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13256 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 16:50:17 +00:00
hilnius
d6618969f4
there was a stupid operator<< instead of >> in network_string. That explains other bugs that happened (32-bits words were truncated to 8-bits)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13255 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 16:44:19 +00:00
hilnius
f2d11aa425
really weird bug
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13254 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 16:23:02 +00:00
hilnius
9bf6dde4f3
improving synchronization protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13253 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 16:10:50 +00:00
hilnius
dec7a74c99
fix a bug in asynchronous protocols update management
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13252 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 15:58:08 +00:00
hilnius
ec65fb96aa
synchronization protocol double/int conversion error fix
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13251 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 15:44:21 +00:00
hilnius
dc3b5fe35c
correcting a bug in events propagation
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13250 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 15:32:36 +00:00
hilnius
e954bde7ee
more debug info in console
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13249 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 15:06:11 +00:00
hilnius
1d1728553d
switching timer count to double instead of int
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13248 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 15:00:59 +00:00
hilnius
83d64e6fc2
adding log
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13247 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 14:50:28 +00:00
hilnius
3bb6122f8e
modifying the protocol system to have bon synchronous and asynchronous updates (required by gui and graphics to avoid crashes because of threads)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13246 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 14:31:14 +00:00
hilnius
72dd260bd1
fix on the countdown
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13245 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 13:53:47 +00:00
hilnius
4134f65dd7
a player can now start an online game. synchronization should work now
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13244 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 13:50:39 +00:00
hilnius
13aa1d52c8
fix a blocking infinite while
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13243 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 13:44:17 +00:00
curaga
9dc33d1d90
Move the no-trust fps counter check lower, so it only flickers once, not twice
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13239 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 13:17:05 +00:00
curaga
403e82c97b
Fix compiler warning
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13238 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 13:15:47 +00:00
hilnius
e95bafca44
adding even more log
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13237 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 12:56:19 +00:00
hilnius
12107053c0
adding log to better understand what is happening
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13236 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 12:51:02 +00:00
hilnius
cebbfdeb06
fix a bug that was making the game freeze (one protocol asked to start a protocol, and before the start of this protocol, was making infinite loop depending on the latter's existence)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13235 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 12:43:39 +00:00
hilnius
d3ac41f984
there was a problem in the server code : main loop never starting
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13234 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 12:31:18 +00:00
hilnius
b36e089ff9
can now start a game after a server requested it. synchronization does not work for now
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13233 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 12:27:32 +00:00
hilnius
ab4a1995c0
online race startup sequence - adding players config in the state_manager
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13232 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 11:38:47 +00:00
hilnius
853d244882
was a problem with starting protocol in setup
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13231 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 11:15:15 +00:00
hilnius
4bde8a9337
adding a countdown feature to the synchronization protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13230 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 11:10:51 +00:00
unitraxx
ecaa073eb5
Made the few buttons there are in lobby, do something.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13229 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 01:32:09 +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
395b000bee
Removed the addons_screen references to the tab_stop method which were left behind
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13226 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 00:37:05 +00:00
unitraxx
ebc1af345d
Remove the tab hack completely
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13225 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-15 00:32:19 +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
hilnius
db376f9745
a bit more log
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13223 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 22:54:45 +00:00
hilnius
6fdf7cb55e
some things forgot in last commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13222 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 22:37:22 +00:00
unitraxx
567f6302ed
Removed the old tab hack from scalable font. (Could someone check if done correctly?) and made it possible for table entries to have both left-aligned and centered content.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13221 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 22:24:06 +00:00
hikerstk
36653fada6
Updated VS project file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13220 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 22:09:06 +00:00
hikerstk
f16244e3d0
Added support for physics-only meshes (i.e. invisible walls), see #1014 .
...
Some changes to the exporter still required.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13219 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 21:57:34 +00:00
unitraxx
a0b20697d2
Removed space for icon, if there is none.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13218 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 21:52:51 +00:00
unitraxx
bc236c0f99
adjusted addons_screen and server_selection to use the new capabilities of the list widget
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13217 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 21:47:48 +00:00
unitraxx
de6cc44b2a
List widget now supports multiple columns, each cell can have an icon and or text.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13216 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 21:33:33 +00:00
hilnius
c50a24a25d
adding a protocol to start a game, added features in the synchronization protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13215 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 21:19:22 +00:00
unitraxx
2d0d407d7f
Small bugfixes in the CGUIListBox
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13214 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 01:01:56 +00:00
unitraxx
b44f547057
Copied the CGUIListBox widget to make an STK version.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13213 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 00:34:47 +00:00
hilnius
75df500884
synchronization protocol works. the command 'synchronize' in the command line after being connected (both on client and serv) will start the protocol on both and calculate the average ping
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13212 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-14 00:00:20 +00:00
hilnius
8a2f6a9888
debug info in synchronization protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13211 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-13 23:35:34 +00:00
hilnius
e002d4f1bd
correcting the synchronization protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13210 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-13 23:31:56 +00:00
hilnius
2f08ee8902
had forgot to add new files
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13209 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-13 23:16:40 +00:00
hilnius
c1534075d3
adding a protocol to synchronize client/servers and a little bit of code to test it
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13208 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-13 23:12:53 +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
hilnius
ebc4c60e2c
reducing thread consumption. One thread is still updated as often as possible, but i don't know which.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13195 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-12 15:03:32 +00:00
hilnius
12075a19b7
fixing some memory leaks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13194 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-12 14:08:33 +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
hikerstk
706c231691
Avoid crash in case of ENENT_..._NONE messages (which typically
...
don't have packet data).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13189 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 22:41:56 +00:00
hilnius
d0059d32d4
had forgot one line
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13188 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 22:09:33 +00:00
hilnius
09bccbe3e2
may fix things on hiker's windows :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13187 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 22:07:38 +00:00
hilnius
d08239064b
had forgot a line
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13186 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 15:56:10 +00:00
hilnius
d5ab7a666d
connection/disconnection of peers is now handled by both server and clients, when players select karts, other player are notified. the storage of players on a server is fine.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13185 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 15:35:31 +00:00
hilnius
44d18fff28
adding the formerly connected peer in welcome messages for newly connected peers so that they know who is already in the game
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13184 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 14:05:18 +00:00
hilnius
f03e366809
adding debug logging to see why when two players are connected, only one gets all the kart update messages
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13183 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 13:39:36 +00:00
hilnius
4334472a3a
event more pointers, now everything works
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13182 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 13:30:16 +00:00
hilnius
64c1ee950f
more pointers for less bugs
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13181 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 12:59:53 +00:00
hilnius
ea8cb2f5c4
fixing other pointer multi-thread problems
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13180 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 12:22:35 +00:00
hilnius
66de06e0e5
improving management of peers to avoid fails due to multi-threading
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13179 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 12:03:28 +00:00
yasin-ghannam
a701cccc02
Team Identifiers(Needs adding hatOffsets to kart models)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13178 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 01:17:39 +00:00
hilnius
8e8d7110fe
final fix that should fix all thread-pointer-peer-segfault-double free bugs
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13177 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 01:14:12 +00:00
yasin-ghannam
085080e95e
Team Identifiers(Needs adding hatOffsets to kart models)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13176 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 00:57:13 +00:00
hilnius
dfc55a2f0b
silly error causing double delete correction
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13175 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 00:38:33 +00:00
hilnius
f15a9b58c4
should resolve segfaults
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13174 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 00:25:39 +00:00
hilnius
7665f30828
sync work
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13173 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-11 00:03:47 +00:00
auria
e546794ad9
Fix GCC build
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13172 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 23:36:50 +00:00
hilnius
b00bb5c050
fixing segfault and comparison operators
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13171 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 23:03:45 +00:00
yasin-ghannam
d16a5a0552
Team indicators added.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13167 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 22:49:51 +00:00
hikerstk
1639791378
Fixed indentation.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13166 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 22:47:53 +00:00
hikerstk
b20cebfee0
Refactored handling of rescue: this removed a lot of
...
duplicated code, and also allows non-race mode rescue
positions to be tested in track-debug mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13165 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 22:47:12 +00:00
hilnius
3c3868210f
improving again the protocol system, fixing some pointer issues that might appear
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13164 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 22:46:23 +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
8ca4b62038
bored of writing commit messages >.<
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13161 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-10 13:44:30 +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
hilnius
72ed28a992
repairing some bugs appearing after a certain time being connected
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13157 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 23:35:53 +00:00
hilnius
4446f530db
adding command line features for a client to connect to a server
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13155 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 22:05:06 +00:00
hilnius
54aaa39309
correcting a bug
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13154 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 19:13:35 +00:00
hilnius
ae2e656059
updating hilnius branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13151 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 17:37:45 +00:00
hilnius
a55016301e
fixing segfault issues when trying to exit, the protocol update thread is now launched by the protocol manager (and not the network manager)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13146 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 14:07:28 +00:00
hilnius
008c2d57b2
fixing a crash due to gui modal dialog
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13145 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 13:14:48 +00:00
hilnius
60e4a2bb5e
adding possibilities to connect directly with command-line options, adding console entry for the client server manager'
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13144 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 12:42:44 +00:00
hikerstk
157d688f96
Fixed compiler warnings.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13143 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 06:59:07 +00:00
yasin-ghannam
c22941d354
Initial Score display. (Using only the first two karts)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/soccer@13142 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 04:26:23 +00:00
unitraxx
bd3ee05f10
Small fix to comply with changed server-code. (Not tested - though is relatively small change.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13141 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 02:04:35 +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
hikerstk
7919f6e485
Removed unused code.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13136 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-09 00:05:47 +00:00
hilnius
587fcdec32
correcting little bugs in the lobby room protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13133 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 22:53:50 +00:00
hilnius
dc4a32c204
correcting some bug in message exchanging
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13132 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 22:47:24 +00:00
hilnius
b1f823ea71
hmmm that's so good ! working connection, better protocols, fixed ALL the endianness problems (sure this time :p)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13131 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 22:06:57 +00:00
hilnius
0ee94ed9ed
adding console entry for server, server stopping features (unregistering from database), now server_conn can use back the lock that was here
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13129 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 21:04:23 +00:00
hilnius
7476d2a3ca
after more little-big endian issues, people can now connect
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13128 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 16:50:20 +00:00
hilnius
136b9d2b15
little-big endian issue failed before
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13127 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 16:02:08 +00:00
hilnius
39436d464c
little-big endian issue
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13126 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 15:57:46 +00:00
hilnius
ac6534615c
fixing a ENet connection issue
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13125 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 15:47:28 +00:00
hilnius
4a93c84adb
server-client connection should work now
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13124 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 15:34:12 +00:00
hilnius
293e53bbd1
supposedly working server-client connection
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13122 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 15:03:36 +00:00
hilnius
f56f1ec3b1
weird commit number 2 to fix issues
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13120 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-08 14:36:39 +00:00
hilnius
1e94193b8b
splitting --no-graphics option into --no-graphics and --with-profile options
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13118 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 22:55:21 +00:00
auria
f198e93d0a
Bugfix: in some cases, like after tutorial, game would play at wrong difficulty
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13117 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 22:52:01 +00:00
hilnius
acf1ff548a
fixing a segfault caused by mipmaps in --no-graphics mode and adding a connect to peer protocol (for the server)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13116 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 22:23:13 +00:00
auria
66b96868ee
Fix some cases of input getting stuck during tutorial
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13115 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-07 22:07:59 +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
3ef2c4772a
Merge my branch with networking branch
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13103 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 14:10:32 +00:00
hilnius
2f7bcd60bb
starting a merge
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13102 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 13:03:14 +00:00
hilnius
e0e64680a5
merging trunk and networking. 'data/gui/menu_story_focus.png' has its networking version kept (dunno why the two files were different, they seemed same to me)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13101 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 11:48:23 +00:00
unitraxx
4208a28f7d
Merge and lobby GUI tweaks
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13100 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 01:28:31 +00:00
auria
900d495ee9
Make GUI lists just use box, to make them in line with the latest changes that borders should be inside width/height
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13098 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 01:05:08 +00:00
unitraxx
bf13bed7a2
Merge with trunk
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13097 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-06 00:38:39 +00:00
unitraxx
83b270cccd
Lobby settings screen. Quick draft that will be used to test the server functionality. (Looks ugly now, need to merge with trunk again.)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13096 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 23:26:44 +00:00
unitraxx
8617e0e15c
Key navigation now works perfect. (Had to be changed due to the fix Auria provided for the GUI Engine)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13095 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 23:23:28 +00:00
auria
88c1a3b56c
Prevent double ribbon events when using mouse on a ribbon that's in a dialog
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13094 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 22:55:12 +00:00
auria
2719079977
Improve upon previous commit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13093 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 22:41:25 +00:00
auria
d5168a6f4f
Fix textbox glitch : you could still type in the box after it lost its focus
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13092 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 22:37:52 +00:00
hilnius
78b9a7d6a7
adding a new string class to easily format packets. added features in the lobby protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13089 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 16:16:02 +00:00
hilnius
ed6e4ebfb4
correcting the ai kart bug due to the former networking removal
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13088 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 12:01:29 +00:00
auria
8e2ccb7762
Fix restarting tutorial
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13086 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-05 00:02:50 +00:00
auria
af09c253a7
Return to overworld after tutorial if it was started from there
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13085 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 23:56:24 +00:00
hilnius
6b35cbb8fd
adding connection stuff in the lobby protocol, and a xls file in doc/ to describe the protocol
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13084 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 22:49:45 +00:00
hilnius
01ceeaa23a
Adding the base class that will contain all information about all players, correcting events passing inside the protocols manager
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13081 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 20:36:50 +00:00
curaga
e3ebbbbb04
sfx mgr: Remove unused function declaration
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13079 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 19:31:19 +00:00
mbjornstk
b9499ce46a
Update build.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13078 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 18:57:23 +00:00
hilnius
2a0a9a3617
merging uni's and hilnius's branches in networking
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13077 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 17:24:20 +00:00
hilnius
253a3ec1e8
cleaning destructors, using log:: instead of printf or std::cout, cleaning more paths, removed useless fnctions
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13076 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 16:59:30 +00:00
hilnius
7a174fd122
cleaning the includes to meet stk's standard
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13075 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 13:19:32 +00:00
hikerstk
464daa8ac7
Updated VS project files.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13074 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 02:49:34 +00:00
auria
eecf0b67f6
merge minimal race GUI into normal race GUI. Slight changes but in the same spirit
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13072 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 01:38:13 +00:00
auria
c39795b445
add close button on track info dialog, as requested on forum
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13071 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 01:10:49 +00:00
auria
ad6b60520c
Apply patch by xenux to improve the reload button
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13068 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-04 00:32:26 +00:00
auria
7e2548ff28
Fix misleading comment
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13066 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 23:22:06 +00:00
auria
ef148dd8cc
Rework how <box> tags work in STKGUI files for finer control over layout. Adapt existing layouts accordingly.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13060 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 02:00:08 +00:00
unitraxx
b52c905f9e
Beginning of networking lobby.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13057 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-03 00:12:00 +00:00
auria
a27853a592
Apply patch by Lilian Gimenez to support gamepad triggers in input code
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13054 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-01 22:50:59 +00:00
hikerstk
ae0cfe90da
Fixed compiler warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13052 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-01 22:43:01 +00:00
unitraxx
49717d8cca
Fixed what should happen when pressing enter in the register and sign in dialog.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13051 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-01 01:06:11 +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
auria
ba320dc16d
Apply patch by xenux to improve addon filtering
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13049 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 23:38:21 +00:00
unitraxx
a6b492129e
[_GSoC Uni_] 'Screen' has now a callback 'onDialogClose' which gets called by 'ModalDialog' after being dismissed. (Also removed a debug line in RibbonWidget)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13048 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 22:16:29 +00:00
stephenjust
0f250999f8
Fix VS compilation problem from addon filters
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13046 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 19:01:15 +00:00
unitraxx
965a429bca
[_GSoC Uni_] Changed the online screen to use deactivated icons, now that's possible (again), instead of icons with a locked badge for actions that aren't allowed for unregistered users. Also changed initial focus of the screen, depending on the state of the user.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13042 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 16:35:53 +00:00
unitraxx
d183cd3451
[_GSoC Uni_] Added extra flag to Widget, to allow hiding of widgets before they are added. Note that only RibbonWidget supports this at the moment and that other widgets should be adapted before making use of this feature (not so hard though). What it basically does is, not taking into account hidden widgets for lay-out calculation and navigation and not making an IGUIElement for the widget as it is not needed.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13039 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 15:14:26 +00:00
unitraxx
6d37125348
[_GSoC Uni_] Merge to revision 13035
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13036 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 00:56:57 +00:00
auria
27642f332c
Apply patch by xenux to filter addons, thanks a lot\!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13035 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 00:29:43 +00:00
auria
1a5a3be3cc
Apply tentative patch for ticket 964
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13034 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 00:13:28 +00:00
auria
fc9515222f
Tweak textboxes skin
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13033 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 23:46:51 +00:00
hilnius
613e97d0d6
breaking everything that was working. cannot even start a race now, need to rewrite the network manager and part of the race startup sequence
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 22:57:18 +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
0850ccf617
[_GSoC Uni_] Added a method to ribbon_widget to look for a child on id and get a widget returned.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13030 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-29 22:50:20 +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
hikerstk
4616338fd6
Started to fix rescue problem - more code cleanup will follow later.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13022 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 23:45:48 +00:00
hikerstk
c5686dad01
Minor bubblegum code cleanup.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13021 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 23:39:07 +00:00
curaga
c368706798
No skidding backwards. Fixes 1013.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13014 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 17:49:55 +00:00
curaga
c700843910
Let items return their node
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13010 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:17:42 +00:00
curaga
7acada712e
tinygettext const fix
...
This moves ~8kb of writable data to RO, and improves optimization.
There is no need for the initial array to be writable anyhow.
The upstream project seems dead, so no point in submitting there.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13009 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:16:22 +00:00
curaga
9173c9b454
Make lod's getLevel public
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13008 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 12:15:28 +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
red-skull
10668e8c68
Final part to fix #854 :
...
don't remove addons.xml and news.xml during re-init of NetworkHttp,
it's not needed anymore to force refreshing them when clicking "reload".
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12999 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 01:18:02 +00:00
samuncle
07f9e39680
Remove an old debug printf
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12998 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-28 00:08:41 +00:00
hikerstk
674be5b6d0
1) Fix #1011 by re-implementing the bubblegum not as a
...
damping of velocity, but as a max_speed restriction.
2) Bubblegum parameters are now fully configurable in
stk_config.xml.
3) Apply slowdown fraction also to speed increases
(e.g. previously a max speed of 23 with a zipper
giving a 15 additional speed with a slowdown of
0.3 would end up as: 23*0.3 + 15 = 21.9.
Now it is (23+15)*0.3 = 11.4. While this was done
mainly for bubble gums, it can affect other items
as well.
4) Used bubblegum as one word consistenly in variable
names and xml files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12995 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-27 22:25:36 +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
samuncle
ee856d6a9b
Add and effect when the kart jump and land. To be improved
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12988 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-27 00:56:04 +00:00
unitraxx
83ff1cbe79
[GSoC Uni_] Made login and register dialogs navigable without mouse.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12987 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 17:29:52 +00:00
curaga
9ddeac772a
Likewise for userconfigparams
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12986 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 13:32:02 +00:00
curaga
ead8c059cb
Remove some unused irr_driver includes
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12985 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 13:31:38 +00:00
hikerstk
f147d8e662
Added some (experimental) leaning for karts driving fast in
...
a curve. Feedback welcome (note many karts have some leaning
in their animation, best use a kart like suzanne which doesn't
do that).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12984 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 11:00:53 +00:00
unitraxx
488b55f0e8
[GSoC Uni_] Registration has now 3 fases. Login also uses the new red error messages. This commit works for all testers as it doesn't connect to a server.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12983 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 01:41:28 +00:00
auria
524c0c6a59
Add shortcut to easily test swatters
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12982 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 01:23:26 +00:00
auria
50d62cc103
Minor clarification in challenge dialog
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12981 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 01:23:05 +00:00
unitraxx
32c9aff78e
Edited label widget to allow color changing after the widget has been added.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12980 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-26 00:19:23 +00:00
auria
901bde8db3
Fix ticket #809
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12977 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-25 23:44:57 +00:00
unitraxx
f553d962d5
[GSoC Uni_] Moved online gaming related gui xml files to a separate folder. Changed the login dialog to have an input message and started with a registration dialog.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12976 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-25 15:16:03 +00:00
samuncle
55edd4d38b
Now each items that explode had it's own explosion
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12974 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-25 10:52:37 +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
hikerstk
cceed70e09
Fixed another compiler warning - hope I didn't break anything.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12971 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 23:09:39 +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
auria
15cebefa34
Fix reloading addons, ticket #854
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12966 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 19:11:44 +00:00
auria
8c07a80162
Convert explosion from hardcoded particle system to our current XML system
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12964 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 18:40:30 +00:00
hikerstk
4b81118cdc
Updates VS project files.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12960 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 06:13:44 +00:00
hikerstk
5595882cbd
Updated VS9 project file.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12958 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 03:57:33 +00:00
hikerstk
47f27a4ea9
Fixed more compiler warnings (and added a const).
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12957 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 03:56:50 +00:00
hikerstk
cfb60ba114
Fixed compiler warning.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12956 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 03:56:19 +00:00
auria
4039b9a7ef
Apply patch by xenux to replace the text rating with star icons. Thanks\!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12954 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-24 00:34:38 +00:00
samuncle
31bab05953
Small bug corrected for the new nitro
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12951 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 23:15:07 +00:00
auria
31c148752b
Remove useless logging
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12950 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 22:40:18 +00:00
auria
ddec322a01
Improve error reporting
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12949 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 22:40:04 +00:00
samuncle
416a05ec39
Improved nitro. Now we have a nice smoke :)
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12939 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 20:40:46 +00:00
samuncle
ac79047804
Nitro effect improved
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12926 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 19:19:23 +00:00
samuncle
a6d3b2019b
Now skidding's particle are just under wheels
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12921 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 13:42:08 +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
curaga
f54b10ccd5
Less load-time flicker
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12912 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-21 08:20:12 +00:00
curaga
454fef7fe4
Fix crash when closing window in the middle of a race
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12911 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-21 08:19:17 +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
auria
2f18766b09
As was suggested some time ago, in nitro challenges, replace 'Go' with 'Collect nitro', since not everyone reads the dialog to know what they have to do before launching the challenge ;) and this causes much confusion
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12898 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 00:40:03 +00:00
auria
1bbab17913
Fix assertion failure at end of challenges
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12897 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-20 00:31:31 +00:00
auria
16dcb4f38b
Lock the highest difficulty until the game was beaten
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12891 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 23:21:22 +00:00
auria
2c336bb89e
Tweak GP-win message to be more accurate
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12890 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 22:27:50 +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
hikerstk
5e5356c005
Fix #989 : be able to use other devices than mouse for the
...
addons loading menu. THanks to xenux for the patch.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12885 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-19 09:14:10 +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
hikerstk
088fd6edd5
Removed unused m_previous_finish_pos in KartStatus ( #980 ).
...
Atm the start position in a GP is determined by the overall GP rankings.
The variable m_previous_finish_pos was meant to be used when using
only the previous race position to determine the order. Since no one
complained about the way it is now, I just removed this variable.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12879 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 08:44:11 +00:00
hikerstk
2695639421
Cosmetic change only.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12878 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 08:39:45 +00:00
unitraxx
609c908101
[uni GSoC] Some initial GUI code
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12876 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 02:44:00 +00:00
unitraxx
f863609de8
[uni GSoC] dialogs/login_dialog.cpp:39: undefined reference to 'vtable for LoginDialog'
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@12875 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-18 01:53:26 +00:00
hikerstk
fc12f317e3
Fixed bubble gum skid marks which could be in the air.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12860 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-13 23:19:20 +00:00
hikerstk
3c2846d48e
Added support for specifying the 'time' for waves, since the old way
...
of using 'speed' it is very hard to make sense of the value (2*pi*speed/1000
= time in seconds). This still needs to be supported in the exporter though.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12859 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-13 10:49:14 +00:00
hikerstk
637dbf043f
Fix #199 : speed of 0 makes water disappear.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12858 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-13 07:38:57 +00:00
auria
485551aa89
Apply patch by KroArtem to fix minor issues : unused variables and other minor warnings from cppcheck, crash when launching from terminal with AI karts in a mode where AI is not supported
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12857 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-09 20:04:07 +00:00
hikerstk
a529a07c99
Fix #981 : karts are sometimes rescued when restarting, or facing the
...
wrong direction. Reason was an incorrect rotation in the projection
code. Instead of fixing it, I let the kart fall a little bit, so the
code is now correct, much easier to understand, and the bounce after
a reset fits the game imho.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12852 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-06 23:08:52 +00:00
hikerstk
fef4d10c7b
Cosmetic change only.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12850 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-06 22:07:41 +00:00
hikerstk
c532c9d175
Updated VS2010 project file, thanks to yasin.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12847 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-03 21:53:46 +00:00
auria
95c099137b
Remove accidentally introduced tabs
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12844 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-02 23:53:10 +00:00
auria
d052ff36d1
Apply patch by xenux to correctly place focus when navigating addons screen with gamepad. Thanks!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12843 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-02 23:51:12 +00:00
curaga
5b330aa0e4
On modern hw, you do want to always clear at the start of frame.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12842 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-02 10:34:32 +00:00
curaga
97b5069c39
Bind wireframe mode to the home key
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12841 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-02 10:24:41 +00:00
curaga
304dceae8c
Add a common GLSL check.
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12836 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 11:01:59 +00:00
hikerstk
5513ca08cb
Applied mpujari80's patch to fix vs12 compilation - thanks!
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12835 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 10:43:34 +00:00
curaga
769e093ae2
Fix linux build from 12832
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12834 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 10:31:27 +00:00
curaga
3e1843b129
Using namespace irr, so use it
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12833 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 10:11:43 +00:00
hikerstk
9787cb84cc
Reverted r12826, since I prefer to have the core:: etc in place (to help
...
new developers in identifying where things are coming from). So instead
I removed the namespace statement, and fixed up all other references.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12832 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 10:04:48 +00:00
auria
4d1cc7a770
Add asserts to try catching bug #923
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12831 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 00:25:12 +00:00
auria
8745306354
Try to fix bug #972
...
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12830 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-31 23:48:51 +00:00