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

53 Commits

Author SHA1 Message Date
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
hiker
c28728d903 Removed more compiler warnings for 64 bit windows compilation. 2014-09-23 16:23:22 +10:00
Marianne Gagnon
b726ff79b1 Fix bug found by coverity scan. Hopefully I didn't break anything 2014-02-01 18:36:29 -05: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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