ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,732 Commits 9 Branches 28 Tags 433 MiB
2102b059de
Commit Graph

13145 Commits

Author SHA1 Message Date
Deve
db4d11a0c5 Disable kart shadow for legacy pipeline in GLES renderer because it's broken 2017-02-22 21:04:28 +01:00
Deve
2ef6652183 Create a kart shadow only of shadow texture exists. 
If the image doesn't exist, in some cases it can draw non-transparent square below the kart, which is unwanted.
 2017-02-22 21:04:28 +01:00
Benau
02d3bd2c2b Take item on walldriving tracks into account 2017-02-21 15:06:26 +08:00
Benau
3898678e76 Use raycasted position for point 2 
Fix #2796, #2774
 2017-02-21 13:36:00 +08:00
Benau
0cf0002c08 Header clean up 2017-02-21 12:09:22 +08:00
auria.mg
eb9f656b44 Add config flag to persist GUI visibility state at samuncle's request 2017-02-20 19:16:49 -05:00
Deve
668e10d8ca Don't use srgb format in gles 2017-02-20 21:56:33 +01:00
Deve
875d5d8ef9 Some tweaks to the arrows size in dynamic ribbon widget. 
- arrow size now depends on screen size, so that it's now easier to click it on high resolutions
- it's additionally scaled on Android for easier usage
 2017-02-20 21:56:33 +01:00
hiker
41df6afbf9 Fixed compilation. 2017-02-20 09:22:09 +11:00
hiker
a17b537699 Make cannon smoother. 2017-02-20 07:48:43 +11:00
hiker
30cff00757 Reduce internal physics timestep to test if collision handling improves. 2017-02-20 07:48:25 +11:00
hiker
8e8de3c5e2 Merge branch 'master' of github.com:supertuxkart/stk-code 2017-02-20 07:45:26 +11:00
Benau
131dc4bfad Fix #2786 2017-02-18 14:30:35 +08:00
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
hiker
2ca7a1468e Fixed compiler warning. 2017-01-25 22:17:06 +11:00
hiker
37af3a3690 Fixed coding style issues (same should be done with speedweight objects). 2017-01-25 22:16:40 +11:00
hiker
3edff9523e Fixed compiler warning. 2017-01-25 22:16:40 +11: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
samuncle
996cea5a14 Oups, I forgot to drop the light 2017-01-22 20:32:25 -05:00
samuncle
979f61b8c1 Add support for day/night notion in tracks 2017-01-22 19:28:08 -05:00
samuncle
4f1101d62b Activate headlight only for the player 2017-01-22 10:09:32 -05:00
samuncle
93011e934e Merge branch 'master' into headlight 2017-01-22 08:35:07 -05:00
samuncle
44207e9620 ground work for an headlight for karts to allow better visiblity in dark tracks 2017-01-19 23:45:42 -05:00
hiker
620a5b34f2 Merge branch 'master' of github.com:supertuxkart/stk-code 2017-01-20 14:15:55 +11:00
hiker
b5f285a182 Fixed #2742 - incorrect triggering if cannon line triggereed Caused 
by not updating m_front_xyz when moving the kart (so an incorrect
position was used to detect checkline triggering).
 2017-01-20 14:13:12 +11:00
auria.mg
7234caffd9 Fix travis build 2017-01-19 21:11:44 -05:00
auria.mg
52fff152de Scripting : add support for "onStart" callbacks in library objects 2017-01-19 21:03:09 -05:00
Benau
4506f4baed Fix possible failed build 2017-01-18 18:42:19 +08:00
Benau
93ad594ff2 Merge branch 'fix_186' 2017-01-16 08:48:06 +08:00
Benau
5ad7b1491a Add marker for kart selection screen 2017-01-16 08:45:34 +08:00
auria.mg
b758e2eb62 Do not crash when pressing hidden button on Gp results screen. Fixes #2734 2017-01-15 19:32:15 -05:00
auria.mg
02d3e7a371 Fix restarting race not resetting kart velocity during a cannon ride. Fixes #2738 2017-01-15 19:22:06 -05:00
Deve
20ed2ad277 Print a warning on low memory event 2017-01-15 17:01:23 +01:00
Deve
a82784ab8e Minor modification that makes moving the list box smoother 2017-01-15 17:00:41 +01:00
Nado
e866d88118 Fix clang compilation 2017-01-14 14:36:52 +01:00
Benau
44faae26bf Fix typo 2017-01-13 18:39:57 +08:00
Benau
89c209bc6c Try to fix server build 2017-01-13 18:10:08 +08:00
Benau
30de9aef62 Fix #186 
Display win animation as jymis suggests in kart selection screen
 2017-01-13 18:03:13 +08:00
