Marianne Gagnon
|
77f36e3e2f
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code
|
2014-01-24 19:13:59 -05:00 |
|
Marianne Gagnon
|
07eba6dfd7
|
Minor profiler updates
|
2014-01-24 19:13:53 -05:00 |
|
Vincent Lejeune
|
00b6705624
|
Revert "Factorize GL state changes to get better performances."
This reverts commit 17be149e02 .
|
2014-01-25 01:05:10 +01:00 |
|
Vincent Lejeune
|
17be149e02
|
Factorize GL state changes to get better performances.
|
2014-01-25 00:58:35 +01:00 |
|
Marianne Gagnon
|
8295a1e226
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code
|
2014-01-24 18:49:56 -05:00 |
|
Marianne Gagnon
|
190cc9fa9a
|
Clarify a couple error messages
|
2014-01-24 18:48:40 -05:00 |
|
hiker
|
8389f4afb6
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-01-25 10:41:00 +11:00 |
|
Marianne Gagnon
|
878d0dcf05
|
Improve profiler a bit
|
2014-01-24 18:38:47 -05:00 |
|
Vincent Lejeune
|
c7b2f82e8f
|
Revert "Move final blit in renderGLSL instead of pp"
This reverts commit 16d87cf820 .
|
2014-01-25 00:22:44 +01:00 |
|
Vincent Lejeune
|
16d87cf820
|
Move final blit in renderGLSL instead of pp
|
2014-01-24 21:37:34 +01:00 |
|
Vincent Lejeune
|
a8ce8c9344
|
STKAnimatedMesh: Fix setMesh.
We don't clean our vram however.
|
2014-01-24 21:12:55 +01:00 |
|
Vincent Lejeune
|
324c1c1e95
|
STKMesh: Properly handle setMesh
|
2014-01-24 21:07:49 +01:00 |
|
Vincent Lejeune
|
c9ecaffb2b
|
STKAnimatedMesh: First pass id is 0, not 1
|
2014-01-24 20:34:23 +01:00 |
|
Vincent Lejeune
|
8bd6d7945c
|
STKAnimatedMesh: Support for rimlit karts
|
2014-01-24 20:29:54 +01:00 |
|
Vincent Lejeune
|
559e0a96ca
|
Remove wrong glHint
Spotted by ARB_DEBUG_OUTPUT
|
2014-01-24 20:27:18 +01:00 |
|
hiker
|
fb8347e135
|
When the physics are updated from the graphics, subtract the
graphical offset again to make sure physics and graphics are in sync.
|
2014-01-24 23:46:52 +11:00 |
|
hiker
|
93cb4b2090
|
The position and rotation of an IPO animated physical object from a library
must be transformed by the transform of its (graphical) parent (only library
nodes have a graphical parents) to be correct.
|
2014-01-24 23:44:46 +11:00 |
|
hiker
|
9651a9f224
|
Minor code cleanup, renamed a variable and function.
|
2014-01-24 22:25:55 +11:00 |
|
Vincent Lejeune
|
a257c1a35c
|
STKAnimatedMesh:
Avoid copying mesh in the second pass.
|
2014-01-24 00:19:10 +01:00 |
|
Vincent Lejeune
|
b362185593
|
STKAnimatedMesh: Plug the Light prepass system
Now animated object are rendered like static object with our pipelines.
rimlimit shader needs to be ported though.
|
2014-01-23 23:26:43 +01:00 |
|
Vincent Lejeune
|
24fa173c60
|
STKMesh: Staticify draw function for reusability.
|
2014-01-23 22:12:03 +01:00 |
|
Vincent Lejeune
|
176e46e5a9
|
STKAnimatedMesh: Uses custom render.
But not direct gl draw call yet.
|
2014-01-23 21:35:56 +01:00 |
|
Vincent Lejeune
|
b738b1eab3
|
Revert fog move after transparent pass.
|
2014-01-23 20:17:17 +01:00 |
|
Vincent Lejeune
|
12f961ee97
|
Fix lightviz always actived
|
2014-01-23 20:15:29 +01:00 |
|
Vincent Lejeune
|
f60af23ecd
|
LightPrepass: Disable light on non stkmeshes
|
2014-01-23 20:05:35 +01:00 |
|
Vincent Lejeune
|
4ebb0ee8d8
|
OGL32CTX: Fix minimap/kart selection orientation
|
2014-01-23 20:05:07 +01:00 |
|
Vincent Lejeune
|
9a5bf69ca8
|
STKMesh: Add an animated variant
Not customised atm.
|
2014-01-23 19:14:13 +01:00 |
|
hiker
|
2bfdfc0373
|
Fixed crash when trying to vote.
|
2014-01-23 13:25:50 +11:00 |
|
hiker
|
6066dba9d0
|
Fixed compiler error.
|
2014-01-23 13:24:08 +11:00 |
|
Marianne Gagnon
|
70fed45ec1
|
Fix skin crash
|
2014-01-22 20:15:35 -05:00 |
|
Marianne Gagnon
|
069f15937a
|
Improve profiler a little
|
2014-01-22 19:40:40 -05:00 |
|
Marianne Gagnon
|
1d2473e585
|
Colorize profiler bars so we can see something
|
2014-01-22 19:21:45 -05:00 |
|
Marianne Gagnon
|
583092bbf8
|
Don't return pointer to temporary object
|
2014-01-22 19:03:55 -05:00 |
|
hiker
|
1e721906e7
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-01-23 09:55:52 +11:00 |
|
hiker
|
57ff391cc3
|
Re-enable voting for addons.
|
2014-01-23 09:55:32 +11:00 |
|
hiker
|
d4b95e81b4
|
Moved hash function from StringUtils into player, there is no
other use of that function.
|
2014-01-23 09:54:48 +11:00 |
|
Vincent Lejeune
|
66894dfeaf
|
LightPrepass: Reenable light debug view
|
2014-01-22 23:11:49 +01:00 |
|
Vincent Lejeune
|
fc9144786b
|
Use texture swizzle when SSAO is disabled
|
2014-01-22 22:52:46 +01:00 |
|
Vincent Lejeune
|
b94f8f0c18
|
Light: Factorize some code.
|
2014-01-22 22:22:54 +01:00 |
|
Vincent Lejeune
|
68976a7a8e
|
STKMesh: Found the correct swizzle for untextured geometry
|
2014-01-22 19:07:59 +01:00 |
|
Vincent Lejeune
|
d13032ca9b
|
STKMesh: Support for untextured object
The color are not the correct one though...
|
2014-01-22 18:47:22 +01:00 |
|
Vincent Lejeune
|
38fc539520
|
Enable debug
|
2014-01-22 18:06:39 +01:00 |
|
hiker
|
6b27179b96
|
Added missing initialisation, some cosmetic changes.
|
2014-01-22 17:26:03 +11:00 |
|
hiker
|
c72544b49d
|
Added missing calls to Screen::init().
|
2014-01-22 16:54:57 +11:00 |
|
hiker
|
476d7db741
|
Disable online/login widget while login/logout are in progress (to
avoid race conditions, i.e. a new login arriving at server before
previous logout was processed).
|
2014-01-22 16:43:59 +11:00 |
|
hiker
|
2821913b47
|
Go back to main menu when login out.
|
2014-01-22 16:34:45 +11:00 |
|
hiker
|
836b9fae9c
|
Improved layout of login screen.
|
2014-01-22 16:20:45 +11:00 |
|
Vincent Lejeune
|
23e5a6c304
|
Fix kart selection upside down bug
|
2014-01-22 03:26:04 +01:00 |
|
Vincent Lejeune
|
0926c7be51
|
Fix Water
|
2014-01-22 03:16:01 +01:00 |
|
samuncle
|
65a72f2ba8
|
Correcting a bug with the linker
|
2014-01-22 02:26:30 +01:00 |
|