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

417 Commits

Author SHA1 Message Date
Vincent Lejeune
54c9f32033 Store ambientlight directly in irr_driver. 2014-08-09 01:30:36 +02:00
Vincent Lejeune
c8a9515ad0 Use debug slider to change ambient on the fly. 2014-08-09 01:10:19 +02:00
Vincent Lejeune
5dffc86d26 Use lambda for debug_slider instead. 2014-08-09 00:43:28 +02:00
Vincent Lejeune
281fceee0b Revert "Try to use lambdas." 
This reverts commit cdb760ae51.
 2014-08-09 00:36:12 +02:00
vlj
cdb760ae51 Try to use lambdas. 2014-08-08 21:46:55 +02:00
Marianne Gagnon
c2cd32d4de Fix c++2011 logic from previous commit. STK now builds again on my mac, finally! 2014-07-28 19:01:53 -04:00
Vincent Lejeune
fca54c8f74 Remove some other emplace_back. 2014-07-29 00:48:14 +02:00
Vincent Lejeune
bd7babe11f Rename cpp2011.h 2014-07-29 00:35:43 +02:00
deve
f3746c068c Some minor fixes for MinGW compiler 2014-07-25 13:00:01 +02:00
Marianne Gagnon
9478adbd8c Merge branch 'TupleTest' 2014-07-23 21:17:08 -04:00
Flakebi
55090a0566 Unify log output 2014-07-22 12:54:11 +02:00
Marianne Gagnon
6aa95f58b9 Merge branch 'master' into origin/TupleTest 2014-07-17 20:01:27 -04:00
vlj
14e3ccd059 Duplicate singleton code for abstract/non abstract cases 2014-07-17 01:30:45 +02:00
Marianne Gagnon
44bce402e3 clang fixes 2014-07-16 18:34:59 -04:00
Marianne Gagnon
797dcf845e Test converting code to home-brew Tuple so that STK compiles again on my mac, where clang does not include tuple 2014-07-15 19:48:34 -04:00
Marianne Gagnon
415a502ef1 As requested by vlj, move singleton from networking to utils 2014-07-13 18:03:26 -04:00
konstin
ce7da4b237 running whitespace.py 2014-07-08 20:59:34 +02:00
Marianne Gagnon
21cb22f13a Workaround crash. Vlj, please look at this, this is probably not an idea fix! 2014-06-26 21:43:47 -04:00
hiker
a50177c96a Removed messages.?pp files (and used the strings directly where they 
are needed).
 2014-06-16 22:05:50 +10:00
vlj
31c773079e Add a performance counter for MLAA 2014-06-08 00:25:34 +02:00
vlj
94900fe2c8 Add a performance counter for GUI 2014-06-08 00:20:44 +02:00
hiker
3cd2b97202 Added missing operator-(Vec3, btVector3). Without this operator 
additional typecast where necessary on VS when computing
Vec3-btVector3.
 2014-06-06 09:36:12 +10:00
vlj
588ec08bc1 Merge branch 'CS' 2014-06-05 03:33:02 +02:00
Vincent Lejeune
5b400b7ccb Add some new gpu timers. 2014-06-05 03:19:19 +02:00
hiker
e3513b10c6 Merge branch 'master' of https://github.com/Flakebi/stk-code into Flakebi-master 2014-06-05 08:23:47 +10:00
hiker
8960b79181 Wait for request_manager to be ready to be deleted (i.e. current request 
have been properly aborted, and sign out done). Also shut down more of
STK after signaling the request manager to shut down, so that the user does
not notice the time for the sign out. Also added docs.
 2014-06-05 07:56:51 +10:00
Flakebi
af6c121a22 Run whitespaces.py 2014-06-04 15:10:20 +02:00
hiker
c62cc7fbaa Added CanBeDeleted class, which implements a timeout function. It is 
used to make sure that (in this case) the NewsManager thread does not
need the file manager anymore when stk exists (which can only happen
on very very quick exists, and slow downloads). This avoids a potential
crash that the NewsManager thread could access the file manager after
the file manager was deleted.
 2014-06-04 16:51:29 +10:00
