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

8050 Commits

Author SHA1 Message Date
Vincent Lejeune
d7eaaf4885 Add a m_ubo_disabled switch in user config file. 
This should be used to workaround a bug in intel windows drivers.
 2014-04-19 18:38:57 +02:00
vlj
c695875654 PointLight: Use a 1/(1 + d + k d^2) attenuation 
This is not physically accurate, but a 1/d^2 attenuation makes light
extend too broad, and went too high if close from the source.
 2014-04-19 02:04:39 +02:00
Marianne Gagnon
f6d52511ea Merge branch 'Issue_1263' 2014-04-18 18:24:31 -04:00
Vincent Lejeune
c2d9e9fc42 Directly draw on default fbo if dyn lights are disabled 2014-04-18 19:06:57 +02:00
Vincent Lejeune
9437b16c00 Dont print glGetError result, prefer DEBUG_OUTPUT 2014-04-18 18:50:13 +02:00
Vincent Lejeune
b77a20f621 Bloom: Blit fbo instead of using a shader 2014-04-18 18:45:00 +02:00
Vincent Lejeune
9b926ce713 Do not write to 2 buffers outside of renderLights() 2014-04-18 18:34:02 +02:00
Guillaume P
cca44705cb Merge remote-tracking branch 'remotes/upstrem/master' into skiddingAI 2014-04-18 08:49:54 +02:00
Guillaume P
43441cf3cc A kart is now considered as slow if he is slower than the current kart. 2014-04-18 08:49:18 +02:00
hiker
c9fd09725a Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-17 15:40:36 +10:00
hiker
a8bf73633f Renamed CurrentUser to OnlinePlayerProfile. 2014-04-17 15:39:51 +10:00
hiker
f6d22922d2 Fixed linux compilation. 2014-04-17 13:18:31 +10:00
hiker
056aa5ed6f Refactor so that PlayerProfile provides a proper interface plus 
function/states for local use, and CurrentUser implements the
missing functions.
 2014-04-17 08:19:04 +10:00
hiker
447ca89c0a Removed CurrentUser usage from all files except PlayerManager 
and PlayerProfile.
 2014-04-16 11:13:35 +10:00
Vincent Lejeune
1a908b254f Use more compatible fbo format 2014-04-15 14:48:27 +02:00
hiker
5ec71c5b06 Moved getProfile from CurrentUser to PlayerManager::getCurrentOnlineProfile(). 2014-04-15 16:25:55 +10: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
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
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
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
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
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
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
hiker
8483f58f9d Moved saved session data from UserConfig to PlayerProfile - which 
means that now each player can individually save an online session.
 2014-04-10 21:14:13 +02:00
hiker
a6f4f50281 Fixed documentation. 2014-04-10 21:14:12 +02:00
hiker
6a3698232e Removed unused parameters. 2014-04-10 21:14:11 +02:00
hiker
ec213fbe28 Removed signedInAs function. 2014-04-10 21:14:11 +02:00
hiker
79edc5fa48 Made getCurrentUser() a static function. 2014-04-10 21:14:10 +02:00
hiker
1d71f8f1e1 Moved ServerJoinRequest from CurrentUser into RequestConnection 
(from which file it is also used in online_screen). And cosmetic
changes everywhere.
 2014-04-10 21:14:09 +02:00
hiker
1299db94e6 Cosmetic changes only. 2014-04-10 21:14:08 +02:00
hiker
502987d3e0 Now each PlayerProfile has a (currently still called) CurrentUser 
which manages online connection data. Work-in-progress to use
only one object for all player data (instead of two atm: PlayerProfile
and CurrentUser).
 2014-04-10 16:32:58 +10:00
Dk
e0d22a28d6 Camera Moves Back Smoothly 2014-04-10 07:06:13 +05:30
Marianne Gagnon
f42e4203cd Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-09 18:55:22 -04:00
Marianne Gagnon
c2fb05cc61 Compute tangents for core track mesh, allowing normal maps 2014-04-09 18:55:17 -04:00
hiker
481b5f22bb Fixed compiler warnings. 2014-04-09 19:07:58 +10:00
hiker
5182cdb18b Fixed line endings. 2014-04-09 19:07:44 +10:00
hiker
25c96d88ec Moved saved session data from UserConfig to PlayerProfile - which 
means that now each player can individually save an online session.
 2014-04-09 08:33:42 +10:00
hiker
de697f26c8 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-09 08:28:01 +10:00
Vincent Lejeune
55489bc188 Use UBO instead of copying Shadow VP matrixes. 2014-04-08 21:45:04 +02:00
Vincent Lejeune
d67834574b Remove some instance of setTransform. 2014-04-08 14:15:29 +02:00
Vincent Lejeune
4f92d9bc6b Remove unused code. 2014-04-08 13:49:13 +02:00
Vincent Lejeune
f65b460f1c Remove some reference to ETS_WORLD. 2014-04-08 13:49:11 +02:00
hiker
8c197a24b2 Fixed documentation. 2014-04-08 16:52:29 +10:00
hiker
c599359737 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-08 12:52:59 +10:00
vlj
62c6029e7a Clean another line. 2014-04-08 02:05:55 +02:00
vlj
84488b192f Another round at cleaning. 2014-04-08 02:02:08 +02:00
vlj
246d581e4c Some cleaning. 2014-04-08 01:52:19 +02:00
hiker
384bdb1124 Removed unused parameters. 2014-04-08 08:19:14 +10:00
hiker
38051c0191 Removed signedInAs function. 2014-04-08 08:09:28 +10:00
hiker
43593d6312 Made getCurrentUser() a static function. 2014-04-08 08:06:52 +10:00
hiker
5956f2fdf7 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-08 08:00:51 +10:00
Vincent Lejeune
c5fd99a096 Clamp to edge when blurring fbo. 2014-04-07 22:38:20 +02:00
Vincent Lejeune
8fc3453eda Fix instancied glossy map. 2014-04-07 22:29:06 +02:00
Vincent Lejeune
939e574cd8 Make bloom effect more subtle. 2014-04-07 22:19:25 +02:00
vlj
e00ce85d7c Support FresnelSchlick factor. 2014-04-07 21:35:10 +02:00
vlj
79c6424703 Use specularmap as glossiness map. 2014-04-07 21:35:09 +02:00
Vincent Lejeune
8aa5031fc0 FBO: Combined TMP1 and TMP2 should embed DS. 2014-04-07 17:47:49 +02:00
hiker
d88f513ad6 Moved ServerJoinRequest from CurrentUser into RequestConnection 
(from which file it is also used in online_screen). And cosmetic
changes everywhere.
 2014-04-07 21:15:42 +10:00