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

194 Commits

Author SHA1 Message Date
hiker
4bd7848431 Removed duplicated update of the ProtocolManager, and only 
update it when STKHost exists (otherwise STK will crash since
ProtocolManager can get called when it does not exist).
 2018-02-14 09:27:13 +11:00
hiker
26401972d2 Merge branch 'fix-timestep' into game_protocol 2018-02-13 08:41:49 +11:00
hiker
fa20e4f866 Only issue sfx commands once per rendered frame (during the last 
substep).
 2018-02-12 18:01:05 +11:00
hiker
c7bc47f2e3 Fixed world update to be fixed at the physics frame rate. 2018-02-12 09:54:46 +11:00
hiker
b4d9e03e5c On GUI-less servers the frame rate can be <1ms. Previously the minimum 
time-step size was 1 ms, which resulted in the world time advancing
faster than real time.  This caused problems in the communication
and synchronisation with clients.
 2018-01-23 08:30:23 +11:00
hiker
373ec0f242 Made the history files use events for players (will break physics replay 
for AIs for now). Useful for network debugging.
 2018-01-03 16:29:35 +11:00
hiker
54b32ba6b1 Merge branch 'master' into game_protocol 2017-11-05 13:03:15 +11:00
hiker
1cc9f503a4 DT can actually be 0 :P (e.g. in server with no graphics, and I 
guess on really fast computers). Bad things happen with dt=0, so
set dt to at least 1 ms.
 2017-08-11 17:22:25 +10:00
hiker
3923da30bc Use unique names for profiler events. 2017-08-11 09:41:22 +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
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
3747427c5f ixed handling of adding states to time step info to minimise 
rewindw by assigning new events to existing time step info events.
 2017-06-05 08:54:52 +10:00
