Commit Graph

17260 Commits

Author SHA1 Message Date
Deve
6a16f23132 Fixed GLES 2016-12-31 03:41:37 +01:00
Deve
cec7c51bc0 Request closing the app on android in better place, so that it handles both - quit button and escape pressed. 2016-12-31 02:51:08 +01:00
Benau
dbe148baf6 Max 10 players supported in arena
See #2705
2016-12-31 09:27:39 +08:00
Benau
f8c09ccf83 Handle score times too 2016-12-31 09:03:42 +08:00
Benau
0d35ea74d1 Fix #2713 2016-12-31 08:59:24 +08:00
auria.mg
09e1e6d7a3 Update achivement with new track name. Fixes #2712 2016-12-30 17:05:30 -05:00
auria.mg
fcdb0b5614 Improve material code, fixes #2709 2016-12-30 16:04:56 -05:00
Benau
360e1bb88b Case insensitive in linux for reloading texture 2016-12-30 20:24:35 +08:00
Deve
412399cdf7 Fixed a crash in GLES 2.0.
The glGetStringi is available only in GLES >= 3.0. We can't easily check if this function exists or not because it requires EGL >= 1.5 (and still we can't be sure that all drivers handle it properly).

Though glGetString(GL_EXTENSIONS) is allowed on both GLES2.0 and GLES3.0, so we can just fallback to this method.
2016-12-30 11:09:06 +01:00
Benau
cb5f24e551 Reset time target if leaving the soccer screen with escape 2016-12-30 15:02:07 +08:00
Benau
5b96b4aa3f Allow windows user to enter path more easily 2016-12-30 15:00:26 +08:00
Benau
caf9dbab0c Fix crash when loading particle texture inside track folder 2016-12-30 13:28:13 +08:00
Benau
1e2a759f7b Restart STK if advanced pipeline option changed 2016-12-30 11:01:29 +08:00
auria.mg
7a6e6cb6a4 Attempt to imporove AMD driver version detection 2016-12-29 21:43:19 -05:00
Benau
bbaff0467e Fix normal map when advanced pipeline off 2016-12-30 00:58:48 +08:00
Deve
278ef781bf GLES: Make sure that we are using fixed pipeline when force legacy device is set in graphics restrictions.
It is generally safe for GLES drivers. The driver often reports OpenGL ES 3.1 or 3.0 support even though we request only GLES 2.0. But we can still use GLES 2.0 / GLSL 1.0 functions on GLES 3.x context, so it shouldn't cause any issues.

I also added Android Emulator to graphics restrictions.
2016-12-29 16:01:46 +01:00
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