vlj
|
33e3b43346
|
Add a (quite big) timeout to sync.
|
2014-08-14 18:40:14 +02:00 |
|
Vlj
|
8ec4fb6308
|
Use sync object
|
2014-08-14 18:12:15 +02:00 |
|
vlj
|
18981ff943
|
Set unsynchronized bit in transparent pass
|
2014-08-14 16:29:59 +02:00 |
|
vlj
|
1c7fe8c518
|
Use mapbuffer to modify animated mesh buffer content.
|
2014-08-14 16:14:36 +02:00 |
|
vlj
|
6ef8f666ee
|
Add mapbuffer glfunction.
|
2014-08-14 16:06:42 +02:00 |
|
vlj
|
d1f83c0334
|
Properly clean/regen vbo in updatevbo()
|
2014-08-14 14:27:18 +02:00 |
|
vlj
|
9840650038
|
Update some data usage hint.
|
2014-08-14 14:11:04 +02:00 |
|
vlj
|
21683251a2
|
Fix shadow lod level in singleplayer
|
2014-08-14 02:43:01 +02:00 |
|
hiker
|
52fba7958a
|
Fixed pre-2011 compilation.
|
2014-08-14 10:24:23 +10:00 |
|
hiker
|
3521368112
|
Oops - committed file with typo :(
|
2014-08-14 10:21:26 +10:00 |
|
hiker
|
27155b5543
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-08-14 10:19:54 +10:00 |
|
Marianne Gagnon
|
a5f36ec412
|
Add new particles flag for vlj
|
2014-08-13 20:23:21 -04:00 |
|
hiker
|
f338282a15
|
Merge branch 'master' of github.com:supertuxkart/stk-code
Conflicts:
src/graphics/stkinstancedscenenode.cpp
|
2014-08-14 10:19:31 +10:00 |
|
Marianne Gagnon
|
1de0e50607
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code
|
2014-08-13 20:10:28 -04:00 |
|
Marianne Gagnon
|
5c3c7afeae
|
Fix bogus cast resulting in reading random URL in particles
|
2014-08-13 20:10:02 -04:00 |
|
vlj
|
5f78f2687f
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code
|
2014-08-14 02:09:15 +02:00 |
|
vlj
|
9120d792be
|
Fix GPUTimer
|
2014-08-14 02:09:12 +02:00 |
|
Marianne Gagnon
|
ba3027b6bb
|
Little improvement to for_in macro. Still only works on PtrVector though
|
2014-08-13 19:47:59 -04:00 |
|
hiker
|
86ea16bd43
|
Fixed compilation for pre-C++-2011 compilers.
|
2014-08-14 09:38:31 +10:00 |
|
vlj
|
47e176d4a3
|
User wrong VS for instanced normal
Also fix the srgb normal map.
|
2014-08-14 00:55:12 +02:00 |
|
Marianne Gagnon
|
b95765c172
|
use better tool to calculate tangents
|
2014-08-13 18:35:07 -04:00 |
|
Marianne Gagnon
|
976ea043bb
|
Add missing bit of code
|
2014-08-13 18:25:21 -04:00 |
|
Vlj
|
3e277f8edf
|
Dont alloc quaternion buffer if not flip
|
2014-08-13 23:56:27 +02:00 |
|
Vlj
|
c7a4d45d08
|
Fix malloc/delete mismatch
|
2014-08-13 23:52:47 +02:00 |
|
Vincent Lejeune
|
b5016ba85e
|
Factorise simulation code.
|
2014-08-13 22:47:03 +02:00 |
|
Vincent Lejeune
|
00e945e75c
|
Port heightmap simulation shader.
|
2014-08-13 22:42:02 +02:00 |
|
Vincent Lejeune
|
47cfe08fe1
|
Port simple simulation particle shader.
|
2014-08-13 22:32:15 +02:00 |
|
Vincent Lejeune
|
8117260bf6
|
Factorise attribute location of simulation program.
|
2014-08-13 22:26:52 +02:00 |
|
Vincent Lejeune
|
e6eac5b57f
|
Clean quaternionbuffer at the right place.
|
2014-08-13 22:02:18 +02:00 |
|
Vincent Lejeune
|
f43538aad7
|
Factorize again code in gpuparticle.
|
2014-08-13 21:59:57 +02:00 |
|
Vincent Lejeune
|
b5f89501f6
|
Factorize some GL code in gpuparticle.
|
2014-08-13 21:38:33 +02:00 |
|
samuncle
|
a91bcfa746
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code
|
2014-08-13 21:32:12 +02:00 |
|
samuncle
|
d1f46fdb7f
|
Bring back the rain
|
2014-08-13 21:30:27 +02:00 |
|
Vincent Lejeune
|
013e823408
|
Extract ParticleVBO from gpuparticle.cpp
|
2014-08-13 21:13:28 +02:00 |
|
Vincent Lejeune
|
dc02eec7b6
|
Port particle rendering shaders too.
|
2014-08-13 21:04:03 +02:00 |
|
Vincent Lejeune
|
22137eee88
|
Port UI shaders.
|
2014-08-13 20:25:56 +02:00 |
|
Deve
|
7a9e77da01
|
Exit cmake with error if xrandr library was not found.
|
2014-08-13 19:34:53 +02:00 |
|
Vincent Lejeune
|
dc9993d780
|
Add Debug for instanced vertex type mismatch.
|
2014-08-13 19:28:02 +02:00 |
|
Vincent Lejeune
|
70b0fce50c
|
Add support for instanced normal map mesh.
|
2014-08-13 19:20:40 +02:00 |
|
Vincent Lejeune
|
ebacfcfcef
|
Put RSM draw in its own method.
|
2014-08-13 18:59:30 +02:00 |
|
Vlj
|
fda6aac5dd
|
Reenable shadows for instanced mesh
|
2014-08-13 17:33:10 +02:00 |
|
hiker
|
de16d1ace3
|
Bugfix: A new local only user was now able to change the online account.
If a new account is created with an online account, make the online account
the default.
|
2014-08-13 21:46:53 +10:00 |
|
hiker
|
7111eb55ee
|
Merge branch 'laps' of https://github.com/konstin/stk-code into konstin-laps
|
2014-08-13 16:01:22 +10:00 |
|
Vlj
|
ce5d09f159
|
Move instanced rendering code to render_geometry.cpp
Shadows are disabled temporary
|
2014-08-13 04:11:44 +02:00 |
|
hiker
|
98bb7e3959
|
Merge branch 'bumpy'
|
2014-08-13 11:16:03 +10:00 |
|
hiker
|
5a67fa50a9
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-08-13 11:15:49 +10:00 |
|
Vincent Lejeune
|
292aa0cbc4
|
Factorize FullScreen shaders invocations.
|
2014-08-13 02:01:29 +02:00 |
|
Vincent Lejeune
|
955e0d3259
|
Move RHDebug code to post process
|
2014-08-13 01:21:48 +02:00 |
|
Marianne Gagnon
|
345a3bc451
|
Fix logic in video settings popup
|
2014-08-12 19:18:38 -04:00 |
|
Vincent Lejeune
|
03a6499c27
|
Port RHDebug and Passthrough Layer
|
2014-08-13 01:13:41 +02:00 |
|