hiker
21ca9b40f0
Merge branch 'master' of github.com:supertuxkart/stk-code
2016-11-28 12:46:00 +11:00
hiker
aa36f7856f
Fixed compiler warnings.
2016-11-28 09:03:56 +11:00
Benau
3e938a79be
Fix #2676 by moving rsm matrix to be assigned lastly
2016-11-27 11:21:16 +08:00
auria.mg
decaac85d9
Tweak item collision box, fixes #2678
2016-11-26 19:01:38 -05:00
Benau
0298d48e24
Try to use the internal template to colorize objects
...
Todo: instanced version
2016-11-27 01:14:40 +08:00
Benau
9b15bd2c63
Remove useless extern BoundingBox
2016-11-26 10:10:10 +08:00
Benau
a9a6ec0b7f
Use the old unrolling draw mesh for RSM shaders on GL3
...
Todo: fix CustomUnrollArgs for rsm shaders
2016-11-26 00:06:22 +08:00
Benau
f7e0babe02
Fix global illumination on instanced rendering
2016-11-26 00:03:22 +08:00
Benau
df6ab0a7fd
Fix god rays regression
2016-11-25 20:44:44 +08:00
Benau
5ca5dc3b3e
Clean up culling code
2016-11-25 16:45:00 +08:00
Benau
0c091125b0
Remove const cast in three strikes battle
2016-11-25 12:38:08 +08:00
Benau
fe371a28b5
Add non-const function for STK usage
2016-11-25 12:37:40 +08:00
hiker
18f14ae142
Fixed compiler warnings.
2016-11-24 17:48:23 +11:00
Benau
a2bb0487b1
Disable backface culling when set in the material.
2016-11-23 15:16:19 +08:00
Benau
eb84de2666
Fix #2491
2016-11-23 10:11:08 +08:00
deve
7f251fdf79
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-11-22 09:16:59 +01:00
deve
467760f248
Remove illogical #ifdef
2016-11-22 08:29:18 +01:00
Benau
61a00a9068
Fix transparent displacement rendering with advanced pipeline off
...
Allowing them to render using the same custom alpha uniform used
by ghost karts, fixed #2459 .
2016-11-22 12:34:48 +08:00
Benau
c1e931f5ba
Merge branch 'legacy_opengl'
2016-11-22 09:23:17 +08:00
Benau
690d36271d
Try to fix LOD in legacy pipeline
2016-11-22 00:51:10 +08:00
deve
e9f3fd4806
Fixed compilation with missing vidmode headers after some modifications in our CGUIEditBox.
2016-11-21 08:37:20 +01:00
Benau
befa2394a8
Some improvement to #2667
2016-11-21 11:58:46 +08:00
Benau
72ff03c024
Fix light in legacy pipeline
2016-11-21 11:10:40 +08:00
Benau
de95db5c93
Avoid creating new glyph page too many times
2016-11-20 10:08:59 +08:00
Benau
9734c2e890
Fix crash in billboard text when using legacy opengl
...
Notice: freetype glyph metrics are not supported
2016-11-19 15:59:58 +08:00
Benau
a52c4699a1
Add back normal map renderer for legacy opengl
...
Fixed transparent issue
2016-11-19 14:21:56 +08:00
Benau
f853255204
Merge branch 'fix_1704'
2016-11-18 09:51:34 +08:00
Benau
9eb6ef5bfe
Simplify code
2016-11-18 09:44:30 +08:00
Deve
952bed5672
Few minor fixes for multitouch steering:
...
- don't update a button that is already not pressed
- use full axis range, which means higher sensitivity in the center
- make sure that we don't divide by 0
2016-11-18 01:22:32 +01:00
Benau
ac74304dd7
Fix #1704
2016-11-18 00:31:48 +08:00
Benau
b6c1a45918
Use a better define
2016-11-16 10:20:40 +08:00
Benau
2f2940115e
Use a smooth dt on camera to determine its position
2016-11-14 15:47:55 +08:00
hiker
621e61c644
Fixed coding style.
2016-11-14 18:32:29 +11:00
hiker
feae91042a
Explicitly disable X11 compilation for windows. No idea why it is
...
defined in CGUIEditbox now, but it somehow is ;(
2016-11-14 18:25:00 +11:00
Benau
e6e302af1c
Fix copy and paste of unicode characters
2016-11-13 15:43:00 +08:00
Benau
5879933a23
Merge remote-tracking branch 'origin/master' into fix_2112
2016-11-13 10:42:47 +08:00
Deve
7e4dfdb97e
Remove version from graphics restrictions for sRGB-capable visual workaround.
...
It doesn't look that they're going to fix it soon.
2016-11-11 16:22:31 +01:00
Deve
e707b7a2ea
Remove pthread_setcancelstate functions.
...
This function is not available on android and it is default on other platforms anyway.
It makes easier to port changes from master to android branch.
2016-11-11 14:11:27 +01:00
Deve
6b2bf1c088
Make sure that we are not out of array.
...
Command line arguments are not available on android.
2016-11-11 14:07:18 +01:00
Deve
452c7c1e40
Fixed compiler warning
2016-11-11 13:44:51 +01:00
Benau
19cd3656a9
Use all cores only in clang for travis
2016-11-11 15:29:17 +08:00
hiker
8ecb0ecaeb
Merge branch 'master' of github.com:supertuxkart/stk-code
2016-11-11 15:35:30 +11:00
hiker
fd5f60a786
Merge branch 'master' of github.com:supertuxkart/stk-code
2016-11-11 15:27:45 +11:00
hiker
190490e0ce
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-11-11 15:15:02 +11:00
Benau
f31cfa261a
Try to fix compilation by reducing number of threads
2016-11-11 11:58:53 +08:00
Benau
6b282acae2
Use bullet built-in function
2016-11-11 10:20:15 +08:00
Benau
656ddcfdee
Add tools from hiker
2016-11-11 09:06:06 +08:00
Benau
8b069df97f
Merge remote-tracking branch 'origin/renderer_refactoring'
2016-11-11 08:43:42 +08:00
hiker
10b7dac658
Replaced static with dynamic casts, fixed docu.
2016-11-11 09:14:18 +11:00
hiker
10575174fc
Fix for disabling LAN detection.
2016-11-11 08:47:10 +11:00
