Commit Graph

11584 Commits

Author SHA1 Message Date
hiker
447ca89c0a Removed CurrentUser usage from all files except PlayerManager
and PlayerProfile.
2014-04-16 11:13:35 +10:00
samuncle
5011f49968 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-16 01:20:23 +02:00
samuncle
1620f87dd8 Add a new particle system 2014-04-16 01:19:03 +02:00
Vincent Lejeune
1a908b254f Use more compatible fbo format 2014-04-15 14:48:27 +02:00
hiker
46bfbe13bf Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-15 16:26:22 +10:00
hiker
5ec71c5b06 Moved getProfile from CurrentUser to PlayerManager::getCurrentOnlineProfile(). 2014-04-15 16:25:55 +10:00
Marianne Gagnon
e4afea5cca Reduce rimlight effect to a more reasonable strenght 2014-04-14 19:56:26 -04:00
Marianne Gagnon
70cb9cec59 Update graphics options screen 2014-04-14 19:32:44 -04:00
hiker
8b05f69031 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-15 09:08:04 +10:00
hiker
3b85f601b1 Support automatic online login even if current user is not saved
(i.e. online login is now started after the player is selected).
2014-04-15 09:07:13 +10:00
hiker
f33a9f7cf6 Fixed #1282: STK crash on startup for the first time. 2014-04-15 09:06:50 +10:00
Marianne Gagnon
9993e31601 First pass to update video options menu 2014-04-14 19:05:33 -04:00
Marianne Gagnon
60a3cfb3fd Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-14 18:32:36 -04:00
Vincent Lejeune
ea1ba4147d Try to fix additive blend for object 2014-04-14 23:50:12 +02:00
vlj
4c85f6255b Remove the ability to disable pixel shaders
It doesn't work with GL 3.1 and mesa drivers (which requires a core
context)
2014-04-14 22:11:20 +02:00
vlj
b7f6084fba Add a config option to disable dynamic lights 2014-04-14 22:06:24 +02:00
vlj
63db2d33c0 Fix a memleak 2014-04-14 21:50:14 +02:00
vlj
b0041633ee Handle skybox texture compression. 2014-04-14 21:48:38 +02:00
vlj
de1bbad76c Add some more graphic config options. 2014-04-14 21:46:51 +02:00
vlj
1d84ea850b Add an option for Tex compression
Also turn m_ssao into bool.
2014-04-14 21:37:50 +02:00
vlj
308c9c3b94 Fix too dark screen with MLAA enabled. 2014-04-14 03:48:35 +02:00
Vincent Lejeune
5b47891514 Apply MLAA after color_in. 2014-04-14 03:30:42 +02:00
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