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

123 Commits

Author SHA1 Message Date
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