Benau
ec0ff7e984 Fix possible crash when dump the glyph pages 2017-01-12 13:22:41 +08:00
Benau
40fe84ddbd Fix addon stk mercuy crash 
Please avoid using 2nd uv layer on animated mesh
 2017-01-11 14:29:37 +08:00
Benau
ffedf637de Fix some override warnings 2017-01-11 13:34:25 +08:00
Benau
3105407b2f Remove error when dropping tires in battle mode when kart dead 2017-01-11 13:33:54 +08:00
Benau
3bffe1f1a7 Allow texture error message to be used in STKTexManager 2017-01-11 10:55:18 +08:00
Benau
874d3d347d Remove unused resize texture code 2017-01-11 09:46:00 +08:00
Deve
527132b6c8 Allow to enforce default player using a config variable. 
It can be used on Android until screen keyboard will be done.
 2017-01-10 22:10:43 +01:00
Deve
0ffde761ef Minor improvements in list box widget. 
- Current time was broken because getTimeSinceEpoch() gives a time in seconds, so the timeout for double click was 500 seconds.
- I disabled the timeout for double click anyway because it's IMO not needed (and it was broken anyway and nobody complained). Second click on the same element always sends the "selected again" event.
- I removed code that hovers new item when mouse is moved during selecting because it was working rather strange. For example it was possible to slightly move a mouse during selecting the item and the action was executed on the first click, even if we expect double click.
- Action is executed on single click on Android
 2017-01-10 21:30:45 +01:00
deve
9d9fb06401 Don't select new item when listbox was moving 2017-01-10 13:37:36 +01:00
deve
67b9c85918 Fixed GLES 2017-01-10 10:55:44 +01:00
Benau
5a31cd4e97 Support for backpedal animation 2017-01-10 16:13:34 +08:00
Benau
f1b0f529be Fix #1679 2017-01-10 14:12:38 +08:00
Benau
aa01fafe92 Fix server build 2017-01-10 13:05:19 +08:00
Benau
21060133a8 Fix invalid read reported by valgrind when changing language 
And fix possible crash
 2017-01-10 12:52:50 +08:00
Benau
a55cc47845 Fix leaking font texture when changing language 2017-01-10 12:52:31 +08:00
Benau
9af219f691 Fix #1780 2017-01-10 11:39:01 +08:00
hiker
2641f0b067 Merge branch 'master' of github.com:supertuxkart/stk-code 2017-01-10 13:25:53 +11:00
hiker
55e98e041c Removed unused (or replaceable in case of clamp) functions from helpers. 2017-01-10 13:25:26 +11:00
auria.mg
87646463b8 Minor : upgrade profiler utils to use the logging functions 2017-01-09 20:36:08 -05:00
auria.mg
7e6761e968 Minor : reduce logging level 2017-01-09 20:30:08 -05:00
auria.mg
ebf3893f73 Minor : add a little documentation to user config 2017-01-09 20:29:41 -05:00
Benau
f7d843a7f7 Make dialog draggable in artist debug mode 
So artist can view texture change by moving texture console
 2017-01-10 09:22:08 +08:00
