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

11888 Commits

Author SHA1 Message Date
Benau
9fb7f5617b Merge remote-tracking branch 'origin/master' into transparent_kart 2016-04-04 09:02:45 +08:00
Benau
dca821d4e6 Allow looking back when watching replay 2016-04-04 09:02:04 +08:00
Benau
ae8fac6dcb No powerup display when watching replay 2016-04-04 07:54:24 +08:00
Benau
740e4e10c8 Remove soccer team color handling in kart model 
Let hope in the future someone is smart enough to implement that...
 2016-04-04 07:53:33 +08:00
auria.mg
53b8b90ae6 Update servers list as they are found 2016-04-03 18:56:35 -04:00
auria.mg
b0af2b40b3 Multiplayer : don't lock tracks 2016-04-03 18:42:46 -04:00
Benau
224bd277b3 Better function name 2016-04-03 13:59:10 +08:00
Benau
508ddfcd45 Show translucent icon for ghost kart in race gui 2016-04-03 11:27:46 +08:00
Benau
2e016e63b4 Allow displaying transparent wheels and speed weight objects 
That's done by copying the mesh, not sure if it should be avoided...
 2016-04-03 00:17:36 +08:00
Benau
ccd6294699 Add transparent ghost kart in STK 
There is already define for soccer team too, so in the future,
if anyone is smart to make a shader to draw red/blue karts,
it should be easier.

TODO: wheels and speed weight objects. (They seem need to be copied to work)
 2016-04-02 15:53:21 +08:00
Benau
34f9d507d0 Fix real lan network connection 2016-04-01 09:59:16 +08:00
auria.mg
894a38f6c7 Fix empty popup when no lan server detected 2016-03-31 20:40:42 -04:00
Benau
a3265d5c15 Fix uninitialised member value 2016-03-30 10:58:21 +08:00
hiker
932365cee3 Fixed VS compilation. 2016-03-29 11:18:19 +11:00
hiker
840244d476 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-29 11:09:55 +11:00
hiker
5c83249a30 Fixed crash in stand-alone server. 2016-03-29 11:09:07 +11:00
auriamg
640b6bb6b8 Merge pull request #2464 from Odd0002/master 
Fix debug build on GCC 5.3.0
 2016-03-28 20:08:53 -04:00
Benau
09bfdafd12 Use current font to getDimension for text 
Fix crashes
 2016-03-28 14:46:04 +08:00
Benau
4e0f217fc8 Remove unneeded cast 2016-03-27 20:53:33 +08:00
Odd0002
47bac3b33d Fix debug build on GCC 5.3.0 2016-03-26 22:36:22 -05:00
Benau
692539690d No combined uint32 
Sorry people, you will need to re-record replay
 2016-03-27 08:31:31 +08:00
Benau
dff5f8d459 Allow auto recreation of ghost replay file lists after recording. 2016-03-25 16:11:32 +08:00
Benau
151cc72e22 Save skidding info in replay 2016-03-25 15:37:53 +08:00
Benau
11b119066c Add support for using ghost kart in challenge 
Real challenge file added later.
 2016-03-23 14:26:48 +08:00
Benau
8df9ff2cd8 Simplify ghost replay screen 2016-03-21 15:18:47 +08:00
hiker
ee4c4bd962 Try again to fix crash when exiting the server profile screen without networking. 2016-03-21 14:14:21 +11:00
hiker
ad545861ed Fix crash when exiting the server screen (network was still set to 
be enabled).
 2016-03-21 13:59:42 +11:00
hiker
fcc2b6493b Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-21 12:13:27 +11:00
hiker
e1ce01b5d2 Removed mostly unnecessary default constructor. 2016-03-21 12:12:01 +11:00
Benau
7aad4835b9 Merge branch 'new_track_gui' 2016-03-21 08:54:49 +08:00
hiker
065edebc70 Merge pull request #2455 from tobbi/coverity_issues_2 
Add missing unlock
 2016-03-21 11:53:35 +11:00
