Commit Graph

11505 Commits

Author SHA1 Message Date
vlj
4cff5ce739 Merge pull request #1279 from gupascal/travis-update
Update travis config for mesa
2014-04-10 21:06:29 +02:00
Guillaume P
5dbd228b95 It's even better with the key of the added repository. 2014-04-10 08:50:45 +02:00
Guillaume P
0542a85204 Clean up and re-enable notifications in travis config. 2014-04-10 08:43:14 +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
Guillaume P
8f0ecee80c Update before_install section in travis config file. 2014-04-10 08:15:29 +02:00
Guillaume P
b0c130017a Disable notifications. 2014-04-10 08:02:51 +02:00
Dk
95b858a2d8 Merge branch 'SmoothMoveCamera' of https://github.com/divvy81/stk-code into SmoothMoveCamera 2014-04-10 07:07:32 +05:30
Dk
e0d22a28d6 Camera Moves Back Smoothly 2014-04-10 07:06:13 +05:30
Dk
ca1328eb3e Merge remote-tracking branch 'upstream/master' into SmoothMoveCamera 2014-04-10 06:34:21 +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
Dk
50ca35ca96 Rescue Camera is working properly 2014-04-09 22:30:05 +05:30
Dk
d25ea99665 Revert "Camera After Rescue comes to normal quickly"
This reverts commit 0345f26a7b.

git commit -m "revert"
2014-04-09 22:24:32 +05:30
Dk
9f4368da08 Merge remote-tracking branch 'upstream/master' into SmoothMoveCamera 2014-04-09 21:06:49 +05:30
Dk
0345f26a7b Camera After Rescue comes to normal quickly 2014-04-09 21:06:07 +05:30
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
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