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

10539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
hikerstk
4e134fbe82 Tried more fixed values. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14614 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 23:44:33 +00:00
hikerstk
15788359a6 Updated another mergeinfo file. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14613 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 23:41:35 +00:00
hikerstk
94bf328e1e Changed svn:mergeinfo to indicate that all revisions where merged (to solve 
merging issues we have).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14612 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 23:32:08 +00:00
auria
faa7fd7ca5 fix typo that broke SSAO 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14611 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 23:22:03 +00:00
hikerstk
bc2432bb57 Merged with trunk, final part. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14608 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 04:43:14 +00:00
hikerstk
63d5961dd0 Merged with trunk, part 3. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 04:39:40 +00:00
hikerstk
71341a13f6 Merged with trunk, part 2. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-02 04:36:51 +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
samuncle
0a1431aed5 Corrected a bug on intel driver 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14604 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 23:46:12 +00:00
samuncle
9fdfb27a67 Add color correction 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14603 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 22:48:12 +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
samuncle
77db3a2a6e A basic test (TODO, if this is accepted I should make a new shader for only this effect 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14601 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 21:52:07 +00:00
samuncle
cd85c8418b Better grass texture (more colorfull) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14600 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 21:51:49 +00:00
samuncle
aa95ccd5f4 Better grass texture 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14599 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 20:02:14 +00:00
auria
eaef91fc4b Fix multiple crashes when new pipeline is turned off 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 19:42:14 +00:00
auria
f383440d7f More post-graphics-merge tweaks 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14597 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 19:18:14 +00:00
auria
e5fbd5d1fb First reorganisation of graphics options. Remove old MSAA anti-aliasing, offer only new MLAA. Organise options in more logical groups, improve overall popup layout 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14596 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 19:05:44 +00:00
samuncle
4e2a553b1f The test map harvest for the new shader pipeline 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14595 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 17:51:27 +00:00
samuncle
063ea38cc6 A new bias (it works better with harvest 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14594 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 17:47:30 +00:00
auria
d1b8bc6073 Apply modified version of patch to remove remaining hit messages 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14593 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 17:23:48 +00:00
auria
d843c1812d add back accidentally deleted music 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14592 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 17:06:54 +00:00
auria
8cf0030a27 Apply patch to fix OSX compilation 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14591 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-01 16:51:08 +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