Benau
a62145ed6e Merge remote-tracking branch 'origin/master' into new_track_gui 2016-03-21 08:48:54 +08:00
hiker
ca0f66e4f8 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-21 11:03:48 +11:00
hiker
1f4776abb3 Allow server gui to start selection. 2016-03-21 09:58:21 +11:00
Marianne Gagnon
e28b48c61b Fix previous commit 2016-03-20 18:51:05 -04:00
hiker
fa721409c0 Show connected players on server gui. 2016-03-21 09:50:29 +11:00
Marianne Gagnon
cbf1e4b5d7 Remove unused files, fixes #2458 2016-03-20 18:40:43 -04:00
hiker
05483396c2 Also show name of selected karts on waiting screen. 2016-03-21 09:39:17 +11:00
hiker
be7c7bfcbc Show Waiting screen on server. 2016-03-21 09:38:53 +11:00
Benau
fce3eec66f New GUI for track only screen, used in network and loaded from replay 2016-03-20 16:23:49 +08:00
Benau
4d42010f2a Add missed number of laps setting 2016-03-20 08:54:12 +08:00
Benau
b92210d4a0 No watching replay when split-screen 
And some bugs fixes
 2016-03-20 08:40:55 +08:00
Benau
da70d305a9 Allow watch replay only 2016-03-20 01:33:26 +08:00
Benau
07afd444a8 Allow racing against the replay on equal footing 
It make record while replay possible too.

We show the ghost only when start racing, fixing the overlapping issue.
 2016-03-19 14:57:22 +08:00
Benau
a42ee39240 Merge remote-tracking branch 'origin/master' into random_arena_item 2016-03-19 08:58:25 +08:00
Marianne Gagnon
78abafb9df Attempt proper fix for #2453 2016-03-18 19:35:26 -04:00
hiker
97ac0a6f59 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-19 10:28:01 +11:00
hiker
d25f3cee25 Added time step size as parameter to each protocol's synchromous update 
function (which is needed for interpolation later).
 2016-03-19 10:24:44 +11:00
auriamg
616a34ea77 Merge pull request #2456 from tobbi/coverity_issues_3 
Properly free memory for m_story_mode_status and m_achievements_status
 2016-03-18 19:08:38 -04:00
hiker
10bb5caae3 Show lobby screen on interactive server in LAN mode. 2016-03-18 08:10:47 +11:00
Tobias Markus
8ae746f330 Properly free memory for m_story_mode_status and m_achievements_status 2016-03-17 15:48:24 +01:00
Tobias Markus
0775347431 Add missing unlock 2016-03-17 15:38:40 +01:00
hiker
4101d72d90 Avoid crashes when the server enters the lobby (somewhat temporary, 
the server needs a different kind of lobby anyway).
 2016-03-17 17:20:02 +11:00
hiker
b6bcf33ae0 Added end of race handling, so that clients and server shut 
down properly and go back to the lobby.
 2016-03-17 17:19:21 +11:00
Benau
5b7161710d Add GUI option in track info screen for random item location. 2016-03-17 12:16:19 +08:00
hiker
094a87eb94 Avoid NULL reference crash. 2016-03-17 10:00:03 +11:00
Benau
d2509baf5c Allow random items number and type for arena with navmesh. 
Number and types are hard-coded for now.
 2016-03-17 01:27:24 +08:00
hiker
c6b22cdffb Fix crash when player is not logged in. See #2453 for more details. 2016-03-16 22:29:51 +11:00
hiker
90f82494f7 Cosmetic changes only. 2016-03-16 09:49:30 +11:00
hiker
07048d62fe Removed indices used in reading network string, now all reading 
is sequentially.
Merge branch 'network_string_sequential_read'
 2016-03-15 10:34:19 +11:00
