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

106 Commits

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