vlj
2d921ca588 Add a profiler for Dof 2014-05-31 01:52:10 +02:00
hiker
1cb7445e1b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-05-28 21:41:56 +10:00
hiker
b18d7e75ac Rewrote insertionSort to only require operator< (no >), 
and removed the unnecessary operators.
 2014-05-28 21:41:07 +10:00
vlj
40df4afc74 Support some debug option for GI 2014-05-28 07:47:06 +02:00
hiker
36cbb18e27 Fixed compiler warnings. 2014-05-24 12:07:47 +10:00
hiker
63bbf6e092 Converted files to standard unix format. 2014-05-24 12:00:25 +10:00
Marianne Gagnon
78d8199de8 disable crash reporter in debug mode 2014-05-14 20:10:23 -04:00
Vincent Lejeune
6bf67523b9 Prettier gpu timing label. 2014-05-10 20:16:27 +02:00
Marianne Gagnon
c8638ec968 Add basic support to display GPU markers in the profiler 2014-05-07 19:35:31 -04:00
Marianne Gagnon
389ec42bde Improve flying mode 2014-04-28 19:55:30 -04:00
Marianne Gagnon
2e53328847 Add debug sliders for vlj 2014-04-23 19:03:23 -04:00
Marianne Gagnon
99a50ec70c misc little changes 2014-04-13 14:25:10 -04:00
Marianne Gagnon
00e85b4637 Use PtrVector to get for_in iteration 2014-04-10 20:04:33 -04:00
hiker
27a5959fcc Added stack trace to LeakCheck on windows. Re-enabled stack 
trace printing (though off as default).
 2014-04-11 08:00:10 +10:00
konstin
7cc83e1475 running whitespaces.py update 1 2014-03-29 11:33:43 +01:00
konstin
663fffdebb Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces" 
This reverts commit 65e2dcf2f0.
 2014-03-29 11:32:04 +01:00
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +01:00
hiker
eba8fd1e45 Remove passwords and tokens from Log:: output. 2014-03-05 10:34:28 +11:00
Bart Cools
c131312b33 Implemented the possibility to give yourself "negative" attachments (parachutes, anvils, bombs) to be able to playtest more efficiently 2014-02-28 11:10:35 +01:00
Marianne Gagnon
148ab7deb3 Improve profiler to CSV export 2014-02-16 19:05:30 -05:00
Marianne Gagnon
1e8c2ff523 Use plain ofstream to write profiler CSV 2014-02-16 18:10:29 -05:00
hiker
7b993cd210 Fixed VS compilation. 2014-02-16 21:31:41 +11:00
Marianne Gagnon
fd8496ffba Fix linux/gcc compilation 2014-02-13 18:57:51 -05:00
Marianne Gagnon
8227e1c092 Add first rudimentary way to dump profiler measurements to CSV. More work to do! 2014-02-12 21:06:12 -05:00
KroArtem
2772fafcf0 cppcheck fixes, use logging in kart_selection.cpp 2014-02-04 02:53:50 +04:00
KroArtem
e0a6ec717e cppcheck: unused functions 2014-02-03 00:53:18 +04:00
gl3nn
06b7ba09f5 Bool to string fix for challenges. String to bool applied for 
achievements.
 2014-02-02 15:50:10 +01:00
Marianne Gagnon
3e253be31e Misc code improvements 2014-01-29 19:20:57 -05:00
Marianne Gagnon
878d0dcf05 Improve profiler a bit 2014-01-24 18:38:47 -05:00
Marianne Gagnon
069f15937a Improve profiler a little 2014-01-22 19:40:40 -05:00
hiker
d4b95e81b4 Moved hash function from StringUtils into player, there is no 
other use of that function.
 2014-01-23 09:54:48 +11:00
Vincent Lejeune
aeba31c4cf Profiler: Fix the rendering and use finer grain. 2014-01-20 20:06:04 +01:00
gl3nn
ca8d9560b7 Forgot to take out the log statement. 2014-01-18 01:23:48 +01:00
gl3nn
3941b782b8 Fix for the overloaded toString() function that takes booleans as 
parameter.
 2014-01-18 01:07:01 +01:00