hiker
19222c25bc Merge remote-tracking branch 'origin/master' into network_string_sequential_read 2016-03-15 10:33:47 +11:00
hiker
3a3e8bb49e Create a dummy camera if the server is running with graphics. This 
allows starting a server from the gui.
 2016-03-15 09:53:26 +11:00
hiker
1ad41db6c9 Fixed reading code which ignored 2 bytes. 2016-03-15 00:04:00 +11:00
hiker
7783de8770 Fixed line ending style. 2016-03-13 16:37:19 +11:00
hiker
e267aa9dff Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-13 16:31:36 +11:00
hiker
54463e9d66 Save server password so that authentication works. 2016-03-13 16:30:24 +11:00
hiker
467953cfe6 Merge remote-tracking branch 'origin/master' into network_string_sequential_read 2016-03-13 16:08:21 +11:00
hiker
f2c26f06f1 Another refactoring of NetworkString, this time added support for sequential 
reads, so that you don't need to specify the offset anymore (and no more
removeFromFront).
 2016-03-13 13:49:43 +11:00
Benau
8a9168a024 Remove the hard-coded localized name in language.cpp 2016-03-13 10:25:26 +08:00
hiker
96bf567c2e Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-11 16:46:20 +11:00
hiker
655987b992 Removed NetworkPlayerProfile field from STKPeer (since if splitscreen will 
be supported there will be no 1:1 relationship between peer and players
anymore). All voting related protocols were extended to include the
voting player's player id (sp in future split screen player can vote
individually - though atm they would all vote for the same thing).
 2016-03-11 16:42:35 +11:00
Marianne Gagnon
d0499be4b9 Update protocol to include server difficulty and mode 2016-03-10 19:25:55 -05:00
Marianne Gagnon
90f0c12393 More work on networking UI 2016-03-10 18:48:40 -05:00
Marianne Gagnon
35451515a2 Work on "Create server" screen to include more options 2016-03-09 19:47:45 -05:00
hiker
fc38acbea4 Fixed waiting screen. 2016-03-10 09:29:53 +11:00
hiker
b4d4f770ca Fixed line endings. 2016-03-10 09:28:52 +11:00
hiker
69f128b62f Added some log messages about received events. 2016-03-09 21:22:53 +11:00
hiker
6d1e5dc8ae Fixed crashed caused by sending messages that have been read previously 
(which were sent with incorrect length).
 2016-03-09 21:21:50 +11:00
hiker
45b2fef88a Merge remote-tracking branch 'origin' into remove-event-processing-info 2016-03-09 16:50:51 +11:00
hiker
1923ba0ab4 Two bugfixes (thanks to Benau for debugging). 2016-03-09 16:38:06 +11:00
hiker
67068db470 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-09 13:19:16 +11:00
hiker
603dfe7eee Minor code cleanup. 2016-03-09 13:18:46 +11:00
hiker
62a527a14b Fixed protocol. 2016-03-09 13:16:14 +11:00
hiker
f371a019c6 Fixed compiler warning. 2016-03-09 07:49:27 +11:00
hiker
087d491445 Removed EventProcessingInfo, and pre-computing of protocols that should 
receive an event. Solves potential problem that an event might arrive at
a client before the destination protocol is up and running. Also improved
handling of (dis)connects, now only protocols that can handle a disconnect
event will receive them, hopefully reducing the number of crashes when
a client disconnects.
 2016-03-09 07:46:33 +11:00
