Commit Graph

12923 Commits

Author SHA1 Message Date
Deve
299a4dc5f2 Don't check the TBO extension 2017-02-17 06:31:15 +01:00
Deve
251c46dcc4 Always call bind sampler function.
This fixes errors for Intel HD4000 on Windows.

My understending of this issue is following:
- a shader assigned two textures, i.e. texture1 = sampler1, texture2=sampler2
- then next shader (i.e. importance sampling specular) assigned two textures: texture1=sampler1, texture2=without_sampler
- when we executed setTextureUnits, the glBindSampler function wasn't called at all, so the drivers were trying to use combination texture2=sampler2, even though the sampler2 was prepared for different texture and most likely was already deleted.

We can just always call the glBindSampler function, so that if texture doesn't have a sampler, it will execute it with sampler_id=0 param, which is practically an "unbind" function.
2017-02-17 01:03:39 +01:00
Benau
c635e8d1c4 Get rid of some srgb conversion in shader, see #2787 2017-02-13 10:06:35 +08:00
Benau
d3cbc6ca0e Fix GLES 2017-02-13 00:45:18 +08:00
Benau
ca0a605b0e Don't use texture buffer object if not supported, see #2571
Also allow to use setTextureUnits for texture buffer
2017-02-12 15:42:22 +08:00
Benau
4af255431c Fix opengl warning about glTexSubImage2D buffer of null pointer
For example, whitespace in freetype glyph has no bits buffer
2017-02-12 10:23:18 +08:00
Benau
48f27df1c9 Fix wrong angle when normal is exactly 0, -1 ,0 2017-02-11 16:05:10 +08:00
Benau
0ddada2897 Fix --track-debug crash 2017-02-11 14:42:24 +08:00
Deve
3f214c1bb7 Find textures once on race gui initialization 2017-02-11 00:51:22 +01:00
Deve
a877cb848f Added better icons for touch steering.
Thanks to jymis!
2017-02-11 00:51:22 +01:00
Benau
ea95ffe424 Remove compiler warning 2017-02-10 18:21:27 +08:00
Alayan-stk-2
0293dabfd3 New GP point system (#2765)
* Change grand-prix node for the new GP point system

* New GP point system

* Typo fix
2017-02-07 19:31:53 -05:00
Deve
77ff387f6b Minor tweak 2017-02-07 14:38:40 +01:00
Deve
4852664143 Allow to use accelerometer for turning left/right.
It should be much more comfortable on small devices.
Though it's not possible to get default screen orientation (and real device orientation) using NDK functions, so at this stage user has to manually choose if he needs "tablet" or "phone" accelerometer.
2017-02-07 13:48:08 +01:00
Deve
a40fd4cde9 Handle new Polish format in tinygettext.
It's PITA because they broke it at it doesn't look that they are going to do something with it.

The plural form for number 14 is broken because the condition is bad. It should be n%100>14 instead of n%100>=14. In the past it was using 3rd form for numbers 12, 13, 14 and it's the proper form for these numbers. The new format uses 2nd form for number 14.

Moreover the condition for third form is just a negation of the first and second form, so that the 4th form actually never happens.

Also the condition for 3rd form is ambiguous. Should it be
(n!=1 && (n%10>=0 && n%10<=1)) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14)
or maybe
n!=1 && ((n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14))

Based on Unicode plural rules, the 4th form should be used for floating point numbers, but it's not supported by tinygettext anyway.

