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

2532 Commits

Author SHA1 Message Date
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
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
hiker
9201a08daf Fix crash exiting a server screen. 2016-11-09 23:24:04 +11:00
LoadingPleaseWait
578a3732c0 Add help page with icons for banana penalties 2016-11-04 22:16:06 -05:00
Benau
7da108c8b1 Header clean up 
Also move getUnicolorTexture to a better location
 2016-11-04 20:30:08 +08:00
Benau
2f0252be98 Merge remote-tracking branch 'origin/master' into renderer_refactoring 2016-10-28 21:41:49 +08: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
3e70fa27d9 Add doxygen for Font modules 
Plus some coding-style cleanup
 2016-10-22 00:01:48 +08:00
Benau
fb0f4fca3c Allow BattleAI to collect lives 2016-10-09 13:24:00 +08:00
Benau
357567ae8d Move spare tire num info to race_manager 
It allows this info to be get more easily
 2016-10-09 09:50:26 +08:00
Benau
71359a087d Add heart billboard with red kart for spare tire karts 2016-10-08 14:29:28 +08:00
Benau
91af45337f Pre-add spare tire karts probably 2016-10-07 14:39:39 +08:00
hiker
3506b7da2f Merge pull request #2615 from nado/warning-fix 
Fixes warnings
 2016-10-05 12:59:22 +11:00
hiker
8949e89809 Merge remote-tracking branch 'origin/master' into rewind 
Fixed conflicts.
 2016-10-05 08:21:10 +11:00
Nado
25a4aa565a Reduce variables scope when possible, based on the warnings reported by 
cppcheck.
 2016-10-04 08:55:01 +02:00
Nado
afbea19d34 Fix -Wunused-variable 2016-10-04 08:44:50 +02:00
Nado
4c0b4d8078 Fixes -Wsign-compare 
See #2613
 2016-10-04 08:43:38 +02:00
hiker
9cf88ef874 Merge remote-tracking branch 'origin/master' into rewind. 
Fixed conflicts.
 2016-10-04 08:15:40 +11:00
Benau
3187c7e0f9 Allow referee showing on upside down starting position 2016-09-18 13:54:00 +08:00
auria.mg
061323ffb0 Add information for translators 2016-08-23 20:01:06 -04:00
Deve
a4dfbc552f Fixed also minimap in overworld with scale rtts parameter 2016-08-20 22:47:53 +02:00