Commit Graph

2553 Commits

Author SHA1 Message Date
hiker
3edff9523e Fixed compiler warning. 2017-01-25 22:16:40 +11:00
deve
8c8d2ac8c4 Add a screen keyboard that can be used on touch screens 2017-01-23 07:14:09 +01: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
Benau
30de9aef62 Fix #186
Display win animation as jymis suggests in kart selection screen
2017-01-13 18:03:13 +08:00
Benau
3bffe1f1a7 Allow texture error message to be used in STKTexManager 2017-01-11 10:55:18 +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
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
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
Benau
cb5f24e551 Reset time target if leaving the soccer screen with escape 2016-12-30 15:02:07 +08:00
Benau
1e2a759f7b Restart STK if advanced pipeline option changed 2016-12-30 11:01:29 +08:00
Benau
71161264be Merge remote-tracking branch 'origin/master' into fix_2316 2016-12-28 15:50:14 +08:00
Benau
ffe4dd88b4 Apply mask directly on texture
Avoiding the ref counting issues
2016-12-28 15:32:27 +08: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
Benau
ebef08c3d8 Try to combine all text field dialogs 2016-12-26 10:53:14 +08: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
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
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
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
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
6baed2b0dd Merge remote-tracking branch 'origin/master' into hardware_skinning 2016-12-15 10:01:12 +08: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
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
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
hiker
1939075a1b Merge remote-tracking branch 'origin/master' into nw 2016-12-06 18:45:17 +11:00
hiker
746bac00ce Merge remote-tracking branch 'origin/new-pi' into nw 2016-12-06 09:26:07 +11:00
Deve
419e9e5351 Some minor modifications that make merging with master easier 2016-12-04 15:11:48 +01:00
hiker
aa36f7856f Fixed compiler warnings. 2016-11-28 09:03:56 +11:00
hiker
b1afac23a7 Moved creation of the race protocols into lobby, so SynchronizationProtocol
is not involved in the race start anymore.
2016-11-24 08:56:30 +11:00
hiker
62da83317e Fixedc compilation, renamed LobbyRoomProtocol to LobbyProtocol. 2016-11-23 18:39:59 +11:00
hiker
026e1623ec Renamed ServerLobbyRoomProtocol to just ServerLobby, ClientLobbyRoomProtocol
to ClientLobby, and LobbyRoomProtocol to Lobbyprotocol.
2016-11-23 09:39:33 +11:00
hiker
09eae7e25f Removed StartGameProtocol, and added the necessary states to the
Lobby rooms. Added documentation of the FSM for the ServerLobby.
2016-11-22 17:57:15 +11:00
hiker
6b1563321f Use singleton for lobby protocols. 2016-11-18 09:08:37 +11:00
hiker
73182863df Fixed linking problems - will probably not run ;) 2016-11-14 09:59:08 +11:00
hiker
ddcddf4a0a Compile SERVER_ONLY (by #ifdef'ing out all graphics related code).
Does not link yet!!
2016-11-11 23:46:22 +11:00
hiker
190490e0ce Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-11-11 15:15:02 +11:00
Benau
8b069df97f Merge remote-tracking branch 'origin/renderer_refactoring' 2016-11-11 08:43:42 +08:00