Benau
8acd2d689a Merge branch 'new_texture_format' 2017-01-10 09:09:38 +08:00
Deve
ecd5445eed Added a helper function that prints opengl errors 2017-01-09 23:21:40 +01:00
Benau
bd20d2512c Keep single channel for reloading texture 2017-01-09 15:35:57 +08:00
Benau
848dd05f11 Add IImage to STKTexture constructor for areamap texture 2017-01-09 15:04:34 +08:00
Benau
c4b4ea006e We don't need to add a new glyph page for billboard text anymore 2017-01-09 13:16:40 +08:00
Benau
46be4948b2 AZDO for new texture format 2017-01-09 13:03:50 +08:00
Benau
e049cb2bd6 Allow saving single channel compressed texture 2017-01-09 00:50:04 +08:00
Benau
71c14ff0b3 Convert code to a more readable format 2017-01-08 23:50:47 +08:00
Benau
1cc8371ac5 Preserve max texture size when restart 2017-01-08 22:02:04 +08:00
Benau
597461d680 Fix server build 2017-01-08 15:42:29 +08:00
Benau
21d35d4bcd Display texture size instead of pointer location 2017-01-08 15:37:03 +08:00
Benau
00437e6d15 Allow using colorization mask with single channel texture only 2017-01-08 15:30:49 +08:00
Benau
4ba1b2408c Minor optimization 2017-01-08 14:38:58 +08:00
Benau
6f191bd7da Fix gles 
Because in the past call texture->lock() will return unmodified
cached image (always bgra), now the image will be converted
dependently
 2017-01-08 13:31:10 +08:00
