Commit Graph

1121 Commits

Author SHA1 Message Date
Benau
0a5c1a69c7 Use shared_ptr for protocol to avoid leaking
With weak_ptr it's also possible to auto clear LobbyProtocol when
STKHost is shutdown
2018-02-18 12:39:05 +08:00
Benau
4c1cc50955 Don't pause timer in network as it breaks rewind
Also remove the unneed protocol manager checking
2018-02-17 15:38:56 +08:00
hiker
52e9330212 Removed debug output. 2018-02-10 17:34:10 +11:00
hiker
113e3c0c09 Merge branch 'game_protocol' of github.com:supertuxkart/stk-code into game_protocol 2018-02-09 16:09:39 +11:00
hiker
8eddff3e34 Merge branch 'speed-cap-to-physics' into game_protocol 2018-02-09 16:03:58 +11:00
Benau
9a5ce54c4f Merge remote-tracking branch 'origin/master' into game_protocol 2018-02-09 00:53:02 +08:00
hiker
2e3e594967 Merge remote-tracking branch 'origin/master' into speed-cap-to-physics 2018-02-06 11:27:02 +11:00
hiker
baa0677b1a Handle max- and min-speed capping in phyiscs (which is frame rate
independent).
2018-02-05 15:57:40 +11:00
Ben Krajancic
f6f051e85b Consistent split screen (#3105)
* Splitscreen positions are now consistent across rounds

* Fix tabs

* Remove unnecessary comments
2018-01-27 19:27:17 -05:00
Benau
6bcee60a1c Merge remote-tracking branch 'origin/master' into game_protocol 2018-01-24 10:20:06 +08:00
Benau
a3a00f70f8 Remove unused entries in materials and fog settings 2018-01-15 13:23:21 +08:00
Benau
9c2f91c11b Don't crash for wip-tracks / karts (wrong shader name or incomplete terrain) 2018-01-15 11:07:58 +08:00
Benau
bb0cf72635 Add required code and color selector for rainbow karts 2018-01-13 00:38:46 +08:00
Benau
9ccb34c2a1 Adjust graphics presets for SP 2018-01-12 12:03:31 +08:00
Benau
4252895d8b Remove old unused glsl code 2018-01-12 01:18:07 +08:00
hiker
7b21bb16e6 Remove debug output. 2018-01-11 08:21:40 +11:00
hiker
547e59e866 Avoid storing history information during a rewind. 2018-01-04 09:01:24 +11:00
Benau
7797115867 Add SP for correct normal and easier shader system 2017-12-25 14:00:10 +08:00
hiker
825deed8dd Merge remote-tracking branch 'origin/master' into game_protocol
Fixed various conflicts.
2017-12-09 00:56:30 +11:00
auria.mg
c59af9136c Merge branch 'KartPerGamemode'
# Conflicts:
#	src/states_screens/gp_info_screen.cpp
2017-11-21 19:20:49 -05:00
hiker
f38f30a75c Merge branch 'master' into game_protocol 2017-11-15 08:12:38 +11:00
auria.mg
b95e0a3373 Fix #2990 2017-11-11 18:15:55 -05:00
hiker
4fced331fe Merge remote-tracking branch 'origin/master' into game_protocol 2017-11-10 16:08:03 +11:00
auria.mg
158d83057c Fix FTL reset bug, fixes #3019 2017-11-05 18:22:27 -05:00
hiker
54b32ba6b1 Merge branch 'master' into game_protocol 2017-11-05 13:03:15 +11:00
Fantasmos
cb1a2b1e25 Rename m_num_karts to be more appropriate, removed redundant variables I've made 2017-10-28 12:51:49 +11:00
Benau
6896c44da8 Clang fix 2017-10-20 18:35:28 +08:00
Benau
88e15147b8 Merge remote-tracking branch 'origin/win-64bit' 2017-10-17 00:55:22 +08:00
Benau
4573e51e98 Fix #2427 2017-10-15 19:14:07 +08:00
Deve
f96863c421 Add a possibility to totally disable particles.
Particles cause a crash on some radeon devices, so people can at least disable it to make the game working.
Also tfb causes quite big slowdown on slow devices even if there is no particles displayed, so it can give few more fps.
2017-09-08 00:33:46 +02:00
hiker
ab6fbd2609 Merge remote-tracking branch 'origin/master' into fix-ball-cannon 2017-08-29 09:19:41 +10:00
Benau
ad369b88da Remove .b3d usage in stk-code 2017-08-21 16:02:06 +08:00
hiker
f3d56b37df Merge branch 'master' into win-64bit 2017-08-16 17:29:57 +10:00
hiker
6edfc02ec5 Removed debug output. 2017-08-11 17:10:59 +10:00
hiker
aa757637ec Added more profiling events for rewinding. 2017-08-11 09:46:30 +10:00
hiker
28890aad33 Merge branch 'master' into game_protocol
Some minor changes to make code easier to read.
2017-08-09 09:50:46 +10:00
Benau
979e1546fb Fix #2881, only create a camera when initializing 2017-07-21 09:27:57 +08:00
hiker
95016d03f4 Removed unnecessary loop. 2017-06-22 17:32:27 +10:00
hiker
dd9e361289 Stop startup time being accelerated in network games (which results
in client and server to become out of synch).
2017-06-14 08:28:06 +10:00
hiker
283f3b94d3 Fixed tiem correctoin (which was in the wrong direction). 2017-06-14 08:27:34 +10:00
hiker
a13856c6d1 Adjust DT on client (due to server requests) at time DT is computed
(to keep consistent DT across all further calls, esp. avoid
issues with rewinding getting different DT).
2017-06-05 09:46:34 +10:00
hiker
f32a1961e2 Minor bugfix. 2017-06-05 09:06:12 +10:00
hiker
490bef516e Fix crash: the ProjectileManager must be cleared before the CheckManager
(since a rubber ball will emove itself from all cannon checklines, so
a crash happens if the checklines are gone).
2017-05-12 17:39:53 +10:00
hiker
5af4ea35a7 Fixed 64-bit related compiler warnings. 2017-04-07 23:43:01 +10:00
hiker
668fdd3b49 Fixed some 64-bit related compiler warnings. 2017-04-07 23:25:52 +10:00
Benau
de3c9d7411 Allow to preserve more texture config 2017-03-16 16:20:05 +08:00
Benau
48f27df1c9 Fix wrong angle when normal is exactly 0, -1 ,0 2017-02-11 16:05:10 +08:00
hiker
69658c557b Refactored the event/state handling to make it somewhat faster by
avoiding creating smaller time steps on the server when events
from clients are received, and also made it easier to handle
duplicated states (i.e. server rewinds and sends a second state
for a certain time).
Still work in progress though.
2017-02-09 09:03:15 +11:00
hiker
cebf24f3af Don't use the time during a rewind to determine if a client needs
to slow down.
2017-01-27 23:45:25 +11:00
hiker
096d68c361 Merge remote-tracking branch 'origin/master' into game_protocol 2017-01-25 18:15:24 +11:00