Benau
114732035f Fix log 2016-03-08 10:32:35 +08:00
Benau
88fb0a555e Use uniform spelling for SuperTux 2016-03-08 08:17:47 +08:00
hiker
c6cef53c99 Merge branch 'refactor-network-string' 2016-03-07 12:26:36 +11:00
hiker
68e394702b Merge branch 'refactor-network-string' of github.com:supertuxkart/stk-code into refactor-network-string 2016-03-07 12:20:43 +11:00
hiker
1dc5c0b4af Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-07 12:14:05 +11:00
Benau
05081c3033 Fix keep translating online/login issue 2016-03-07 09:08:27 +08:00
hiker
7ff4cd8873 Merge branch 'refactor-network-string' 2016-03-07 12:04:17 +11:00
hiker
94dc236a75 Merge remote-tracking branch 'origin/master' into refactor-network-string 2016-03-07 12:03:09 +11:00
Marianne Gagnon
9500331716 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-06 20:01:48 -05:00
Marianne Gagnon
04999c35ee More work on networking UI 2016-03-06 20:01:40 -05:00
hiker
a462d4a81e Fixed compiler warnings. 2016-03-07 09:12:21 +11:00
hiker
9c71dc78d1 Merge remote-tracking branch 'origin/master' into refactor-network-string 2016-03-06 16:42:16 +11:00
hiker
f70dfb7d5d Fixed crashes (on VS at least) when the string printed contained 
format characters.
 2016-03-06 15:54:39 +11:00
Benau
2d1d912ee8 Fix #1841 2016-03-05 16:01:42 +08:00
Benau
e3cf054ea7 Fix #1835 2016-03-05 12:55:20 +08:00
Benau
6fd6dd8792 Remove hack 2016-03-05 10:04:05 +08:00
Benau
70d5114dd7 Display localized name instead of English translation 2016-03-05 09:49:03 +08:00
hiker
ab641b0dad Replaced the filename for packet log file in the UserConfig with a 
flag to enable/disable this debug output in the file STDOUT.packets
(where stdout is the final set at startup).
 2016-03-03 17:10:18 +11:00
hiker
4947881d10 Removed unnecessary #include in hpp file. 2016-03-03 16:42:46 +11:00
hiker
43b3684e12 Fixed memory leak. 2016-03-03 09:39:14 +11:00
hiker
5ddd577080 Removed incorrect warning messages. 2016-03-03 09:38:53 +11:00
hiker
e1892bc4fd Try to fix handling a kart finishing the race. 2016-03-02 16:58:41 +11:00
Marianne Gagnon
14c8ecddb5 Add waiting screen for networking 2016-03-01 18:58:51 -05:00
hiker
85f15d7221 Removed unnecessary broadcast functions. 2016-03-01 17:13:31 +11:00
hiker
b26c4fc372 Send the kart updates with proper token set. 2016-03-01 17:12:04 +11:00
hiker
c77522c07f Removed ProtocolManager::sendMessageExcept() function. 2016-03-01 16:50:45 +11:00
hiker
052e369df2 Removed unnecessary setting of token, use ProtocolManager sendExcept 
instead of loop.
 2016-03-01 16:45:42 +11:00
hiker
d9f607fc24 Merge branch 'refactor-network-string' of github.com:supertuxkart/stk-code into refactor-network-string 2016-03-01 11:56:49 +11:00
hiker
d086501035 Merge branch 'refactor-network-string' of https://github.com/supertuxkart/stk-code into refactor-network-string 2016-03-01 11:55:57 +11:00
hiker
e3c7033aa1 Fixed incorrect level of info message. 2016-03-01 11:54:09 +11:00
hiker
753868361f Removed many token settings and tests, which are now done in 
Event and when sending the message.
 2016-03-01 09:56:33 +11:00
hiker
1f53923c45 Fixed potentially incorrect code in getFloat; added memory leak check; 
improved handling of m_current_offset; let the NetworkString autpmatically
add the size for the type and token, so the user code only needs to allocate
space for the real content.
 2016-03-01 09:54:26 +11:00
