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

11562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Lejeune
ba27eb42ef Bloom: Weight the different sized contribution. 2014-04-14 02:45:15 +02:00
Vincent Lejeune
59df5a90bc Bloom: Tweak the threshold. 2014-04-14 02:15:28 +02:00
Vincent Lejeune
d342dd78d8 Bloom: Use power of two quads. 2014-04-14 02:15:13 +02:00
Vincent Lejeune
123a192963 Use half res FBO for SSAO 
SSAO is a medium frequency effect, using half res fbo is fine and
improve performance and look by doing an additionnal bilinear filtering.
Also tune up some values.
 2014-04-14 01:01:36 +02:00
Vincent Lejeune
4c37cadd5f Fix crash when loading instanced node without texture. 2014-04-13 22:56:14 +02:00
auriamg
4388f230a4 Merge pull request #1286 from marcoll/master 
Avoid the use of the new GP editor as a cheating aid
 2014-04-13 15:55:33 -04:00
Marc Coll Carrillo
82cc7af4f6 Avoid the use of the new GP editor as a cheating aid 2014-04-13 21:34:28 +02:00
Guillaume P
3febfecbef Merge remote-tracking branch 'remotes/upstrem/master' into skiddingAI 2014-04-13 20:31:28 +02:00
Marianne Gagnon
99a50ec70c misc little changes 2014-04-13 14:25:10 -04:00
Vincent Lejeune
f98ff2a5fc Fix skid mark color 
We convert the vertex color value to srgb, optimally the vertex color
should already be corrected on cpu side but it would break fallback
colors...
 2014-04-13 18:00:15 +02:00
Vincent Lejeune
3cd85a829e Compress/convert to srgb per material basis. 
This allows to remove manual conversion in normalmap shader.
 2014-04-13 17:53:52 +02:00
samuncle
1f14e26bde Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-13 01:01:59 +02:00
samuncle
04e5bb1239 Tweak the new camera 2014-04-13 01:01:24 +02:00
Vincent Lejeune
59c50ebbdd Use ITexture instead of GLuint in GLMesh 2014-04-12 22:33:27 +02:00
Marianne Gagnon
a2d60cc97d move camera closer to kart 2014-04-11 21:24:07 -04:00
vlj
d873d2d4fd Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-12 02:17:31 +02:00
vlj
3828e70f5a Fix for glow effect 2014-04-12 02:15:02 +02:00
hiker
fcedb80a89 Fixed some compiler warnings. 2014-04-12 09:49:46 +10:00
hiker
b8c304b229 Merge branch 'SmoothMoveCamera' of https://github.com/divvy81/stk-code into smooth 2014-04-12 09:28:18 +10:00
Vincent Lejeune
68a71f6e22 Use for_in macro in stkmeshscenenode too. 2014-04-12 00:47:32 +02:00
Vincent Lejeune
849709ec1d Revert some CPP2011 related changes. 2014-04-12 00:07:19 +02:00
vlj
443b758e20 Add shaders to MSVC target. 2014-04-11 20:56:23 +02:00
vlj
bc1776d0ff Merge pull request #1281 from konstin/master 
Fixing compilation issues on linux
 2014-04-11 20:50:06 +02:00
konstin
9d22b74b54 Fixing compilation issues on linux 2014-04-11 20:14:20 +02:00
vlj
8775a5e006 Properly clean FBO and RTT. 2014-04-11 17:53:28 +02:00
hiker
71ddeda94f Tried to avoid compilation problem on travis (though afaik there are 
still other issues with building on travis atm), though atm only
by a quick hack.
 2014-04-12 01:48:55 +10:00
Dk
d1dcf826a8 Merge remote-tracking branch 'upstream/master' into SmoothMoveCamera 2014-04-11 17:48:16 +05:30
hiker
488c1231c9 Moved getUserState from CurrentUser to PlayerManager::getCurrentOnlineState(). 2014-04-11 16:37:48 +10:00
hiker
3a5a0a56b2 Moved isRegisteredUser from CurrentUser into PlayerManager::isCurrentLoggedIn. 2014-04-11 16:20:04 +10:00
hiker
071aa01f35 Changed all calls to CurrentUser::getID() to PlayerManager::getCurrentOnlineId(). 2014-04-11 16:06:51 +10:00
Marianne Gagnon
00e85b4637 Use PtrVector to get for_in iteration 2014-04-10 20:04:33 -04:00
vlj
a6abda9115 Yet another attemp to c++0x support in travisCI 2014-04-11 01:17:42 +02:00
vlj
ce9e9790d5 Improve VS generation in cmake. 2014-04-11 01:08:29 +02:00
vlj
0d90ecda16 Another attempt at fixing ci build. 2014-04-11 01:01:38 +02:00
vlj
4259d438b0 Use cmake file pattern tools 2014-04-11 00:57:16 +02:00
vlj
f58cf57768 Add gnu++11 flag to unix build. 2014-04-11 00:42:33 +02:00
vlj
09d13e2bfe Try to fix travis ci build. 2014-04-11 00:37:50 +02:00
hiker
df88a013c2 Fixed more conflicts, removed compiler warnings. 2014-04-11 08:14:38 +10:00
hiker
54c7d67b90 Merge branch 'master' of github.com:supertuxkart/stk-code 
Conflicts:
	src/graphics/render.cpp
	src/graphics/shaders.cpp
	src/graphics/stkmesh.cpp
 2014-04-11 08:08:13 +10: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
Vincent Lejeune
cbc677febb Merge branch 'BatchedDrawCalls' 2014-04-10 23:28:42 +02:00
vlj
42482e0c41 Some more conversion 2014-04-10 23:03:57 +02:00
vlj
3a55bbe796 Generalize use of UBO. 2014-04-10 21:16:44 +02:00
Vincent Lejeune
fee89a3a3e Start decoupling tree based draw sequence. 2014-04-10 21:16:43 +02:00
Vincent Lejeune
55097aba91 Add shader file as comment for easier debug 2014-04-10 21:16:43 +02:00
Vincent Lejeune
9ba636f661 Gather View Projection and shadows matrix generation. 2014-04-10 21:16:42 +02:00
Guillaume P
76025ff784 It's even better with the key of the added repository. 2014-04-10 21:14:15 +02:00
Guillaume P
9a6eb2e34a Clean up and re-enable notifications in travis config. 2014-04-10 21:14:15 +02:00
Guillaume P
9a386c0ee3 Update before_install section in travis config file. 2014-04-10 21:14:14 +02:00
Guillaume P
4586887bf2 Disable notifications. 2014-04-10 21:14:13 +02:00