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

296 Commits

Author SHA1 Message Date
hiker
07a5d90aa0 Merge remote-tracking branch 'upstream/master' into new_login 2014-02-11 22:36:13 +11:00
hiker
8b7754cd4f Merge remote-tracking branch 'upstream/master' into new_login 
Conflicts:
	src/challenges/game_slot.cpp
	src/states_screens/kart_selection.cpp
	src/tracks/track.cpp
 2014-02-10 21:37:04 +11:00
hiker
8d1591b260 Removed all references to current user/slot from unlock manager. 2014-02-10 08:57:16 +11:00
KroArtem
33ea1a6ef5 fix coverity issues 2014-02-09 17:04:15 +04:00
KroArtem
c4fd2eda08 fixing some memleaks 2014-02-09 01:36:32 +04:00
KroArtem
1861c6533a small fix: mismatching allocation/deallocation 2014-02-08 01:21:39 +04:00
KroArtem
2772fafcf0 cppcheck fixes, use logging in kart_selection.cpp 2014-02-04 02:53:50 +04:00
Marianne Gagnon
b726ff79b1 Fix bug found by coverity scan. Hopefully I didn't break anything 2014-02-01 18:36:29 -05:00
hiker
ade89ba89a Merge branch 'master' of https://github.com/KroArtem/stk-code into kroartem 2014-01-31 15:39:53 +11:00
hiker
5e8c8f2715 Fixed linux compilation. 2014-01-31 11:31:26 +11:00
Marianne Gagnon
87f5fd988e Don't use raw char*, use std::string instead. Fixes leaks. 2014-01-29 19:39:38 -05:00
KroArtem
b80548a46e fix some coverity issues 2014-01-30 03:19:41 +04:00
KroArtem
fe9cd74934 fix some cppcheck warnings 2014-01-25 23:21:12 +04:00
hikerstk
54e6396df6 Renamed HTTPManager to RequestManager, and split request 
into three files request, http_request and xml_request.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14978 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 04:57:58 +00:00
hikerstk
a1c964f71d Some refactoring and cleanup of the online request handling: 
added setter/getter, renamed functions to have better names,
removed synchronousRequest from http_manager. Should be no
change in functionality.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14967 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-08 12:08:46 +00:00
hikerstk
7cdca13d7b Fixed all(?) warnings about signed and unsigned comparisons. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14950 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 00:09:19 +00:00
funto66
a6d4d423da Fix compilation on VC2010 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14660 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 08:10:20 +00:00
hikerstk
86b1b67c61 Fixed windows compilation (missing lib), and some compiler warnings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14641 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 03:54:31 +00:00
hikerstk
401f5caac2 Fixed compiler warnings (forcing int to be true or false or so). 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14282 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-21 04:32:05 +00:00
hikerstk
41804c99da Fixed windows compilation (without WIN32_LEAN_AND_MEAN 
windows will define a macro MAX_PRIORITY, which clashes
with the constant of the same name in http_manaher).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14281 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-21 04:29:40 +00:00
hilnius
a64f187844 revision not in the gsoc report 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14236 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-11 22:29:05 +00:00
hilnius
26321be49d implementing the race vote network communications 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14135 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-22 20:40:14 +00:00
hilnius
a637ce6e36 some buxfixes + implementation of the max player count 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14127 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-21 20:56:39 +00:00
hilnius
241a7f63e1 adding comments 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14123 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-21 18:26:02 +00:00
hilnius
c9cb74a9e5 fixing bugs, adding comments, structures and functions for the map vote system 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14122 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-21 18:18:50 +00:00
hilnius
262f70205c merging trunk and fixing compilation issues 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13689 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-15 10:05:34 +00:00
hilnius
5f4270acc6 adding some comments and fixing the kart selection screen bug 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13688 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-15 09:45:22 +00:00
hilnius
20418a82af Lot of changes to make a cleaner startup in no-graphics mode and having a clean exit with all threads being stopped etc... 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13669 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-12 15:54:32 +00:00
hilnius
0bddb320cd Adding packet logging + fixing lost packets (that are now kept for 2 seconds while waiting protocols that should receive them to be started). 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13652 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-09 19:15:31 +00:00
hilnius
6c9473dc1b fixing all kind of problems with connection. Now everything works even if weird network configurations (like mine). It might not work behind professional (work) NATs. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13643 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-07 18:49:48 +00:00
hilnius
ff8fda6219 cleaning way of stopping the listening thread (now uses a mutex locked/unlocked) Fixed some other bugs. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13633 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-09-05 20:19:44 +00:00
hikerstk
074ef2237d Fixed compilation errors (left over references to file that was 
removed).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-30 04:39:51 +00:00
hilnius
71fb252654 removed some useless files + improvements in end-race GUI interaction 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13592 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-29 17:57:56 +00:00
hikerstk
dadca72349 Fixex VS compilation: need to link with Iphlpapi.lib, 
and apparently 'interface' is reserved (or #defined) in VS.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13583 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-28 06:52:11 +00:00
hikerstk
de14757419 Fixed compiler warnings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13582 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-28 03:39:44 +00:00
hikerstk
ffb2ee7c22 Replaced usleep (which isn't available on windows) with new 
custom function in Time::. Replaced calls to irrlicht's
device's sleep function (since it can cause a crash if the
device doesn't exists, which can happen when a thread calls
device->sleep while changing screen resolution).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13580 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-28 03:17:44 +00:00
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
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
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
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
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
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
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
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
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
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