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

10512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joerg Henrichs
981036656d Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-01-15 11:53:32 +11:00
Joerg Henrichs
4f740fd6a5 Some refactoring 2014-01-15 11:51:48 +11:00
Joerg Henrichs
0464274b84 STKMesh: Fix glUniform wrong call 2014-01-15 11:51:01 +11:00
Marianne Gagnon
bc6be28f7d Add ignore file 2014-01-14 19:50:51 -05:00
Joerg Henrichs
949877b826 Fixed compiler warning. 2014-01-15 11:49:37 +11:00
Joerg Henrichs
0adddd4401 STKMesh: Force GL_REPEAT to wrapped texture component. 
It fixes bad uv in valley.
 2014-01-15 11:48:40 +11:00
Joerg Henrichs
e6bfc695cb SSAO: Honor the user parameter. 2014-01-15 11:47:24 +11:00
vincentlj
f338fbacb1 SSAO: Use a proper rand() function to generate fragment local coordinate system. 
This new level of randomness get rid of most banding effect, SSAO now looks quite good.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15072 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-14 14:22:01 +00: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
vincentlj
dafc30b2d0 Force blending mode for draw2d. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15070 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-14 01:31:26 +00:00
vincentlj
23d0b42b5f Light: Simplify slightly shader 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15069 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-14 01:24:28 +00:00
vincentlj
a5c84822cc Fix colortexturedquad shader/vertexpointer. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15068 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-14 01:05:03 +00:00
vincentlj
d5c06c8583 Fix colored rectangle color. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15067 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-14 00:11:59 +00:00
vincentlj
1cdb8ec8f3 OGL32CTX: Use VAO for draw2DImage, remove ALPHA_TEST as it is deprecated 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15066 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-14 00:00:21 +00:00
vincentlj
492dae5358 Fix windows build 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15065 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 23:56:59 +00: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
c283f82729 Use draw2DImage for other components in race gui 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15063 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 23:07:29 +00:00
vincentlj
a60f549760 Fix draw2drectangle and spread use of draw2Dimage 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15062 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 22:59:45 +00:00
vincentlj
35f37a62c2 Font looks better now. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15061 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 22:28:10 +00:00
vincentlj
43a206ff2c Characters are now black again. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15060 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 22:16:04 +00:00
vincentlj
c88d89a4f0 SSAO: Some tweaks. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15059 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 18:59:59 +00:00
vincentlj
df62ac5949 OGL32CTX: Render gui using shaders. 
Font is temporarily white.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15058 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 18:31: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
vincentlj
e23d9c23e9 Clean SSAO Provider. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15055 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 18:02:39 +00:00
vincentlj
d84bc88d47 SSAO: Use direct gl calls. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15054 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 17:56:05 +00:00
vincentlj
e2a6ce7889 Remove an unneeded drawAll. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15053 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 17:41:19 +00:00
vincentlj
959ad054de Clean Fog provider. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15052 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 17:37:33 +00:00
vincentlj
badb01c68b Use custom gl calls for fog. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15051 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 17:30:25 +00:00
vincentlj
6f2f7c480a Use direct call for some gaussian3blur invokation. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15050 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 16:54:48 +00:00
vincentlj
f2ef95a7b5 Found another instance of PassThrough Shader usage. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15049 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 16:40:31 +00:00
vincentlj
4063fe83a9 Remove rain effect provider it's not used anymore. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15048 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 16:05:46 +00:00
vincentlj
c02d99ed9f GPUParticles: Do not grow when size is 0 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15047 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 16:05:26 +00:00
vincentlj
c520db663f OGL32CTX: Some fixes. 
The track is now displayed (even with light) but not the karts, animations...

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15046 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 15:28:37 +00:00
vincentlj
6a8396ea33 Forget a passthrough call and fix texturedquad shader. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15045 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 15:22:58 +00:00
vincentlj
3504f04a4e Remove unneeded flip shader. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15044 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 14:54:07 +00:00
vincentlj
7d1df19342 Use a passthrough shader for some fullscreen effect. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15043 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 14:50:16 +00:00
vincentlj
645d4504ab Clean GaussianBlur6 shaders. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15042 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 14:31:31 +00:00
vincentlj
62e5fbf6ad Use direct call for Gaussian 6 Blur. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15041 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 14:23:30 +00:00
vincentlj
9b4288b576 Lights: Clean lightblend provider. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15040 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 13:43:18 +00:00
vincentlj
a21f77706a Lights: Also use direct calls for lightblend. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15039 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 13:38:59 +00:00
vincentlj
4f209d38c6 Light: Readd blending so that sunlight is not killed by pointlight. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15038 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 13:15:51 +00:00
vincentlj
1edba6d394 Clean PointLight Provider and snow provider. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15037 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 13:07:12 +00:00
vincentlj
f654967b07 Lights: Use custom gl calls. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15036 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 12:56:27 +00:00
hikerstk
d53e3180ac Fixed enabling internet in the GUI (i.e. re-init of 
news manager and addons manager will happen now).
For online menu a dialog is now presented to explain why 
it can't be selected if internet is disabled. Addons can
be selected with internet is disabled if there are
existing addons (so that it's possible to remove addons
without internet access).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15035 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 11:35:12 +00:00
hikerstk
428f74d859 Removed old network_http and related data structure. Its function 
is now either in the addons/news_manager, or in Online::RequestManager.
Also added leack check and copy-preventing to online/Request.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15034 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 05:21:48 +00:00
hikerstk
c8d066ce37 Fixed compiler warnings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15033 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 03:02:08 +00:00
vincentlj
468d5458bc Clean color_level shader providers. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 00:11:31 +00:00
vincentlj
164f1dda11 Use direct gl calls for color_levels. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15031 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-13 00:04:53 +00:00
vincentlj
6d57947c73 Remove some leftover comments. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@15030 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-12 23:52:13 +00:00