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

10112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nixt
ef792f3d01 Revert r14686: Accidentally applied to trunk. When did I get trunk privileges? 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14687 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 14:07:28 +00:00
nixt
5113dc3337 SVN messed up data/shaders in my branch. 76 files in local copy, 21 on SF. Re-adding folder to branch. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14686 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 13:11:09 +00:00
hikerstk
09dc33d07e Moved the glowing data from stk_config.xml to items.xml. 
Unfortunately I can't test (since the shaders don't work for me).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 12:24:26 +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
samuncle
fe2c682ed1 Use the color violet for displaying FPS. Everything related to debug/etc should be in violet 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 02:59:29 +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
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
auria
31c29c7a92 Fix visible line in front of kart in SSAO 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14675 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-09 00:39:07 +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
9a2b4cc3ab Further modularisation of rendering 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14672 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 21:27:56 +00:00
hikerstk
5cf8c7bf77 Languages are now sorted alphabetically. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14670 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 20:47:49 +00:00
auria
db0a3d37a2 Undo samuncle's commit that added specular lights, but in a way that would only work on nvidia gpus 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14666 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 20:19:46 +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
668e8dc719 Apply supermat patch to remove a couple leftover hit messages, thanks 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14663 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 17:10:20 +00:00
samuncle
1880cf9492 Palm trees are corrected #1120. It was caused by the flag of the Z-Buffer that was disabled 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14661 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 14:04:46 +00:00
funto66
a6d4d423da Fix compilation on VC2010 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14660 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 08:10:20 +00:00
samuncle
0f96fe219b Correction of the window bug #1120 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14657 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-08 02:51:38 +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
auria
c6681f05bc Fix crash when adding new device 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14652 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-07 17:02:22 +00:00
auria
b6002111b7 Add new music for minigolf 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14650 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-07 16:53:32 +00:00
auria
b8e42e3fe2 Apply patch tested by SuperMat to fix clang compilation 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14649 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-07 16:23:40 +00:00
samuncle
627004a536 Add glow support for banana and bubblegum 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14648 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 23:19:43 +00:00
samuncle
b0ce591330 Better outline (glow) color for: banana, bubblegum, box and nitro 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14647 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 23:18:49 +00:00
hikerstk
723c4683ce Fixed STK hanging on exit (at least in one case ;) ). 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14645 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 13:13:16 +00:00
hikerstk
f7cf407208 Deallocated http manager earlier (in case that it is using a command 
which needs any of the objects that have been deleted while cleaning up).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14644 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 13:12:45 +00:00
hikerstk
94abdc5b05 Improved work around for graphics cards that do not allow stencil for FBOs 
(like Intel hd3000). If a FBO with stencil can not be allocated, disable
stencil, and switch off pixel shaders.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14643 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 12:05:21 +00:00
hikerstk
ee2cea0aca Removed abbreviated language names from language selection widget. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14642 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 11:57:14 +00:00
hikerstk
86b1b67c61 Fixed windows compilation (missing lib), and some compiler warnings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14641 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 03:54:31 +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
samuncle
5b5fd87a8b Add two per track parameter for color correction 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14633 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-04 16:33:14 +00:00
samuncle
7f214d4458 Restore flip shader and put the color correction in a dedicated shader 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14632 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-04 14:24:02 +00:00
samuncle
6b0962f876 Add the callback for the color correction shader 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14631 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-04 14:21:27 +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
hikerstk
46bb243955 Added constant 'stencil' to make it easier to disable stencils for people 
with cards that don't support it (like apparently hd3000).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14626 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-04 00:46:34 +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
7c2e48e2c6 Fixed VS compilation (MAX_PRIORITY is a #define somewhere), and while 
it can probably be disabled, it's just annoying to search the reason for
a rather incomprehensible error message all over again.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14622 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-03 23:54:11 +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
0f098329a6 Removed mergeinfo in that branch. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14615 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 23:46:08 +00:00