Commit Graph

17273 Commits

Author SHA1 Message Date
Benau
0c091125b0 Remove const cast in three strikes battle 2016-11-25 12:38:08 +08:00
Benau
fe371a28b5 Add non-const function for STK usage 2016-11-25 12:37:40 +08:00
hiker
18f14ae142 Fixed compiler warnings. 2016-11-24 17:48:23 +11:00
hiker
b1afac23a7 Moved creation of the race protocols into lobby, so SynchronizationProtocol
is not involved in the race start anymore.
2016-11-24 08:56:30 +11:00
hiker
617e1c538d Merge remote-tracking branch 'origin/master' into nw 2016-11-23 21:58:00 +11:00
hiker
414b0e0633 Fixed sending 'client ready' twice. 2016-11-23 18:50:44 +11:00
hiker
dd515292ee Fixed deadlock (in case of protocol error). 2016-11-23 18:40:56 +11:00
hiker
62da83317e Fixedc compilation, renamed LobbyRoomProtocol to LobbyProtocol. 2016-11-23 18:39:59 +11:00
Benau
a2bb0487b1 Disable backface culling when set in the material. 2016-11-23 15:16:19 +08:00
hiker
2c7e7d8722 Merge remote-tracking branch 'origin/master' into nw 2016-11-23 17:16:42 +11:00
Benau
eb84de2666 Fix #2491 2016-11-23 10:11:08 +08:00
hiker
026e1623ec Renamed ServerLobbyRoomProtocol to just ServerLobby, ClientLobbyRoomProtocol
to ClientLobby, and LobbyRoomProtocol to Lobbyprotocol.
2016-11-23 09:39:33 +11:00
deve
7f251fdf79 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-11-22 09:16:59 +01:00
deve
467760f248 Remove illogical #ifdef 2016-11-22 08:29:18 +01:00
hiker
09eae7e25f Removed StartGameProtocol, and added the necessary states to the
Lobby rooms. Added documentation of the FSM for the ServerLobby.
2016-11-22 17:57:15 +11:00
Benau
61a00a9068 Fix transparent displacement rendering with advanced pipeline off
Allowing them to render using the same custom alpha uniform used
by ghost karts, fixed #2459.
2016-11-22 12:34:48 +08:00
Benau
c1e931f5ba Merge branch 'legacy_opengl' 2016-11-22 09:23:17 +08:00
Benau
690d36271d Try to fix LOD in legacy pipeline 2016-11-22 00:51:10 +08:00
deve
e9f3fd4806 Fixed compilation with missing vidmode headers after some modifications in our CGUIEditBox. 2016-11-21 08:37:20 +01:00
Benau
befa2394a8 Some improvement to #2667 2016-11-21 11:58:46 +08:00
Benau
72ff03c024 Fix light in legacy pipeline 2016-11-21 11:10:40 +08:00
Benau
de95db5c93 Avoid creating new glyph page too many times 2016-11-20 10:08:59 +08:00
Benau
9734c2e890 Fix crash in billboard text when using legacy opengl
Notice: freetype glyph metrics are not supported
2016-11-19 15:59:58 +08:00
Benau
a52c4699a1 Add back normal map renderer for legacy opengl
Fixed transparent issue
2016-11-19 14:21:56 +08:00
Benau
f853255204 Merge branch 'fix_1704' 2016-11-18 09:51:34 +08:00
Benau
9eb6ef5bfe Simplify code 2016-11-18 09:44:30 +08:00
Deve
952bed5672 Few minor fixes for multitouch steering:
- don't update a button that is already not pressed
- use full axis range, which means higher sensitivity in the center
- make sure that we don't divide by 0
2016-11-18 01:22:32 +01:00
hiker
6b1563321f Use singleton for lobby protocols. 2016-11-18 09:08:37 +11:00
Benau
ac74304dd7 Fix #1704 2016-11-18 00:31:48 +08:00
Benau
b6c1a45918 Use a better define 2016-11-16 10:20:40 +08:00
hiker
ba600f40f2 The server waits now for all client to start (which means it will be
behind the clients by the maximum latency, which in turn means that
at server time T all client events at time T have arrived, so less
rollback necessary).
2016-11-16 08:48:04 +11:00
hiker
019e61ec66 iFixed pi compilation. 2016-11-16 00:19:09 +11:00
hiker
fbd858a64c Fixed non-server compilation. 2016-11-15 12:52:37 +11:00
hiker
ae36208e29 Merge remote-tracking branch 'origin/master' into new-pi 2016-11-15 12:38:21 +11:00
Benau
2f2940115e Use a smooth dt on camera to determine its position 2016-11-14 15:47:55 +08:00
hiker
621e61c644 Fixed coding style. 2016-11-14 18:32:29 +11:00
hiker
feae91042a Explicitly disable X11 compilation for windows. No idea why it is
defined in CGUIEditbox now, but it somehow is ;(
2016-11-14 18:25:00 +11:00
hiker
13bcdcade6 Fixed crash in case of standalone server. 2016-11-14 10:15:40 +11:00
hiker
245045f575 Fixed various crashes on server. 2016-11-14 10:09:25 +11:00
hiker
f2b67f75b6 Minor coding style fixes. 2016-11-14 10:02:46 +11:00
hiker
73182863df Fixed linking problems - will probably not run ;) 2016-11-14 09:59:08 +11:00
Benau
e6e302af1c Fix copy and paste of unicode characters 2016-11-13 15:43:00 +08:00
Benau
5879933a23 Merge remote-tracking branch 'origin/master' into fix_2112 2016-11-13 10:42:47 +08:00
Deve
7e4dfdb97e Remove version from graphics restrictions for sRGB-capable visual workaround.
It doesn't look that they're going to fix it soon.
2016-11-11 16:22:31 +01:00
Deve
e707b7a2ea Remove pthread_setcancelstate functions.
This function is not available on android and it is default on other platforms anyway.
It makes easier to port changes from master to android branch.
2016-11-11 14:11:27 +01:00
hiker
61a3d10e10 More Compile SERVER_ONLY, still not fully working. 2016-11-12 00:09:39 +11:00
Deve
6b2bf1c088 Make sure that we are not out of array.
Command line arguments are not available on android.
2016-11-11 14:07:18 +01:00
hiker
ddcddf4a0a Compile SERVER_ONLY (by #ifdef'ing out all graphics related code).
Does not link yet!!
2016-11-11 23:46:22 +11:00
Deve
452c7c1e40 Fixed compiler warning 2016-11-11 13:44:51 +01:00
Benau
19cd3656a9 Use all cores only in clang for travis 2016-11-11 15:29:17 +08:00