QwertyChouskie
0123228c20 Set menu FPS to 60 (#2823) 
Smoother, see https://github.com/supertuxkart/stk-code/issues/2302.
 2017-03-27 21:56:20 -04:00
Benau
668b28f632 Allow to config whether to limit game framerate with recordings 2017-03-22 07:43:00 +08:00
Benau
b0adb92964 Make sure all textures are uploaded without using timeout in TTL 2017-03-11 13:35:33 +08:00
Benau
d864995c7d First version of ThreadedTexLoader 2017-03-08 15:54:59 +08:00
hiker
9df07ac0c2 Rearranged code somewhat to make it easier to read - only cosmetic changes. 2017-01-31 18:25:30 +11:00
hiker
096d68c361 Merge remote-tracking branch 'origin/master' into game_protocol 2017-01-25 18:15:24 +11:00
auria.mg
68fe1e58c2 Fix a few divisions by zero, see #2727 2017-01-06 21:26:16 -05:00
hiker
5cde8f785f Fix crash in normal race (RaceEventManager NULL). 2016-12-16 23:26:34 +11:00
hiker
b73d08d089 Removed unnecessary cast. 2016-12-09 16:39:59 +11:00
hiker
fd5f60a786 Merge branch 'master' of github.com:supertuxkart/stk-code 2016-11-11 15:27:45 +11:00
hiker
fda3afad93 Fix 2658 by separating networking code from main loop. 2016-10-27 21:33:42 +11:00
hiker
b1f6632e5b Changed countdown from a mixture of ms and seconds to seconds only; 
added documentation.
 2016-10-27 08:40:45 +11:00
Benau
9aa92cfe30 Fix profiling mode framerate regression 2016-10-18 09:55:30 +08:00
hiker
91363f820b Disable slow-down of game time in case of very low FPS when networking 
is used (this would desynchronise client and server).
 2016-10-10 09:54:44 +11:00
hiker
9cf88ef874 Merge remote-tracking branch 'origin/master' into rewind. 
Fixed conflicts.
 2016-10-04 08:15:40 +11:00
hiker
74f521980a Fixed time handling to be in synch between history and rewind. 2016-09-23 07:56:21 +10:00
Suici Doga
1d75987fe6 Fix typo in main_loop.cpp 2016-09-19 13:54:42 +05:30
hiker
2a06036fb7 Changed order in which rendering and various updates are done, which 
results in the physics reacting one frame earlier to user input.
 2016-08-31 16:31:59 +10:00
hiker
a15c9529a5 Merge remote-tracking branch 'origin/master' into rewind 2016-08-01 08:18:38 +10:00
Benau
bbde4659c1 Allow arena ai profiling 2016-05-05 16:25:54 +08:00
hiker
2745e42935 Added a new 'testing ai', which can be started using a command line 
option to either test it in play against computer, or in AI against
AI races. Atm the test_ai is nearly identical to the skidding
ai, except for one brake statement that needs to be investigated.
 2016-05-03 21:28:11 +10:00
hiker
d092dcf96c Avoid slowdown in profile mode in profile mode when fps is < 60. 2016-04-22 16:04:27 +10:00
hiker
7d0953ad83 Merge branch 'master' into rewind 2016-04-12 17:36:56 +10:00
hiker
d25f3cee25 Added time step size as parameter to each protocol's synchromous update 
function (which is needed for interpolation later).
 2016-03-19 10:24:44 +11: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
73e94e9824 Avoid race condition when a client exits in the lobby. 2015-11-28 12:33:01 +11:00
hiker
5fc830825f Refactoring: Created a separate NetworkConfiguration class which stores 
all information to create the STKHost.
 2015-11-12 09:53:12 +11:00
hiker
1334a467e3 Don't start a STKHost if neither client nor server is requested. 2015-11-01 19:45:28 +11:00
hiker
449e754849 Fixed #2327. 2015-09-29 07:58:24 +10:00
Flakebi
fbf26df23d Merge branch 'master' into fixes 
Conflicts:
	src/graphics/2dutils.cpp
	src/graphics/graphics_restrictions.cpp
	src/graphics/render_skybox.cpp
	src/graphics/rtts.hpp
 2015-07-03 15:29:53 +02:00
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
Marianne Gagnon
80de98f40a Fix build 2015-03-26 21:26:51 -04:00
Flakebi
e5abf4cec3 Merge branch 'origin/master' into fixes 2015-03-08 01:16:51 +01:00
Vincent Lejeune
af265f8345 Use 30 fps in menu 2015-02-23 22:43:11 +01:00
Flakebi
32a044e292 Fix some clang warnings and bugs 2015-02-04 18:30:27 +01:00
hiker
4bb1091f3e Moved sfx thread update to happen after graphics code is finished. 
This improves performance since threads in graphics code do not
compete with threads in sfx handling anymore.
 2014-10-16 17:11:15 +11:00
hiker
aae834ba4b Run the music manager from the sfx thread. 2014-10-16 08:13:55 +11:00
hiker
99fd49bdc0 Run SFX in a separate thread (for #1511). 2014-09-22 17:04:14 +10:00
hiker
c147dacbc2 Queue up sfx instead of starting them immediately. Preparation for 
threading the sfx manager.
 2014-09-18 11:43:26 +10:00
Vincent Lejeune
d480c52f8c Revert "Try to put IA in its own thread" 
This reverts commit 2a60a84155.
 2014-09-12 23:22:54 +02:00
Vincent Lejeune
2a60a84155 Try to put IA in its own thread 2014-09-12 23:04:40 +02:00
Marianne Gagnon
0848087b1d Fix profiler, do not sync twice per frame 2014-09-04 19:45:16 -04:00
Deve
d0091d9977 Fixed accidentaly noticed typo in comment 2014-06-25 22:22:54 +02:00
Marianne Gagnon
07eba6dfd7 Minor profiler updates 2014-01-24 19:13:53 -05:00
Marianne Gagnon
878d0dcf05 Improve profiler a bit 2014-01-24 18:38:47 -05:00
hikerstk
54e6396df6 Renamed HTTPManager to RequestManager, and split request 
into three files request, http_request and xml_request.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14978 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-09 04:57:58 +00:00
auria
22d6dd56ea Undo change that would limit STK to 35 FPS 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14712 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-12 00:39:19 +00:00
deveee
ec13bcf802 Merge branch 'hilnius' 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-05 17:28:55 +00:00
hikerstk
bced8cdb9f Merged with trunk, part 1 (due to previous failures I am splitting this 
patch).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 04:27:55 +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
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
unitraxx
37f3f55da8 Face one of the refactoring! callbacks on http requests get now called by the main thread. So absolutely zero thread-safety has to be taken care of, outside of HTTPManager and its requests. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13503 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-18 22:22:00 +00:00
unitraxx
17b9479fce Quite the mess I'm committing, but it's kind of a back up for the massive refactoring I'm about to do now. It will be great! (hope so) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13502 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-18 21:08:27 +00:00
hikerstk
8ed8963c63 Documented the main loop of STK. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/rewind@13483 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-15 06:20:31 +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
a20c200b77 merging uni's branch. one bug appeared back 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13386 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-30 00:41:47 +00:00
auria
8f77aac50a Apply small patch by lennartack to fix leak in --no-graphic mode 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13264 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-17 22:37:45 +00:00
hilnius
75e75c43ee adding a workaround to be able to start a network client from a server (with --no-graphics option) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13262 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-16 22:27:28 +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
ed6e4ebfb4 correcting the ai kart bug due to the former networking removal 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/networking@13088 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-05 12:01:29 +00:00
hilnius
613e97d0d6 breaking everything that was working. cannot even start a race now, need to rewrite the network manager and part of the race startup sequence 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-06-29 22:57:18 +00:00
curaga
b56bf4dc53 Remove trailing space, git doesn't like it 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-05-29 22:04:35 +00:00
hikerstk
e1033ca9f7 Started to restructure rendering loop - moved things out of rendering 
loop, cleaned up code, ...


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12531 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-02-28 01:05:27 +00:00
auria
04efc6a1cf Undo not too funny April's fool joke committed by Minibjorn. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11064 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-04-01 14:48:26 +00:00
mbjornstk
e1b8b399df Improve FPS feedback. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11055 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-03-31 22:27:11 +00:00
funto66
569308a730 git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10539 178a84e3-b1eb-0310-8ba1-8eac791a3b58 2012-01-01 21:19:13 +00:00
auria
92eb0ebd2a Ran a small bash script to remove all of those annoying strings. The only thing they gave us were the need to rebuild after committing 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-12-06 18:43:36 +00:00
auria
78eac6b7ce Add gloal profiler marker, will help get percentages 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9761 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-09-05 22:55:55 +00:00
hikerstk
6c43457f37 Ignore FPS limit set in the config file if no-graphics 
is selected (this gives a HUGE speedup for non-graphics
run).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9411 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-08-03 00:41:28 +00:00
hikerstk
a62e0f86d3 1) Added new --no-graphics option for fast batch testing. 
Renamed --profile=+-n options to --profile-laps=n
   and --profile-time=n.
2) Fixed averaging in case of --profile-time.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9372 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-07-27 12:11:11 +00:00
funto66
d26b406780 Starting the merge with the swatter branch. Now it should be automatic with karts, but doesn't work with items (yet). 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9275 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-07-15 23:38:40 +00:00
funto66
a8919a8252 Added experimental and buggy hardware skinning support + removed a useless loop in the material manager 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9253 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-07-14 00:59:00 +00:00
funto66
49ea3a9cf9 Improved the profiler: a bar is displayed to show the end of the analyzed frame, there are more markers, now the profiler can be frozen/unfrozen by clicking on it... 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9211 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-07-10 00:04:12 +00:00
funto66
de401bc234 Added a first (unfinished) version of a graphical profiler 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9207 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-07-09 19:13:17 +00:00
mbjornstk
015443f582 Set props as per SVN-CONFIG for .[ch]pp, AKA SVN props clean up day. :) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7493 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2011-01-21 01:54:38 +00:00
hikerstk
07c2a3b3b0 Removed debug output. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6863 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2010-12-05 22:24:01 +00:00
hikerstk
2c15bd265f 1) Made TrackObject use an ISceneNode instead of an IAnimatedMeshSceneNode, 
allowing us to use the same base class for billboard.
2) Fixed billboard implementation: billboards are now properly removed,
   and can also be IPO animated.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6861 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2010-12-05 20:55:09 +00:00
auria
c9c71dddd9 Hopefully fixed crash at exit 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5962 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2010-09-11 16:54:45 +00:00
auria
4afb71659f Modified music handling, fixing the music heard during GP lost/won 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5513 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2010-06-13 18:25:49 +00:00
hikerstk
0a59455a82 Removed LIMBO state, added new RESULT_DISPLAY_PHASE (but at this stage no 
visible change to user).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5424 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2010-05-10 23:53:32 +00:00
auria
297f0cceb4 Renamed SoundManager into MusicManager, since this makes it much clearer what it does (it was just confusing to have SoundManager and SFXManager) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5228 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2010-04-21 17:24:02 +00:00
auria
9074febf54 Fixed missing music issues when aborting race / going back to main menu 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5220 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2010-04-20 19:11:48 +00:00
hikerstk
31e3806fd0 Refactor end of race handling so that more functions are done in a base class only 
(esp. code that was previously duplicated in the battle mode and standard race).
There is now time for an end animation, even if the player should finish last
(in which case the previous end camera would not be shown). This mostly in 
preparation for end animations.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4750 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2010-02-17 11:59:51 +00:00
auria
1f2311cf6f Fixed a FIXME, removed useless code 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4685 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2010-02-11 20:16:30 +00:00