James Cowgill
4aae66a050 Convert CREDITS to UTF-8 (#2723) 
* Convert CREDITS to UTF-8

* Remove trailing whitespace in CREDITS

* Read CREDITS file as utf-8

* Make CREDITS file non-executable
 2017-01-07 18:56:15 -05:00
Benau
f609114594 Zero the array to prevent black border in glyph 
Also use the correct internal format
 2017-01-08 00:05:00 +08:00
Benau
314c32865b Allow using single color channel for font texture 2017-01-07 16:36:25 +08:00
Benau
f78d749a0c Fix no graphics run 2017-01-07 15:43:25 +08:00
Benau
6deb0e0f8a Avoid using createImageFromData with preload data for texture 
Todo: allow using single channel for font texture, saving 75% size
 2017-01-07 14:45:47 +08:00
Benau
37a4d512ab Add cache version inside the cache file 
Also clean up commented out code
 2017-01-07 10:44:29 +08:00
auria.mg
68fe1e58c2 Fix a few divisions by zero, see #2727 2017-01-06 21:26:16 -05:00
auria.mg
67e66b44b0 Improve texture cache code to use precise subpaths instead of hashes 2017-01-06 21:07:53 -05:00
Benau
3e5199334d Drop models and lights when leaving model widget screen 2017-01-07 00:27:48 +08:00
Benau
ba8846522e Implement cleaning for new texture 
Also warn if there is possible texture leaking when exit STK
 2017-01-06 23:45:25 +08:00
Benau
555cdacd83 Improve warning 2017-01-06 20:54:22 +08:00
Benau
437f89eea7 Clean up 2017-01-06 20:28:03 +08:00
Benau
66f3a2e32b Make dump glyph page possible for new texture format 
Also implement read-only lock, please use reload() for writing
 2017-01-06 19:58:51 +08:00
Benau
2af126357d Port font to use new texture format 2017-01-06 18:20:19 +08:00
Benau
4bcf03e296 Port reload texture to use new STKTexManager 2017-01-06 15:47:54 +08:00
Benau
827a483e85 Allow legacy pipeline to use new texture format 2017-01-06 15:04:15 +08:00
Deve
5f4bef044b Pause/resume sounds when game is paused on Android. 
We should handle both pause and focus events, but they may occur in different order or in some cases we may receive only lost focus event.
So we need to check the current state to make sure that pause/resume sounds is executed only once.
 2017-01-05 15:53:32 +01:00
LoadingPleaseWait
1cb329dccf No slipstream from ghost kart, fix #2721 2017-01-05 02:10:35 -06:00
Benau
513f1e2edf Add unicolor texture loading 2017-01-05 14:51:38 +08:00
Benau
6e4d7da487 Improve warning handling 2017-01-05 13:42:22 +08:00
Benau
c7d56d3edc Allow caching compressed texture 
Use std::hash for string (path + basename + max_texture_size)
 2017-01-05 12:50:33 +08:00
Deve
fb0a54278a Fixed possible crash. 
STK could crash when invalid graphics restriction name was set in graphics_restrictions.xml file.
It's because of wrong while (m_names_of_restrictions[i] != NULL) condition.
 2017-01-05 00:28:16 +01:00
Deve
23acade026 Make sure that legacy pipeline is used when it's set in graphics restrictions. 
It was be done only for GLES before, but also for OpenGL some drivers create OpenGL 4.x compatibility profile context even if we request GL 2.1. So we can't assume that it will report GL2.1 and we should make sure that fixed pipeline will be used.
Actually now it works in the same way as force_legacy_device in config.xml.
 2017-01-04 23:39:15 +01:00
Benau
99857ca193 Fix GLES 2017-01-04 15:05:04 +08:00
Benau
497f1e2785 Clean up billboard texture code 
Todo: compress them in STKTexture class
 2017-01-04 14:35:49 +08:00
Benau
c98e4f2bac Simplify particle texture loading 2017-01-04 13:43:14 +08:00
Benau
63f57d6a9c Fix wrong texture if absolute path is not given 2017-01-04 11:41:11 +08:00
Benau
05a29fe7da Let material code handle premultiplied alpha and srgb 2017-01-03 16:35:37 +08:00
Benau
d57841bcb8 Fix crash if skybox / SH shares textures from track 2017-01-03 12:35:05 +08:00
Benau
57e16dcb73 Avoid unneeded copying in sky box and SH 2017-01-03 11:08:33 +08:00
Benau
19ac8a0d3c Allow sky box and SH to use new texture format 2017-01-03 10:18:11 +08:00
auria.mg
ac8a5c552f Make dialogs non-draggable. Fixes #2717 2017-01-02 19:02:05 -05:00
Deve
9c7a438826 Remove simulating mouse events from event handler. 
It will be handled in irrlicht device.
 2017-01-02 21:49:41 +01:00
Deve
bcea2355fa Allow to scroll list box by touch gesture. 
It can be restricted to Android-only, but tbh. I don't see any reason that it can't work in the same way on desktop computers (may be usable on laptops with touch screen, all-in-one computers etc...).

I also made a minor fix with if(!event.MouseInput.isLeftPressed()) because the EGET_ELEMENT_FOCUS_LOST event seems to not work at all.
 2017-01-02 21:47:23 +01:00
Benau
6db2212690 Try to fix server build 2017-01-03 00:03:26 +08:00
Benau
2dbf4675a5 First version of new texture format 
Todo: IBL, texture compression, GLES, premul alpha ....
 2017-01-02 16:14:59 +08: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
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
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
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
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
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
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
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
Benau
581ca964fd Fix hats with hardware skinning 2016-12-19 11:06:05 +08:00
Daniel Butum
d0229cd85e Separate the non-cached shader loading in ShaderFilesManager 2016-12-18 13:40:36 +02:00
Benau
4f2e2331ee Correct the spelling of shader files 2016-12-18 14:59:37 +08:00
Benau
4477dbb0fb Preload shaders that delay kart selection screen the most 
Plus some suggestion from #1787
 2016-12-18 14:51:27 +08:00
Benau
7ea4f30824 Make sure no duplicated shader is added somewhere else 2016-12-18 13:49:58 +08:00
Benau
2a9656bfdc Allow all shader files to be loaded only once 
Todo: preload
 2016-12-18 10:51:05 +08:00
Benau
7894e5c864 Try to use a smarter approach 2016-12-18 09:27:50 +08:00
auria.mg
da795b69ed Better fix for #2687 2016-12-17 18:49:00 -05:00
auria.mg
2b13a5643e Ignore the "applesmc" accelerator as input device. see #2691 2016-12-17 17:43:03 -05:00
Deve
f314c1ff2a Some improvements for multitouch steering GUI 
- move it to separate class, so that it can be displayed in Overworld too
- add a possibility to scale the interface (atm. only in config.xml)
- touch steering buttons are created only for single player races

I removed unused drawEnergyMeter function from Overworld GUI. The reason was that I use this function from race_gui.cpp for nitro button and this function in overworld breaks it. And still the proper drawEnergyMeter function is available in race_gui.cpp and can be moved to RaceGuiBase if it will be needed in Overworld in future.

I moved the font size computation to the top of constructor because I use it to check available space for minimap.
 2016-12-17 23:28:22 +01:00
Benau
90a556fe9c Try to share shaders across different programs 
Todo: non-instanced version
 2016-12-17 15:59:40 +08:00
auria.mg
488af78fa3 Fix #2687, reset cameras properly 2016-12-16 21:03:05 -05:00
auria.mg
fc9a51b7f4 Reset cameras when resetting 3 strikes battle. Fixes #2687 2016-12-16 20:33:30 -05:00
auria.mg
5f0a65a07b Fix bug where an animated texture matrix could never be reset to identity. Fixes #2692 2016-12-16 20:21:09 -05:00
Benau
79e5aadd4d Avoid using software skinning on empty joint objects 2016-12-16 10:04:35 +08:00
Benau
752d847b09 Add the remaining shaders for GL3 hardware skinning 
Also use the same shader code for normal map shader
 2016-12-15 15:55:14 +08:00
Benau
3d814d1036 Fix wrong case handling 2016-12-15 13:30:26 +08:00
Benau
035271d6ec Remove GL error about draw2DLine 
Use GL32_draw2DRectangle, only works if it's a straight line.
 2016-12-15 12:57:39 +08:00
Benau
2e2345289c Don't upload / bind skinning ubo if not supported 2016-12-15 12:17:39 +08:00
Benau
1f23e6e783 Remove code used to duplicate VAOs for animated meshes 2016-12-15 11:44:09 +08:00
Benau
6baed2b0dd Merge remote-tracking branch 'origin/master' into hardware_skinning 2016-12-15 10:01:12 +08:00
Benau
a696fd6dff Add transparent skinned mesh shader 2016-12-15 09:52:02 +08:00
Benau
85bd8c3146 Add unlit and normal map skinned mesh shader 
Also fix normal map with skinned mesh, now vertices and joints
will be recalculated for tangents mesh
 2016-12-14 16:28:37 +08:00
hiker
4ee6f6315f Made World::m_weather a singleton to further remove dependencies on World. 2016-12-13 17:14:29 +11:00
hiker
32f2196201 Removed unnecessary #include world.hpp. 2016-12-13 17:13:54 +11:00
hiker
ed7574ca85 Merge remote-tracking branch 'origin/master' into simplify-world 2016-12-13 09:19:24 +11:00
hiker
4d406490e1 Made ScriptingEngine a singleton and removed it from World, which reduces 
more dependencies on world.
 2016-12-13 09:18:59 +11:00
hiker
b12453e9ca Made Physics a singleton, removing the accessor functions from World. 
Removes dependency on World for a few files.
 2016-12-13 08:31:08 +11:00
hiker
cd149ab5d7 Moved m_track out of World into a static m_track in Track. Makes 
world smaller and removes a few dependencies on World.
 2016-12-13 07:53:33 +11:00
Benau
abe4ae2d6a Fix server only stk 2016-12-12 13:54:43 +08:00
Benau
c8e5238ce2 Merge remote-tracking branch 'origin/master' into hardware_skinning 2016-12-12 13:45:04 +08:00
Benau
269e440d0c Avoid translating artist debug mode only fps string 2016-12-12 13:43:01 +08:00
Benau
a420b09363 Disable all karts animation if UBO size not big enough 2016-12-12 13:24:34 +08:00
auria.mg
044e8c52e1 Fix tabs added in previous commit, used spaces instead... 2016-12-11 20:19:58 -05:00
auria.mg
ab7ded308a Make presentation of kart characteristics uniform and indepdendent of difficulty. Fixes #2684, fixes #2539 2016-12-11 20:16:44 -05:00