Commit Graph

19034 Commits

Author SHA1 Message Date
deve
b90a9fbf0d Don't allow totally disable particles in GUI.
Now we don't use tfb shader to compute particles, so it seems to not have a sense anymore.
And it's still possible to set particles_effects=0 in config.xml if someone will need it.
2018-04-27 06:50:39 +02:00
deve
bf1392cadc Keep important particles enabled on lowest settings 2018-04-27 06:44:56 +02:00
hiker
c8befd7505 Fixed compiler warning. 2018-04-24 17:30:15 +10:00
hiker
6f38a56dfa Merge branch 'lan-broadcast' 2018-04-24 17:28:19 +10:00
hiker
88abad8dc7 Moved handleMaterialGFX() and updateEngineSFX() from update()
to updateGraphics() - i.e. only one per rendered frame.
2018-04-24 17:19:13 +10:00
hiker
f2f15ac4e0 Removed duplicated entries. 2018-04-24 09:22:52 +10:00
hiker
2a89e7e0d1 Merge remote-tracking branch 'origin/lan-broadcast' into lan-broadcast 2018-04-24 09:18:41 +10:00
hiker
0809f3e286 Added 192.168.1.255 as default broadcast address. 2018-04-24 09:16:55 +10:00
Benau
62ea07ecc8 Try to synchronize timer independent of music 2018-04-24 01:01:47 +08:00
Benau
b919c82da5 Merge remote-tracking branch 'origin/master' 2018-04-23 23:47:30 +08:00
hiker
866eba936d Try to fix linux - compiles. but untested. 2018-04-24 00:37:53 +10:00
hiker
59b796a7f5 Since broadcasting to 255.255.255.255 does not work in all cases,
add code to create a set of potential broadcast addresses and
use them all. Duplicated will be filtered out (since likely a server
will replace more than all).
2018-04-23 23:30:48 +10:00
Alayan-stk-2
d3659232e0 Fix time-to-ticks build issue (#3215) 2018-04-22 20:18:46 -04:00
auria.mg
c08093d732 Merge branch 'More-AI-improvem'
# Conflicts:
#	src/karts/controller/skidding_ai.cpp
2018-04-22 19:36:37 -04:00
hiker
8e1f046b86 Fix the handling of messages that arrive before the last saved state
(which currently causes a crash).
2018-04-22 22:07:21 +10:00
Benau
bc8539ae10 Add some sound effect for lobby 2018-04-22 15:07:08 +08:00
Benau
d4eaec6667 Fix crashed sound repeating 2018-04-22 14:44:43 +08:00
Benau
7ddd498156 Add a separator as auria suggested when reentering the lobby 2018-04-22 14:32:41 +08:00
Benau
96797e9325 Fix wrong code to make it the same as comment 2018-04-22 14:01:11 +08:00
auria.mg
ad7555d8ea Fix race GUI glitch kart icons to line horizontally at the start of a race 2018-04-21 21:04:21 -04:00
auria.mg
bb88ffc460 Merge branch 'game_protocol' 2018-04-21 19:53:56 -04:00
auria.mg
cbfcc55ebc Fix cutscenes sychronisation, fixes #3213 2018-04-21 19:12:25 -04:00
auria.mg
edb3cc4f0b Fix material slowdown not working, fixes #3212 2018-04-21 19:05:45 -04:00
auria.mg
c9d1d1c579 Fix issue with ticks vs time elapsed in scripting engine 2018-04-21 18:46:21 -04:00
Deve
8d767f0c8f Fixed flooding with wrong way messages.
Fixes #3214
2018-04-21 22:51:21 +02:00
Benau
a4198536a0 Reset server if no player in lobby between a grand prix 2018-04-22 01:03:25 +08:00
Benau
e1797f0572 Don't use NetworkConfig which got deleted already 2018-04-21 16:41:25 +08:00
Benau
448ad5abcf Clean up network local player handling 2018-04-21 16:32:43 +08:00
Benau
82a396ed56 Fix kart headlight in network 2018-04-21 16:30:38 +08:00
Benau
ba681a7cf8 Initial GP in network 2018-04-21 16:00:14 +08:00
Benau
6728951985 Fix incorrect camera index for GP 2018-04-21 12:55:55 +08:00
Benau
708d558528 Fix #3191 2018-04-21 10:25:05 +08:00
Deve
e0a5bd1027 Restore dropping bubblegum after shield explosion 2018-04-20 22:04:29 +02:00
hiker
78f96d4818 Temporary 'fixed' banana handling. 2018-04-21 01:32:03 +10:00
Benau
d55d5d0f3f Get local player id from server for GP sorting later 2018-04-20 19:10:40 +08:00
Benau
75a63f6bae Remove unused protocol type 2018-04-20 17:33:07 +08:00
Benau
afa647ac90 Remove unneeded rewind test in skidmarks 2018-04-20 17:22:33 +08:00
Benau
3772045f99 Fix GLES 2018-04-20 17:01:59 +08:00
hiker
359cb4770a Merge branch 'master' of github.com:supertuxkart/stk-code 2018-04-20 18:26:48 +10:00
Benau
611def3c04 Fix sp shader debug handling 2018-04-20 16:25:12 +08:00
hiker
42d21ba9f9 Merge branch 'master' of github.com:supertuxkart/stk-code 2018-04-20 17:59:59 +10:00
hiker
4a0444987a Fixed skidding in network mode. Only the jump duration is part of
the state, the current height of the kart in case of a jump is
then computed (without keeping track of speed etc). Jumping is
now only done during updateGraphics().
2018-04-20 17:31:31 +10:00
Benau
91e1bd3fd1 Try to fix invalid string by store a copied of translation 2018-04-20 14:36:19 +08:00
Benau
a071e022a5 Do the same for race event manager for non-stop network 2018-04-20 14:18:26 +08:00
Benau
32c1255c10 Make sure no dialog exists when going back to lobby 2018-04-20 14:18:05 +08:00
Benau
0c33803159 Let the network game keep going even race paused dialog shown 2018-04-20 13:30:17 +08:00
Benau
e5c991e3d2 Merge remote-tracking branch 'origin/master' into kobato 2018-04-20 13:03:34 +08:00
Benau
2dada03bae Save available karts and tracks from clients in STKPeer
So if this peer disconnects later in lobby it won't affect current players
2018-04-20 12:19:58 +08:00
Benau
bd13f40584 Reset server to accepting client state if no more connected players 2018-04-20 12:19:58 +08:00
Benau
99a25bb837 Implement a proper end and restart race in network 2018-04-20 12:19:58 +08:00