Benau
96a10ce92c Update strings 2016-02-29 10:59:42 +08:00
hiker
b18712f8c2 Added some output when running unit tests. 2016-02-29 13:53:15 +11:00
Benau
4438664907 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-29 10:25:19 +08:00
hiker
390fee96da Try to fix linux release builds. 2016-02-29 11:40:02 +11:00
hiker
a6fbd019fb Fixed linux compilation. 2016-02-29 11:09:40 +11:00
hiker
00347d2743 Removed explicitly setting token (which is now done when sending 
a message to a client).
 2016-02-28 16:42:32 +11:00
hiker
6c022cec6b Use sendMessageToPeershangingToken instead of creating new messages 
in a loop.
 2016-02-28 16:41:54 +11:00
hiker
ceb831d852 Removed STKHost::sendMessage function. 2016-02-28 16:26:48 +11:00
hiker
4b9d9cfc92 Replaced Protocol::sendMessage (which was either a send or a broadcast 
depending on if the caller is a client or server) with explicitly named
functions.
 2016-02-28 16:18:08 +11:00
hiker
c9d3577a13 Removed unnecessary sendMessage function in ProtocolManager. 2016-02-28 15:57:41 +11:00
hiker
58505eeb88 Started to set token in the 'lower level' functions, removing the need 
to set the token in each protocol. Started to remove some of the
unnecessary send* functions.
 2016-02-28 15:54:43 +11:00
hiker
9a16595261 Renamed NewNetworkString to NetworkString. 2016-02-28 14:58:15 +11:00
hiker
1e49595c53 Further improved look of NetworkString log messages. Added unit testing. 2016-02-28 14:55:48 +11:00
hiker
be815e4234 Fixed various bugs caused by switching to new NetworkString class. 2016-02-26 16:38:59 +11:00
hiker
5c32cbe1be Fixed crash (getUInt takes m_current_offset into account, which made 
the indices partially invalid).
 2016-02-26 09:20:13 +11:00
hiker
8621437e07 Use NetworkString's log function. 2016-02-25 17:02:51 +11:00
hiker
2357e965b4 Fixed crash, and started to improve log output. 2016-02-25 17:00:08 +11:00
hiker
6f55877e94 Fixec various crashes. 2016-02-25 16:54:31 +11:00
Marianne Gagnon
ba4e9d1a79 Tweak default config as suggested in ticket #2438, it's not perfect but seems much better that what we had previously in most cases 2016-02-24 19:20:14 -05:00
hiker
03f4339cee Handle error in lan connection. 2016-02-25 09:49:45 +11:00
hiker
9d546d4980 Use BareNetworkString to correctly decode requests-for-servers. 2016-02-25 09:49:09 +11:00
hiker
1655a4889d Use BareNetworkString. 2016-02-25 09:48:47 +11:00
hiker
28bb228914 Added missing initialisation. 2016-02-25 09:46:17 +11:00
hiker
2e8ddb1c50 Added a new base class 'BareNetworkString' for NetworkString, 
used it for some of the messages exchanged before the ProtocolManager
is started (i.e. establishment of initia connection).
 2016-02-24 20:32:11 +11:00
hiker
98ba11d9ba Started to introduce new network string. It compiles, but certainly 
does not work yet.
 2016-02-23 16:29:57 +11:00
Benau
abdd32c070 Fix warning 2016-02-22 07:43:29 +08:00
Benau
8f1daabbe1 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-22 07:26:26 +08:00
Benau
dafde30077 Fix crash when press save replay key when it's not initialized. 2016-02-21 15:13:32 +08:00
Tobias Markus
d8cce95b0e Add forgotten override's where necessary 2016-02-21 01:36:15 +01:00
Benau
64522d9d13 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-17 14:03:58 +08:00
Benau
c65b0aaae0 Save jumping event in replay file 2016-02-17 14:02:33 +08:00
Marianne Gagnon
1e0586dc40 Add missing files forgotten in previous commit 2016-02-16 18:52:54 -05:00
Marianne Gagnon
9c49312714 Work on networking GUI, combine older server interfaces with the newer online/profile screens 2016-02-16 18:33:09 -05:00