Benau
bc2fb1da76
Fix server build
2016-12-29 15:46:00 +08:00
Benau
67b6c3bf05
Allow to reload textures on the fly
...
Enter texture filename(s) (full path is optional) separating by
";" in the artist debug mode "Reload texture" dialog
Notice: premultiplied alpha texture reloading is not supported,
because it was done on STK side.
2016-12-29 14:56:18 +08:00
Benau
b9b8ab3e5f
Don't load normal map too if not advanced pipeline
2016-12-29 09:46:26 +08:00
auria.mg
875bfad197
Merge remote-tracking branch 'temeliak/fix_non_hd_option'
2016-12-28 20:39:20 -05:00
auria.mg
dfca641172
Merge branch 'fix_2316'
2016-12-28 20:19:41 -05:00
auria.mg
f0afba84c8
More cleanup
2016-12-28 20:17:32 -05:00
auria.mg
33802d9f81
Materials optimisation : minor tweaks and cleanup
2016-12-28 20:13:55 -05:00
Benau
1597c2ad48
Make scaled texture work with alpha mask
2016-12-29 00:36:13 +08:00
samuncle
b669382b93
Change the detail map to a more usefull decal shader. Now we can add easily details to texture
2016-12-28 10:23:07 -05:00
Benau
72963f4fb4
Fix GLES
2016-12-28 16:23:57 +08:00
Benau
71161264be
Merge remote-tracking branch 'origin/master' into fix_2316
2016-12-28 15:50:14 +08:00
Benau
f43f76b7c9
Fix server build
2016-12-28 15:40:12 +08:00
Benau
ffe4dd88b4
Apply mask directly on texture
...
Avoiding the ref counting issues
2016-12-28 15:32:27 +08:00
auria.mg
5e415e3331
Install all materials before loading meshes
2016-12-27 22:08:27 -05:00
Benau
8c5c85245f
Use full detail default
2016-12-27 18:31:06 +08:00
auria.mg
0be858f7f8
Fix crash in texture cleanup branch
2016-12-26 23:03:22 -05:00
auria.mg
943373ea8e
Try cleaning up textures when unloading tracks. Crashes at this time, more debugging is required
2016-12-26 22:33:54 -05:00
Benau
15469e555d
Allow track loading to take care of geometry details
2016-12-27 11:15:24 +08:00
Benau
7085c164b5
Merge remote-tracking branch 'origin/geometry_detail'
2016-12-26 23:56:18 +08:00
Benau
9831802c7f
Fix typo
2016-12-26 13:59:34 +08:00
Benau
c2d9f91c62
Allow to run cutscene(s) in artist debug menu
2016-12-26 13:51:40 +08:00
auria.mg
46e7b5ac77
Try to fix build
2016-12-25 22:27:46 -05:00
auria.mg
2b34dd8410
More cleanup and bugfixing related to #2316
2016-12-25 22:21:41 -05:00
auria.mg
059c2c8573
Bugfix delayed-loaded textures bug
2016-12-25 22:00:11 -05:00
Benau
ebef08c3d8
Try to combine all text field dialogs
2016-12-26 10:53:14 +08:00
auria.mg
4aa31dc56e
First attempt at #2316 . WIP, issues remains
2016-12-25 20:21:00 -05:00
Benau
3c9174d278
Add a general debug dialog
...
To be used later
2016-12-25 16:41:55 +08:00
samuncle
e62edcc89a
Ground work for geometry detail option
2016-12-24 19:16:39 -05:00
Benau
6a142e8d2e
Allow animated models in track to have different animation
2016-12-24 13:11:08 +08:00
Deve
6486d1548b
Fixed clang compilation
2016-12-24 02:07:53 +01:00
Deve
26bbffe8b0
Don't declare features that are used for SDSM, AZDO and compute shaders and that are not available in GLES renderer anyway.
2016-12-24 01:26:18 +01:00
Deve
7b76804354
Allow to unlock all tracks in config.xml.
...
Can be used on android when only some tracks are included in the apk.
2016-12-23 23:36:39 +01:00
Deve
674e617018
Allow to use isDirectory function outside of file manager class.
...
It is used on android for extracting assets
2016-12-23 19:01:16 +01:00
Deve
8a88c9707b
Fixed rendering when UBO is disabled
2016-12-23 16:45:03 +01:00
Deve
424b62552e
Fixed MLAA in GLES renderer.
...
This function was used by Cand for his OpenGL 2.1 renderer. The round function is available since GLSL 1.3 (OpenGL 3.0), so there is no need to override it.
If it will be needed in future, I suggest to change the name to round_stk or something similar.
2016-12-23 15:12:16 +01:00
Benau
15d6c7207a
Minor improvements for non-instanced shaders
2016-12-23 19:22:30 +08:00
Benau
989234a0ba
Clean up header part 2
2016-12-23 17:12:53 +08:00
Benau
31f2a720ca
Try to reduce the header size of materials.hpp
...
Plus header clean up
2016-12-23 14:44:18 +08:00
Benau
d932451295
Don't out a interpolated color change
...
It will should be determined by colorization mask in fragment shader
2016-12-23 11:38:32 +08:00
Benau
f7e2122b79
Allow drawing instanced glow color without explicit location
2016-12-23 10:36:35 +08:00
Benau
a339975df6
Clean skidmark earlier if there are many karts
2016-12-23 10:08:12 +08:00
Benau
969592e3fc
Try to fix framerate drop after few laps
...
Because skidmark left are never culled
2016-12-23 09:19:46 +08:00
Tobias Markus
6fb93fa208
Fix compilation on macOS 10.12 ( #2701 )
2016-12-22 19:17:31 -05:00
Benau
8008ec851e
Allow to use hardware skinning with opengl 3.1
...
Now we only need UBO to store the joint matrices to support it
2016-12-23 01:31:13 +08:00
Benau
28841d601d
Remove old code for getting straight frame
...
With hardware skinning it is not necessary
2016-12-23 00:44:26 +08:00
Benau
bfd57659eb
Remove unused file
2016-12-22 11:17:52 +08:00
Benau
ffa4ad84cb
Merge branch 'hardware_skinning'
2016-12-22 10:38:06 +08:00
Deve
53ee40af70
Update multitouch device when settings are changed
2016-12-20 23:11:06 +01:00
Deve
082661db65
Add a possibility to change touch device settings in GUI
2016-12-20 23:10:57 +01:00
Benau
c26f8150f4
Fix server only build
2016-12-19 11:17:45 +08:00
