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
eb0dfb4530
Bigger light extend wrt energy.
2014-04-07 22:20:43 +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
858c8c7605
Fix normalmap too
2014-04-07 21:35:10 +02:00
vlj
79c6424703
Use specularmap as glossiness map.
2014-04-07 21:35:09 +02:00
vlj
cafc07680a
Use Blinn Phong model.
2014-04-07 21:35:09 +02:00
Vincent Lejeune
0b318b9c7e
Improve quad's fit of pointlight extend
2014-04-07 21:04:03 +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
hiker
cb8daa4977
Cosmetic changes only.
2014-04-07 16:52:09 +10:00
hiker
9b1b66689b
Moved achievement notification for server from CurrentUser to
...
Achievement.
2014-04-07 13:19:07 +10:00
Marianne Gagnon
569d68dfe1
Add asset to 'clearWindow' to catch invalid uses
2014-04-06 21:05:09 -04:00
Marianne Gagnon
06a3d770e5
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-04-06 20:57:37 -04:00
Marianne Gagnon
61ad56f088
Fix recovery dialog
2014-04-06 20:57:28 -04:00
gl3nn
8d3d65270a
Don't allow showing the notification dialog without using the dialog
...
queue anymore.
2014-04-07 02:12:45 +02:00
hiker
73e8fb3556
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-07 09:42:09 +10:00
vlj
3c3b076458
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-04-07 01:03:27 +02:00
vlj
ca2b5a7237
Fix normal map and srgb
2014-04-07 01:03:14 +02:00
Marianne Gagnon
a413fa3f15
Add proper instancing fallback when shaders are off
2014-04-06 18:46:25 -04:00
Marianne Gagnon
456d57f7ce
Instancing : don't crash when shaders are off
2014-04-06 18:31:15 -04:00
hiker
cb959acb44
Added 'action' parameter to setUserDetail, and made it work when
...
the user is not logged in, so that it can be used for the recovery request.
2014-04-07 08:25:48 +10:00
hiker
6b7dcedc02
Don't log the value of 'current', 'new1' and 'new2' (which are used
...
when changing passwords).
2014-04-07 08:13:33 +10:00
vlj
dd51124680
Fix specular light buffer not written to.
2014-04-06 17:40:51 +02:00
Vincent Lejeune
ada1d2617c
Clear SSAO fbo at least once.
...
On intel driver (windows) texture swizzling seem not to work everytime
so use an untouched rtt instead of swizzling SSAO rtt if ssao is
disabled.
2014-04-05 21:21:01 +02:00
Vincent Lejeune
150ee87471
Use glFrameBufferTexture on shadows buffer
...
We're sure there is at least gl 3.2 support.
2014-04-05 20:53:38 +02:00
Vincent Lejeune
a951a8c885
Wrong glsl check when compressing textures.
2014-04-05 20:48:50 +02:00
Vincent Lejeune
04176d52a8
Do not create shadow vao for ctx < gl 3.2
2014-04-05 20:16:15 +02:00
Max Teufel
4f7bc981bd
Declare use of OpenGL 3.2 on OS X
2014-04-05 19:33:45 +02:00
Vincent Lejeune
012cf599b4
Use 2D version of glFramebufferTexture
...
glFramebufferTexture is not supported on GL 3.1 context, while
glFramebufferTexture2D is.
Also fix an inverted comparaison.
2014-04-05 19:22:03 +02:00
hiker
8e8f02a1dc
Bugfix: if the recovery dialog was shown and cancelled, no more mouse
...
events got sent to the LoginDialog. Seems to be the same problem that was
reported in #1216 , and properly fixed in
d954fc6c72
. Auria, can you check if this is correct?
2014-04-06 01:27:04 +11:00
hiker
0a107897ca
Moved user search and password change from CurrentUser into the
...
corresponding dialogs.
2014-04-06 01:25:31 +11:00
hiker
800a012283
Removed unnecessary copy of Addon.
2014-04-05 22:25:35 +11:00
hiker
a9ecf5b601
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-04-05 22:00:30 +11:00
hiker
4a3cf13bc4
Moved voting code from CurrentUser to VoteDialog.
2014-04-05 21:59:56 +11:00
Vincent Lejeune
2264f8e3a7
Disable srgb texture compression for Intel
...
RGB texture compression works fine but it looks like srgb TC isnt
properly supported.
A later TODO would be to convert rgb to srgb in cpu and use compression
again.
2014-04-05 03:13:45 +02:00
Dk
746e23c0f1
Camera even moved more closer
2014-04-05 06:39:42 +05:30
vlj
a57e81a37c
Use custom FBO instead of Irrlicht's ones.
...
This allows STK to use multisampled FBO.
2014-04-05 02:42:05 +02:00
Dk
4b6ea54704
Merge remote-tracking branch 'upstream/master' into SmoothMoveCamera
2014-04-05 00:24:44 +05:30
Dk
ff2f3c0896
Camera while moving back is fixed
2014-04-05 00:24:07 +05:30