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 |
|
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 |
|
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 |
|
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 |
|