In short, handle the new format in the same way as it was before, so that the 4th form is useless, but at least everything works properly.
2017-02-06 20:39:30 +01:00
deve
cdd96f67dd Draw powerup icon on a button when touch steering is enabled 2017-02-06 06:26:11 +01:00
Seebi
e5feb3d35f Fix sometimes not initializing a soccer game - fixes #2769 (#2772) 2017-02-05 20:09:51 -05:00
Alayan-stk-2
8858d4d86f Parachute improvements (#2768)
* Change grand-prix node for the new GP point system

* New GP point system

* Add parachute characteristics for rank and speed time multipliers

* Add new parachute characteristics

* typo fix

* Add rank and speed parachutes characteristics

* Add rank and speed parachute characteristics

* Add rank and speed parachute characteristics

* Add rank and speed parachute characteristics

* Add rank and speed parachute characteristics

* Add logic for parachute time scaling according to rank

* Add logic for parachute time scaling according to speed

* Separate GP and parachute branches

* Separate GP and parachute branches
2017-02-05 18:54:32 -05:00
Benau
5d30393641 Allow reload texture with control+f3 for sam in game 2017-02-05 14:10:26 +08:00
Benau
6fae872a69 Fix #2766 2017-02-05 09:11:48 +08:00
Deve
7c48c3e6cc Choose a directory where we have the most available disk space for data extraction.
It's not a perfect solution because at least on my device internal storage is much faster than sd card. But at least it should be much safer to choose a path with more free space.
2017-02-03 23:53:47 +01:00
auria.mg
01765fce80 Fix crash 2017-02-02 19:54:48 -05:00
Benau
13081a07ec Fix #2763 2017-02-03 08:41:18 +08:00
Deve
2557a700cc Just to be more clear about explicit attrib location availability in GLES 2017-02-02 22:26:37 +01:00
Deve
19cb9cd041 Fixed a crash when starting cutscene 2017-02-02 22:22:33 +01:00
Deve
d4d5452825 Enable glBindSampler in GLES 2017-02-01 22:52:07 +01:00
Deve
b54c3648b3 Again missing parenthesis... 2017-02-01 22:15:48 +01:00
Deve
28d85d7ba3 Use explicit attrib location when the extension is available.
It allows to enable it easily in GLES renderer. And we check if this extension is available anyway because it's needed for shadows, so we can use it for other shaders too.
2017-02-01 21:58:10 +01:00
deve
d124c61e3c Remove useless ifdef.
It should depend on features available in graphics drivers and not on headers that were used for compilation.
In theory there was a possible case that GL_VERSION_3_3 was not defined and CVS->getGLSLVersion() >= 330 was true, so that bind wasn't done at all.
And still GL_VERSION_3_3 should be always true for OpenGL renderer because it's defined in glew.
2017-02-01 10:40:48 +01:00
deve
3c8369b915 Set GLSL version for GLES.
It's not 100% true because GLES has different versions numbering. For example it doesn't have geometry shaders even if they were introduced in GLSL 1.50 (OpenGL 3.2).
But still in this way we make sure that it uses the same features on all devices, no mater if it's GLES 3.0, 3.1, 3.2 etc.
2017-02-01 10:30:46 +01:00
auria.mg
93d6b1e515 Tweak camera settings 2017-01-30 19:17:27 -05:00
auria.mg
62e8ec86fa Merge branch 'NewSmoothCamera' 2017-01-30 18:51:24 -05:00
Deve
fbffb108f1 Force to use rtts when scale_rtts_factor is set.
It allows to scale down resolution even if advanced lighting is disabled.
2017-01-31 00:18:02 +01:00
deve
bf64459458 Handle a case that advanced lighting is disabled in graphics restrictions. 2017-01-30 11:18:31 +01:00
auria.mg
e7252cc643 More work on camera smoothness 2017-01-29 21:48:54 -05:00
auria.mg
e8cb873f08 Finish smoothing the kart rotation 2017-01-29 21:37:58 -05:00
auria.mg
6d3eb84a8e Reduce shaking a bit by smoothing kart position. Still need to smooth kart rotation, can't quite get it to work yet 2017-01-29 21:33:11 -05:00
auria.mg
56b6f81eb7 New smooth camera 2017-01-29 19:58:33 -05:00
Deve
803eba5d5c Fixed typo 2017-01-27 22:44:22 +01:00
deve
62bcf52f9c Add a possibility to select team without a keyboard for single player mode 2017-01-26 10:23:45 +01:00
deve
99b2cd7e57 Some corrections in team selection events 2017-01-26 10:22:31 +01:00
deve
85f153f0d5 Move changing a team to separate function to avoid code duplication 2017-01-26 09:21:35 +01:00
Deve
49a77a8f48 Add a possibility to disable touch steering in options.
It may be useful if someone wants to play with external keyboard.
The multitouch_mode parameter will be also used to choose between steering with buttons and using accelerometer.
2017-01-25 21:50:11 +01:00
deve
9ede4d2185 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2017-01-25 10:29:18 +01:00
deve
fea3b1b3e5 Set curl nosignal option.
It fixes the crash under cygwin and should also fix a crash when c-ares/threaded resolver are not available in curl library.
Fixes #2753
2017-01-25 10:28:48 +01:00
auria.mg
6e8480379b Add support of headlight models to karts 2017-01-23 20:14:42 -05:00
deve
a1e8cb8acd Try to fix build 2017-01-23 10:49:18 +01:00
deve
8c8d2ac8c4 Add a screen keyboard that can be used on touch screens 2017-01-23 07:14:09 +01:00
samuncle
9e1afc89ee Add a permanant exhaust to the kart, tweaking needed 2017-01-22 23:20:07 -05:00
auria.mg
2bcc579f61 Fix crash 2017-01-22 21:23:33 -05:00