Commit Graph

15882 Commits

Author SHA1 Message Date
Lucas Baudin
2c9f2c84c5 More macros to disable extra gl calls 2016-02-25 16:27:50 +01:00
Lucas Baudin
f89a4b1a75 Merge back the IEvent changes 2016-02-25 15:55:52 +01:00
Lucas Baudin
368a230ed7 Put some preprocessor macros to prevent unsupported GLES calls 2016-02-25 13:56:43 +01:00
Lucas Baudin
02808cdfd0 GLES2 for android devices by default 2016-02-25 12:06:54 +01:00
Lucas Baudin
d4d3817d63 Disable sound and curl, add freetype 2016-02-24 22:24:33 +01:00
Lucas Baudin
c7c5788086 Add android build files 2016-02-24 20:41:21 +01:00
Lucas Baudin
48069a7bcc More backport from the ogl-es irrlicht branch 2016-02-24 20:34:46 +01:00
Lucas Baudin
a470cd74d6 add android port from irrlicht (based on commit 875d0cfac88c26994b82d68737b085ec1b84c5f8) 2016-02-24 12:34:08 +01:00
auriamg
c0bfd46ee9 Merge pull request #2441 from tobbi/missing_override
Add forgotten override's where necessary
2016-02-21 18:18:25 -05:00
Tobias Markus
d8cce95b0e Add forgotten override's where necessary 2016-02-21 01:36:15 +01:00
auriamg
91bd844dca Merge pull request #2439 from Odd0002/master
Update AngelScript to version 2.30.2
2016-02-18 18:37:03 -05:00
Odd0002
0289e93bcc Silence AngelScript warning as in 6af30b68f0 2016-02-18 09:50:49 -06:00
Odd0002
e69e96af19 Fixed cmake based on https://github.com/supertuxkart/stk-code/issues/2325 and the related commit 2016-02-17 23:48:59 -06:00
Odd0002
fdd6f36b46 Update angelscript to 2.30.2 2016-02-17 22:07:55 -06: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
Benau
51bfc327d7 Make race end-able 2016-02-16 10:20:05 +08:00
hiker
05a1a8a785 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-02-16 12:37:43 +11:00
hiker
2f0a69525a Use kart id instead of kart name to identify kart that has collected an item. 2016-02-15 18:16:31 +11:00
hiker
132ecfe409 Created separate function for handling received collectedItem messages. 2016-02-15 18:00:09 +11:00
hiker
d15a234ace Let only the server decide when a kart finished the race. Notify
all clients if this happens.
2016-02-15 17:45:24 +11:00
hiker
1ad782e6a6 Added comments. 2016-02-11 17:24:55 +11:00
Marianne Gagnon
fe6bbb80c4 Delete unused da_DK translation, closes #2435 2016-02-10 19:56:45 -05:00
hiker
7e6711e163 Renamged NetworkWorld to RaceEventManager (since this class is
not a 'world' in the sense our game modes are).
2016-02-11 09:03:51 +11:00
hiker
99bc5477a2 Use a password to authenticate the client that is allowed to
control a server (now the controlling client can reconnect in
case it gets disconnected, previously with only allowing the host
with id 1 to control, the server could not be controlled anymore).
2016-02-10 18:03:42 +11:00
hiker
bfced53aaf Started to add password support for a controlling a server. 2016-02-10 13:32:39 +11:00
hiker
cebf395939 Only allow the first connected client to control the server. 2016-02-10 08:28:15 +11:00
hiker
ee320588d5 Merge remote-tracking branch 'origin/master' into support_nw_splitscreen 2016-02-09 17:40:59 +11:00
hiker
354770f564 Added 0 number of laps to configuration to test ending a race. 2016-02-09 13:38:25 +11:00
hiker
8f492d8480 Updated documentation. 2016-02-09 13:38:06 +11:00
hiker
f5a344ccb4 Fixed voting for laps and reverse. 2016-02-09 09:41:35 +11:00
hiker
52460d02de Made start/terminate/pause/unpause-Protocol private, so that now all
calls to those functions from the ProtocolManager event loop (which
avoids locking problems).
2016-02-05 16:28:58 +11:00
hiker
af6ecfec3a Removed unused function. 2016-02-05 16:15:58 +11:00
hiker
89979a46f5 Removed unused variables. 2016-02-05 16:09:31 +11:00
hiker
2d0fd0260e Added file forgotten in previous commit. 2016-02-05 10:08:58 +11:00
hiker
6a9a8565d0 Replaced exit mutex with Synchronised. 2016-02-05 09:02:32 +11:00
hiker
89c972c316 Cosmetic changes only. 2016-02-05 08:33:35 +11:00
hiker
e392aa6ead Fixed syntax errors :( 2016-02-05 08:28:21 +11:00
hiker
0d488b916d Use Synchronised instead of mutex for next protocol id. 2016-02-05 08:24:28 +11:00
hiker
348a300c09 Use Synchronised for m_requests instead of separate mutex. 2016-02-05 08:19:26 +11:00
hiker
263e41ec1f The update messages are now handled in the main thread, which removes the
need for locking. Also only the last update event is handled, older events
are discarded.
2016-02-04 17:15:14 +11:00
hiker
4fa7a89963 Fixed (probably debug only) crash: evaluating the pointer arithmetic
left to right had invalid intermediate result (i>0; offset <0).
2016-02-04 16:56:11 +11:00
hiker
f580603c97 Cosmetic changes. 2016-02-04 16:55:42 +11:00
hiker
878760ed2d Fixed GameEventProtocol (e.g. collecting items). 2016-02-03 09:07:15 +11:00
hiker
f5897001d8 Properly lock data structure (I've seen data corruption, most likely
caused by not locking).
2016-02-03 09:05:26 +11:00
hiker
19053d8ac6 Removed unnecessary call. 2016-02-03 08:48:28 +11:00
hiker
cc017da1d6 Let only the server ping the clients (to reduce network traffic). Reduce
frequency of pings (since it appears that often esp. during loading
clients are busy loading which artificially increases latency).
2016-02-03 08:21:34 +11:00
hiker
4f12a9a66c Prevent usage of duplicated host ids (before if hosts A and B are connected,
then A disconnects and C connects, B and C would have the same host id).
2016-02-02 09:52:07 +11:00
hiker
ef8c04e117 Removed unnecessary lock. 2016-02-01 16:45:07 +11:00
hiker
d78c1b3272 Replaced array with scalar value, minor code cleanups. 2016-02-01 16:42:36 +11:00