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
hiker
6065a6ce3e
Added debug option to disable automatic LAN connection.
2016-11-10 18:21:27 +11:00
deve
4bb0405a32
Added support for multitouch steering.
...
It will be used for steering on Android.
There are some limitations:
- currently it works only in single player mode (but I don't see any reason to make it working for multiplayer)
- speedometer is not available in race GUI because there is no place for it
TODO:
- add DPI support (race GUI should have probably different proportions on smaller devices for comfortable playing)
- make nice button images
- make nitro button that changes its look depending on collected nitro (a kind of nitro bar)
Touch input events must be handled in android device to make use of it. It can be simulated for debugging on non-android devices using standard mouse.
2016-11-10 02:42:56 +01:00
deve
78c1c5e14a
Update .gitignore
2016-11-10 02:42:07 +01:00
hiker
9201a08daf
Fix crash exiting a server screen.
2016-11-09 23:24:04 +11:00
hiker
64d2d43f5b
Disable console (for #2665 ).
2016-11-09 23:06:17 +11:00
Benau
0c0581f97a
Merge remote-tracking branch 'lpw/malice'
2016-11-05 11:25:19 +08:00
LoadingPleaseWait
578a3732c0
Add help page with icons for banana penalties
2016-11-04 22:16:06 -05:00
Benau
214ea6801b
Merge remote-tracking branch 'origin/master' into renderer_refactoring
2016-11-04 21:06:42 +08:00
Benau
9da38a2755
Fix Mac build
2016-11-04 21:05:07 +08:00
Benau
7da108c8b1
Header clean up
...
Also move getUnicolorTexture to a better location
2016-11-04 20:30:08 +08:00
Benau
01c7576755
Update prefilled textures if new RTT is used
...
Required by multiplayer kart selection screen
2016-10-31 14:13:38 +08:00
Benau
253281aaeb
Avoid crashes in fixed pipeline RTT if it fails
2016-10-31 11:57:15 +08:00
Benau
1678078aea
Fix GLES
2016-10-31 09:15:50 +08:00
Benau
07ebb760ac
Try to make RTT creation as close to master as possible
2016-10-31 00:33:06 +08:00
Benau
7998c326fc
Prevent using uninitialized values
2016-10-30 14:44:08 +08:00
Benau
df57a73813
Fix start projection of karts
2016-10-30 10:10:09 +08:00
Benau
fc47d6e220
Minor header clean up
2016-10-29 10:37:45 +08:00
Benau
0165469301
Fix build
2016-10-28 23:46:24 +08:00
Benau
2f0252be98
Merge remote-tracking branch 'origin/master' into renderer_refactoring
2016-10-28 21:41:49 +08:00
hiker
9f4c842b6c
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-10-27 21:36:17 +11:00
hiker
fda3afad93
Fix 2658 by separating networking code from main loop.
2016-10-27 21:33:42 +11:00
Benau
956aa83a0a
Remove unused function
2016-10-27 10:15:41 +08:00
Benau
93197d9569
Merge branch 'fix_2445'
2016-10-27 09:41:35 +08:00
Benau
d4e9de1f53
Fix non-animated karts
2016-10-27 09:41:01 +08:00
hiker
94346ae64d
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-10-27 11:13:19 +11:00
hiker
b3b9d16ba1
Removed unnecessary logging.
2016-10-27 08:48:38 +11:00
hiker
2c56837ee8
Fixed token handling.
2016-10-27 08:41:35 +11:00
hiker
b1f6632e5b
Changed countdown from a mixture of ms and seconds to seconds only;
...
added documentation.
2016-10-27 08:40:45 +11:00
deve
bc7f89d49a
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-10-26 13:51:40 +02:00
deve
8d270e5ff3
Fixed nitro bar for non-HD textures
2016-10-26 13:51:17 +02:00
Benau
e93e8b7708
Make animated mesh render separately in instanced rendering
...
Try to introduce mesh + render info hash in vao manager, without
copying the mesh
2016-10-26 14:25:48 +08:00
Benau
9bd4c87b9c
Fix leaking createTextBillboard
2016-10-26 09:21:17 +08:00
Benau
cc3ff7cf9f
Simplify calculation of transform
2016-10-26 09:08:10 +08:00
Benau
a38c8f0c19
Make billboard text display properly when viewing in any direction
2016-10-26 00:34:13 +08:00
hiker
e31a7ca4a8
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-10-25 10:05:28 +11:00
hiker
6a578e374f
Fix LAN handling when connecting via a WAN server.
2016-10-25 07:53:52 +11:00
Benau
68ea2ed3b2
Fix typo
2016-10-22 12:33:47 +08:00
Benau
cf557f6982
Fix release build
2016-10-22 10:46:30 +08:00
Benau
3e70fa27d9
Add doxygen for Font modules
...
Plus some coding-style cleanup
2016-10-22 00:01:48 +08:00
hiker
df21ba55b4
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2016-10-21 08:31:11 +11:00
Benau
7505630cd4
Add doxygen for Soccer and SpareTire AI
2016-10-21 01:38:30 +08:00