Joerg Henrichs
949877b826 Fixed compiler warning. 2014-01-15 11:49:37 +11:00
hikerstk
9ee06a5fe0 Replaced boolstr with toString specialisation for bool; 
fixed translations in current user. Otherwise many many
cosmetic only changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15071 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-14 11:47:25 +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
hikerstk
6ee751e3c3 Added new class to handle command line parameters, which 
simplifies parameter handling in main (e.g. it's not
necessary to list and ignore parameters in the 2nd
pass, when they were handled in the first pass).
Removed some command line options for which there
is a guy (e.g. --weather), or which are not really
useful (--list-karts). 

All parameters to options must now consistently be
specified using '=', e.g.: --log=1 and --kart=tux.

Also removed support for 'classic' camera (which was
not used anymore). Removed now unneccessary #include
in user_config.hpp, which made some #include changes
in other files necessary.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14939 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-06 12:23:16 +00:00
auria
f1aac9e317 Adjust logging to make STK less annoying to debug under visual studio : output the logging directly to VS's output pane, instead of having to reply on the small cmd.exe popup that closes as soon as the application exits 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14807 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 03:02:33 +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
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
deveee
5c58d07278 Avoid code duplication in debug.cpp file 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14721 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-13 10:34:58 +00:00
deveee
3ba8f1bd38 Add parachute to debug menu 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14720 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-13 09:06:54 +00:00
deveee
052b7eb07f Add powerups for all local players in debug mode. 
Often I need to check something in multiplayer mode - for example bubblegum shield.
Why F1, F2, F3 etc. was removed? ;-(

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14719 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-12 17:51:14 +00:00
deveee
375b1a1f06 Revert r14655. It is already fixed in r14660 and redeclaration breaks compilation. 
Tested on VC2010 - it compiles and runs.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 09:50:37 +00:00
hikerstk
3af325d672 Fixed VS 2012 compilation. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14681 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 03:15:50 +00:00
auria
aebd8d2996 Minor tweaks 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14678 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 02:15:54 +00:00
auria
0383a9ec55 more debug menu love 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14677 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 02:03:16 +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
auria
f96a647a9c Modularize the rendering a little (I am aware this results in a very small loss of performance, but given the large amount of virtual method calls we make every frame, should be pretty insignificant, and will make the rendering much easier to follow). Fix VS 2013 support issues. Improve material to reject mutually exclusive settings that result in render bugs. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14665 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 20:06:44 +00:00
auria
7bb321a108 fix vs2013 compilation 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14664 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 17:19:04 +00:00
auria
85191ef9b1 Fix compilation on VS < 2013, tested and confirmed to work by nixt 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14655 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 02:39:38 +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
deveee
33525285d7 Fixed compilation problem 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14639 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-05 17:30:44 +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
deveee
33e09e8f59 Solved conflicts before merge hilnius branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14637 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-05 17:28:04 +00:00
deveee
bc46c305f3 Solved conflicts before merge hilnius branch 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14636 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-05 17:27:23 +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
hikerstk
697a7cf111 Oops - forgot files in previous commit. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14621 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-03 23:11:29 +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
funto66
3b6aab44b5 Fix compilation with Visual Studio 2010 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14619 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-03 22:38:49 +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
funto66
3a659d45dd Add basic crash reporting functionality on Windows 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14586 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-29 22:33:11 +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
376d60b8c6 Some refactoring of xmas code. Command line options: 
--xmas=1 enables xmas hats anytime, --xmas=2 disables
it completely, and (default) --xmas=0 (default) switches
Xmas mode on between 17. of December and 9th of January.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14396 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-07 11:34:13 +00:00
hikerstk
c0783283e0 Fixed VS compilation (without WIN32_LEAN_AND_MEAN 
VS defines MAX_PRIORITY as a macro).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14384 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-04 09:58:24 +00:00
auria
43e9d17eeb Apply safe part of supermat's patch to let STK build on clang on OSX. The part about long GLuint remains to be seen, not too sure what to do about it 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14344 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-29 23:14:51 +00:00
hikerstk
41804c99da Fixed windows compilation (without WIN32_LEAN_AND_MEAN 
windows will define a macro MAX_PRIORITY, which clashes
with the constant of the same name in http_manaher).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@14281 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-21 04:29:40 +00:00