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

776 Commits

Author SHA1 Message Date
hiker
4d6b110e56 Removed unnecessary #include of user_config.hpp in other hpp files 
(to reduce the amount of recompilation when user_config.hpp is changed).
 2014-02-26 12:52:16 +11:00
hiker
ade89ba89a Merge branch 'master' of https://github.com/KroArtem/stk-code into kroartem 2014-01-31 15:39:53 +11:00
Marianne Gagnon
3e253be31e Misc code improvements 2014-01-29 19:20:57 -05:00
KroArtem
b80548a46e fix some coverity issues 2014-01-30 03:19:41 +04:00
Marianne Gagnon
3d054ea91b Bunch of small code cleanup 2014-01-25 21:05:07 -05:00
KroArtem
fe9cd74934 fix some cppcheck warnings 2014-01-25 23:21:12 +04:00
hiker
6066dba9d0 Fixed compiler error. 2014-01-23 13:24:08 +11:00
Marianne Gagnon
70fed45ec1 Fix skin crash 2014-01-22 20:15:35 -05:00
hiker
6b27179b96 Added missing initialisation, some cosmetic changes. 2014-01-22 17:26:03 +11:00
gl3nn
4438db3bbf Fixes #11 2014-01-21 23:11:22 +01:00
hiker
5474b5528f Removed unnecessary parameter from onUpdate calls. 2014-01-22 07:43:17 +11:00
gl3nn
27a28514e7 Fix the game state of when dialogs should be popped up. 2014-01-18 02:28:22 +01:00
vincentlj
6697a2d7af Another batch of conversion to draw2DImage 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15064 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 23:19:47 +00:00
vincentlj
a16402e676 OGL32CTX: Missed a draw2DImage call 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15057 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 18:22:47 +00:00
vincentlj
6f680c1a8e OGL32CTX: Use our draw2DImage for scalable_font. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15056 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 18:18:40 +00:00
hikerstk
7cdca13d7b Fixed all(?) warnings about signed and unsigned comparisons. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14950 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 00:09:19 +00:00
vincentlj
7bb1e671b2 OGL32CTX: Port draw2DRectangle too 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14916 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-04 22:10:56 +00:00
vincentlj
3598643332 OGL32CTX: Uses draw2DImage in skin.cpp 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14915 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-04 21:43:49 +00:00
vincentlj
169f29f7b2 OGL32CTX: Spread use of Draw2DImage custom function. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14913 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-04 21:31:57 +00:00
vincentlj
9555bf8c7f OGL32CTX: Use alpha when required 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14904 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-04 17:15:29 +00:00
vincentlj
b28044e603 OGL32CTX: Implement a draw2DImage function using shaders. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14903 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-04 17:12:30 +00:00
hikerstk
c450c97472 Allowed the music directory to be external. Renamed 
getMusicFile to searchMusic and getTextureFile to
searchTexture. Removed m_root_dir from file_manager.
Added convenience function getTexture to irr_driver
which takes an asset type, so now less code is needed
to load textures (though that's proably not used
everywhere yet).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-18 22:29:08 +00:00
deveee
b7a80dd686 Wait for animation before continue using mouse - soccer setup screen 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14734 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-18 12:15:53 +00:00
hikerstk
73c498daf3 Start to support 'externa' data directories. Most directories 
from data can now be moved out (except music). STK prints
an overview of which directory is taken from where. More 
cleanups and improvements will come.
Also moved skins into a separate directory under data (from
data/skins), since it's likely that skins will be part
of a binary package (i.e. changes to skins not really
related to code), while gui files will more likely stay
with the code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-17 23:48:47 +00:00
samuncle
1a776381d5 Correction of the ssao vs fog bug (thanks to vlj). Minor tweaks for fps display and debug menu 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14709 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-11 22:11:32 +00:00
samuncle
4c1dd1ada4 Minor tweak to change the background of the debug menu 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14679 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 02:28:11 +00:00
auria
55018ee089 Extend funto's debug menu 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 01:51:03 +00:00
funto66
39046749d2 Add a debug menu + option to reload shaders (memory leak, yeah, but it's just for debugging) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14674 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 00:09:35 +00:00
hikerstk
b074dc5f09 Moved all VS specific math code (i.e. for round(), isnan) into vs.hpp 
and used it everywhere (I hope).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14640 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 03:49:55 +00:00
auria
85bfec00a0 Correct VS compilation (VS 2013 is 18, not 17) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14629 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-04 01:54:54 +00:00
hikerstk
8032fdb3b0 Converted line endings consistently to unix. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14628 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-04 01:46:55 +00:00
auria
a358c4d8ee Change risky cast into dynamic_cast, fixing crash 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14627 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-04 01:38:29 +00:00
auria
68820bb325 VS 2013 fixes 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14625 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-04 00:36:44 +00:00
hikerstk
d41bbbaa2f Merged uni's branch with trunk. No guarantee that everything works ;) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14620 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-03 23:02:06 +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
hikerstk
ad0fd41d52 Fixed compiler warnings on VS. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 22:16:43 +00:00
auria
5899a26aad Merge cand's graphical improvements branch!! There are many known issues folks, so don't cry victory just now, this is just the beginning. Especially, shadows do not work correctly at this time 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-30 21:33:06 +00:00
auria
5ab8b2b563 Fix crash on empty ribbons, required for what's coming next 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14506 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-21 00:14:57 +00:00
hikerstk
5a7fb84267 Fixed incorrect overloaded getTexture function (char * where handled 
as bool, not std::string), avoided more crashes on missing textures,
adde better warnings.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14505 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-20 22:37:12 +00:00
hikerstk
e6660d7c74 Improved warning messages: most warnings about textures not 
found will now be prefixed with a line indicating what kart
or track it comes from. Fixed crash in referee when a texture
did not exist. Irrlicht's warnings about missing textures
while loading a mesh will be prefixed by a line about which
kart/track is missing as well.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14491 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-20 10:56:42 +00:00
auria
fc37766a6f fix harmless spinner warning 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14474 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-19 01:02:36 +00:00
yasin-ghannam
287ff4c8ee Added time limited-match instead of only goal-limited ones. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14472 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-18 01:58:10 +00:00
hikerstk
8247f73604 Replaced tabs with spaces. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-15 12:52:39 +00:00
hikerstk
c5b8732087 Probably biggest commit (in terms of number of files) ever - 
updated the (c) line of all files to -2013, added missing (c), 
changed format in some cases so that it will be easier in
the future to change them by script. No actualy code change.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14447 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-15 11:43:21 +00:00
hikerstk
a7315d163b Fixed minor memory leak. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14437 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-14 23:56:37 +00:00
hikerstk
9dc4c7a7e9 Removed tab. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14331 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-28 22:04:43 +00:00
hikerstk
28cea5f3e6 Fixed compiler warning. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14328 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-28 11:20:54 +00:00
hikerstk
46b19e2e8b Repository recovery 3: former r14320 
Ignore all events received during the loading screen. Namely, this means that clicking on the STK window to focus it while it's loading will no longer open story mode.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14315 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-28 09:47:03 +00:00
auria
35d3807904 Add missing includes for some recent compilers 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14299 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-24 00:29:05 +00:00
deveee
535d3c87fb Fixed regression since r12673. Add-ons were sorting from "z" to "a" in default mode. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14209 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-05 19:15:14 +00:00