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

2864 Commits

Author SHA1 Message Date
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
Alpt
67e94e73ce In the addons screen, show a tip to remember that the Internet connection is disabled. (Issue #1763). (#2605) 2016-08-19 18:28:59 -04:00
Elderme
41cd1e0364 merged with master 2016-08-18 22:36:19 +02:00
Benau
6b0fe9dd89 Clean up: 
Try to use forward enum declaration for KartRenderType

NoCopy for RenderInfo
 2016-08-18 11:15:05 +08:00
Michael Murphey
d213bef9db Place buttons in confirm dialog horizontally (#2573) 
* Place buttons in confirm dialog horizontally closes #2548

* Use RibbonWidget for MessageDialog

* Use buttonbar for confirm dialog
 2016-08-16 19:08:45 -04:00
Deve
489c34edbf Fixed minimap with scale_rtts_factor parameter 2016-08-16 23:59:36 +02:00
hiker
7c899c943c Refactored KartControl to use setters/getters instead of 
just public variables.
 2016-08-15 17:26:07 +10:00
Benau
6904402547 Fix wrong RTL text in arena screen 2016-07-31 09:04:10 +08:00
auria.mg
40ab343922 Fix string remaining in wrong language when changing language 2016-07-30 20:52:32 -04:00
auria.mg
b69faff13d Fix indentation (tabs/spaces) 2016-07-30 19:46:15 -04:00
auria.mg
347f977ea7 Fix english string, as reported a while ago but couldn't fix then due to string freeze 2016-07-30 19:44:21 -04:00
auria.mg
a318e3b216 Log out user when deactivating internet connection, fixes #2589 2016-07-30 19:43:48 -04:00
hiker
b1a7c01b6e Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-07-27 08:59:02 +10:00
hiker
0db2a195b6 Fixed compiler warning. 2016-07-27 07:54:54 +10:00
Elderme
a21d7b4b71 Merge branch 'master' into renderer_refactoring 2016-07-26 22:16:48 +02:00
Elderme
cd1b9a66a0 Merged master in branch 2016-07-26 21:31:52 +02:00
Benau
8c38e9e79b Merge remote-tracking branch 'origin/fix_timer' 2016-07-25 14:46:58 +08:00
Benau
7f1e776bf6 Fix digit font drawing 2016-07-19 16:47:39 +08:00
Benau
03b92efba5 Fix wrong text alignment 2016-07-19 15:21:14 +08:00
Benau
6a319cbed2 Clean up old font code 2016-07-18 23:00:40 +08:00
Benau
05419cd555 Initial work on new font rendering engine 2016-07-18 16:03:11 +08:00
Benau
1d6c7fa60f Remove vector int in RenderInfo 2016-07-15 12:31:00 +08:00
Benau
b903baf226 Fix crash sound only working once if the timer counts backwards 2016-07-08 23:43:12 +08:00
Benau
f23ec7e7b8 Add more helper function to render info class 2016-07-01 00:39:25 +08:00
Benau
bfd66ebbac Put color change code in a better location 2016-06-30 16:08:59 +08:00
Benau
cda6bd7603 Allow changing kart color on-the-fly in soccer setup screen 2016-06-30 14:12:12 +08:00
auria.mg
cecc075e74 Add new improved race end sound 2016-06-24 20:23:00 -04:00
Elderme
b359e8f9fd Merged with master, solved conflicts 2016-06-18 19:28:54 +02:00
Michael Murphey
c849aa3b8d More information in race result GUI (#2516) 
* More information in race result GUI

* Fix extra race result GUI information

* Rename displayHighScores()

* Use race_manager->hasModeLaps() and fix clang compile error

* Don't initialize best_lap_time unless the mode has laps
 2016-06-15 19:36:37 -04:00
Benau
221a757942 Merge branch 'arena_ai_profiling' 2016-05-24 15:52:32 +08:00
Benau
9a815b4e65 Fix x N items font size 
It should depend on screen scaling.
 2016-05-18 13:03:35 +08:00
Benau
de8d172c07 Improvements in soccer mode with minimap 
1. Larger ball

2. Draw goal line of two teams in minimap
 2016-05-17 16:01:27 +08:00
hiker
01ce2c32ef Properly fixed #1347. Made a global variable part of the 
KartSelection object, to avoid the two instances of the
kart selection screen to interfere with each other. Removed
tearing down the kart selection screen. Also fixed crash
when starting the kart screen after a network kart screen.
 2016-05-10 17:27:50 +10:00
hiker
bc418acb05 Fixed second location where the kart/playe rname was used. 2016-05-07 00:16:36 +10:00
hiker
6c9f3d73b5 Show the name of the player in the grand prix result screen. 2016-05-06 16:47:36 +10:00
Benau
db6ea0e740 Add help for translator 2016-05-06 08:37:05 +08:00
hiker
8c25addda5 Changed item display from "item N x" to "item x N". 2016-05-04 07:52:40 +10:00
hiker
b83246aac2 Revert "Do not compute the battle graph in case of a single kart in debug" 
since Benau has suggested a better approach.
This reverts commit c9c37fb400.
 2016-04-28 16:58:37 +10:00
hiker
c9c37fb400 Do not compute the battle graph in case of a single kart in debug 
mode in an arena: in debug mode computing the distance matrix
takes a LONG time (approximately 12 minutes on my machine). In
release mode it's fast enough for now.
 2016-04-28 11:17:20 +10:00
hiker
94ad7ad676 Adjust wheel position in case of leaning: move the wheels on the side 
that is higher in the air a bit further down so that they touch the ground.
Fixed #2400.
 2016-04-27 18:15:28 +10:00
auria.mg
a1eceb9d3d Fix build 2016-04-24 19:55:37 -04:00
auria.mg
8dfa5a3755 GPLose screen tweak 2016-04-24 19:37:27 -04:00
auria.mg
ab2f46cc90 Improve reverse track support 2016-04-24 19:36:52 -04:00
auria.mg
8c337110a2 Fix text 2016-04-23 09:00:40 -04:00
Benau
55278122fe Allow showing same difficulty of ghost replay only 2016-04-22 23:07:45 +08:00
Benau
f6ce065cee Allow a few replays coming with the game 2016-04-22 09:49:46 +08:00
auria.mg
c18343f60b Improvements to login screen : properly center buttons, and allow logging in by pressing enter 2016-04-12 19:27:11 -04:00
auria.mg
8c29fb01f6 Minor tweaks to split screen text to make it clearer 2016-04-07 20:53:48 -04:00
auria.mg
1ef082b2e6 Fix tabs accidentally committed previously 2016-04-04 19:46:41 -04:00
Benau
9fb7f5617b Merge remote-tracking branch 'origin/master' into transparent_kart 2016-04-04 09:02:45 +08:00
auria.mg
53b8b90ae6 Update servers list as they are found 2016-04-03 18:56:35 -04:00
auria.mg
b0af2b40b3 Multiplayer : don't lock tracks 2016-04-03 18:42:46 -04:00
Benau
508ddfcd45 Show translucent icon for ghost kart in race gui 2016-04-03 11:27:46 +08:00
auria.mg
894a38f6c7 Fix empty popup when no lan server detected 2016-03-31 20:40:42 -04:00
hiker
5c83249a30 Fixed crash in stand-alone server. 2016-03-29 11:09:07 +11:00
Benau
09bfdafd12 Use current font to getDimension for text 
Fix crashes
 2016-03-28 14:46:04 +08:00
Benau
dff5f8d459 Allow auto recreation of ghost replay file lists after recording. 2016-03-25 16:11:32 +08:00
Benau
11b119066c Add support for using ghost kart in challenge 
Real challenge file added later.
 2016-03-23 14:26:48 +08:00
Benau
8df9ff2cd8 Simplify ghost replay screen 2016-03-21 15:18:47 +08:00
hiker
ee4c4bd962 Try again to fix crash when exiting the server profile screen without networking. 2016-03-21 14:14:21 +11:00
hiker
ad545861ed Fix crash when exiting the server screen (network was still set to 
be enabled).
 2016-03-21 13:59:42 +11:00
hiker
fcc2b6493b Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-21 12:13:27 +11:00
hiker
e1ce01b5d2 Removed mostly unnecessary default constructor. 2016-03-21 12:12:01 +11:00
Benau
a62145ed6e Merge remote-tracking branch 'origin/master' into new_track_gui 2016-03-21 08:48:54 +08:00
hiker
ca0f66e4f8 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-21 11:03:48 +11:00
hiker
1f4776abb3 Allow server gui to start selection. 2016-03-21 09:58:21 +11:00
Marianne Gagnon
e28b48c61b Fix previous commit 2016-03-20 18:51:05 -04:00
Marianne Gagnon
cbf1e4b5d7 Remove unused files, fixes #2458 2016-03-20 18:40:43 -04:00
hiker
05483396c2 Also show name of selected karts on waiting screen. 2016-03-21 09:39:17 +11:00
Benau
fce3eec66f New GUI for track only screen, used in network and loaded from replay 2016-03-20 16:23:49 +08:00
Benau
b92210d4a0 No watching replay when split-screen 
And some bugs fixes
 2016-03-20 08:40:55 +08:00
Benau
da70d305a9 Allow watch replay only 2016-03-20 01:33:26 +08:00
Benau
07afd444a8 Allow racing against the replay on equal footing 
It make record while replay possible too.

We show the ghost only when start racing, fixing the overlapping issue.
 2016-03-19 14:57:22 +08:00
Benau
a42ee39240 Merge remote-tracking branch 'origin/master' into random_arena_item 2016-03-19 08:58:25 +08:00
hiker
10bb5caae3 Show lobby screen on interactive server in LAN mode. 2016-03-18 08:10:47 +11:00
hiker
4101d72d90 Avoid crashes when the server enters the lobby (somewhat temporary, 
the server needs a different kind of lobby anyway).
 2016-03-17 17:20:02 +11:00
hiker
b6bcf33ae0 Added end of race handling, so that clients and server shut 
down properly and go back to the lobby.
 2016-03-17 17:19:21 +11:00
Benau
5b7161710d Add GUI option in track info screen for random item location. 2016-03-17 12:16:19 +08:00
hiker
094a87eb94 Avoid NULL reference crash. 2016-03-17 10:00:03 +11:00
hiker
c6b22cdffb Fix crash when player is not logged in. See #2453 for more details. 2016-03-16 22:29:51 +11:00
hiker
7783de8770 Fixed line ending style. 2016-03-13 16:37:19 +11:00
hiker
e267aa9dff Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-13 16:31:36 +11:00
hiker
54463e9d66 Save server password so that authentication works. 2016-03-13 16:30:24 +11:00
Benau
8a9168a024 Remove the hard-coded localized name in language.cpp 2016-03-13 10:25:26 +08:00
hiker
96bf567c2e Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-11 16:46:20 +11:00
hiker
655987b992 Removed NetworkPlayerProfile field from STKPeer (since if splitscreen will 
be supported there will be no 1:1 relationship between peer and players
anymore). All voting related protocols were extended to include the
voting player's player id (sp in future split screen player can vote
individually - though atm they would all vote for the same thing).
 2016-03-11 16:42:35 +11:00
Marianne Gagnon
90f0c12393 More work on networking UI 2016-03-10 18:48:40 -05:00
Marianne Gagnon
35451515a2 Work on "Create server" screen to include more options 2016-03-09 19:47:45 -05:00
hiker
fc38acbea4 Fixed waiting screen. 2016-03-10 09:29:53 +11:00
hiker
67068db470 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-09 13:19:16 +11:00
hiker
f371a019c6 Fixed compiler warning. 2016-03-09 07:49:27 +11:00
Benau
88fb0a555e Use uniform spelling for SuperTux 2016-03-08 08:17:47 +08:00
hiker
1dc5c0b4af Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-07 12:14:05 +11:00
Benau
05081c3033 Fix keep translating online/login issue 2016-03-07 09:08:27 +08:00
hiker
7ff4cd8873 Merge branch 'refactor-network-string' 2016-03-07 12:04:17 +11:00
hiker
94dc236a75 Merge remote-tracking branch 'origin/master' into refactor-network-string 2016-03-07 12:03:09 +11:00
Marianne Gagnon
9500331716 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-03-06 20:01:48 -05:00
Marianne Gagnon
04999c35ee More work on networking UI 2016-03-06 20:01:40 -05:00
hiker
9c71dc78d1 Merge remote-tracking branch 'origin/master' into refactor-network-string 2016-03-06 16:42:16 +11:00
Benau
2d1d912ee8 Fix #1841 2016-03-05 16:01:42 +08:00
Benau
6fd6dd8792 Remove hack 2016-03-05 10:04:05 +08:00
Benau
70d5114dd7 Display localized name instead of English translation 2016-03-05 09:49:03 +08:00
Marianne Gagnon
14c8ecddb5 Add waiting screen for networking 2016-03-01 18:58:51 -05:00
Benau
96a10ce92c Update strings 2016-02-29 10:59:42 +08:00
hiker
ceb831d852 Removed STKHost::sendMessage function. 2016-02-28 16:26:48 +11:00
hiker
58505eeb88 Started to set token in the 'lower level' functions, removing the need 
to set the token in each protocol. Started to remove some of the
unnecessary send* functions.
 2016-02-28 15:54:43 +11:00
hiker
9a16595261 Renamed NewNetworkString to NetworkString. 2016-02-28 14:58:15 +11:00
hiker
98ba11d9ba Started to introduce new network string. It compiles, but certainly 
does not work yet.
 2016-02-23 16:29:57 +11:00
Benau
abdd32c070 Fix warning 2016-02-22 07:43:29 +08:00
Benau
8f1daabbe1 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-22 07:26:26 +08:00
Tobias Markus
d8cce95b0e Add forgotten override's where necessary 2016-02-21 01:36:15 +01:00
Benau
64522d9d13 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-17 14:03:58 +08:00
Marianne Gagnon
1e0586dc40 Add missing files forgotten in previous commit 2016-02-16 18:52:54 -05:00
Marianne Gagnon
9c49312714 Work on networking GUI, combine older server interfaces with the newer online/profile screens 2016-02-16 18:33:09 -05:00
Benau
71c1fadcd3 Merge remote-tracking branch 'origin/master' into fix_replay 2016-02-16 09:57:41 +08:00
Benau
c8ecb78ffa Remove useless header 2016-02-15 15:16:26 +08:00
Benau
a6412d7a07 Add ghost icon, use it in race setup screen 2016-02-15 09:28:36 +08:00
Benau
05093852bc Add sorting support in ghost replay selection screen 2016-02-15 01:12:13 +08:00
Benau
4ea6ea8ea6 Add confirm dialog when deleting replay file 2016-02-14 13:52:16 +08:00
Marianne Gagnon
52b3d533f5 Fix memory management issue 2016-02-13 21:18:03 -05:00
Benau
c46bccc6e3 Finished GUI 2016-02-13 11:55:42 +08:00
Benau
8a121ed32b Add Ghost replay GUI 2016-02-13 01:34:00 +08:00
Benau
3f89512b34 Remove most isGhostKart() hack when avoidable 2016-02-11 09:01:09 +08:00
hiker
7e6711e163 Renamged NetworkWorld to RaceEventManager (since this class is 
not a 'world' in the sense our game modes are).
 2016-02-11 09:03:51 +11:00
Benau
bb88a0f0ec Allow auto-save replay when specified in time trial mode. 
It will disable AI when recording, also it will only save if the
race is completed, ie no one gave up or all events fit in max frame recorded.
 2016-02-11 00:42:33 +08:00
hiker
99bc5477a2 Use a password to authenticate the client that is allowed to 
control a server (now the controlling client can reconnect in
case it gets disconnected, previously with only allowing the host
with id 1 to control, the server could not be controlled anymore).
 2016-02-10 18:03:42 +11:00
hiker
ee320588d5 Merge remote-tracking branch 'origin/master' into support_nw_splitscreen 2016-02-09 17:40:59 +11:00
hiker
354770f564 Added 0 number of laps to configuration to test ending a race. 2016-02-09 13:38:25 +11:00
Elderme
5b81d97482 Merge branch 'master' into renderer_refactoring 2016-02-07 13:56:25 +01:00
Benau
c3f589561c Initial work on supporting real race with ghost karts 
To test, you need to pass --ghost to supertuxkart with choosing a
track that has replay recorded, you can record one with artist
debug mode.

TODO: correct position handling
 2016-02-06 14:52:50 +08:00
Benau
87862c27ae Fix #2127 2016-01-31 10:16:12 +08:00
Elderme
1e7e126b55 merged with master 2016-01-30 15:00:22 +01:00
Benau
5c81a2a3e7 Seperate red and blue balls a bit in race gui 
This make score like 10:10 a bit clearer
 2016-01-25 12:51:43 +08:00
Benau
ea05f4b6ba Allow saving default time limit option too 2016-01-22 12:27:09 +08:00
Benau
99162e3d0f Fix wrong positioning of music description in soccer mode with time limit. 2016-01-22 12:01:01 +08:00
Benau
95f6f910b8 Allow saving selected team in single player soccer mode. 2016-01-22 11:32:06 +08:00
Benau
3a3963bf8d Make STK soccer mode more like real match 
1. Short win animation is shown in a kart if it scored correctly

2. Possible to identify own goal in result gui

Also player name is shown instead of kart name in result gui for all modes.
 2016-01-19 16:21:58 +08:00
Benau
b7df193ed4 Add Red/Blue icon in soccer setup screen 2016-01-19 08:49:23 +08:00
Marianne Gagnon
025c117d58 Tweak soccer setup screen to be clearer 2016-01-17 21:21:55 -05:00
Elderme
e9087a7dd6 Merged with master 2016-01-17 14:42:11 +01:00
Benau
ab61e55a6d Fix bugs in Race GUI 2016-01-17 12:11:09 +08:00
Benau
b410c8f67c Make soccer menu useful in single player 
Notice: As race_manager->setKartSoccerTeam(i, info.team) already
pre-set karts team, there is no need to test for
(getNumKartsInTeam(SOCCER_TEAM_RED) == 0 || getNumKartsInTeam(SOCCER_TEAM_BLUE) == 0),
so the the menu code is simplified.
 2016-01-16 16:11:33 +08:00
Benau
b45d926a00 Clean up and bug fixes 2016-01-16 09:14:19 +08:00
Benau
e296ebe4af Use white-black ball in minimap 2016-01-15 19:52:49 +08:00
Benau
d14a39e0f7 Initial work on soccer AI, plus lots of code re-factor/clean up. 
To test, you need to update stk-assets with the dummy soccer field.
In single player, you are limited to be in red team for now, so just
shoot the ball into the blue goal. Also max-goal is limited to 4.

Regarding AIs, the steering with ball logic is handled in
SoccerAI::correctBallPosition, max AI supported in single player
is limited to 5 by now.

The AI is not as good as Zidane or Ronaldo, but steering with ball
for human is not as easy as not normal driving anyway, so don't
laugh at the AIs. :)

TODO: Friendly-team firing, polish the soccer field.
 2016-01-15 18:25:52 +08:00
hiker
b7870b2377 Fixed crash (when going back from track screen to kart screen). 2016-01-15 16:25:02 +11:00
hiker
d3a7c75a62 Replaced many uses of getPlayer with Controller::canGetAchievements. 
Removed some unused variables.
 2016-01-15 08:02:36 +11:00
hiker
45399fc43f Removed unused data. 2016-01-14 08:30:02 +11:00
hiker
846fd3f059 Started to support split screen by fixing and improving the handling 
of local plauyer ids.
 2016-01-14 08:20:14 +11:00
hiker
e70017a1a6 Code simplification. 2016-01-14 08:05:40 +11:00
hiker
e7dd7f4d1a Replaced setLocalKartInfo with setPlayerKart. Updated some docs. 2016-01-12 13:00:45 +11:00
hiker
f0c5f43fe2 Removed setNumLocalPlayers (which is now part of setNumPlauers)< 
fixed coding style in race manager.
 2016-01-11 07:58:30 +11:00
hiker
e46c47d5c9 Removed m_local_player_karts data structure in RaceManager. 2016-01-08 17:03:50 +11:00
Elderme
c14ce23e66 Merged with master and solved conflict with the new graph structure 2016-01-07 14:56:09 +01:00
hiker
eb30294259 Disable access to network races. 2016-01-06 18:01:46 +11:00
hiker
b8ed2025ed Merge remote-tracking branch 'origin/master' into refactor_networking 2016-01-06 17:53:45 +11:00
hiker
c1560ddb02 Renamed getPlayerID() to getGlobalPlayerId(); started to refactor 
StartGameProtocol.
 2016-01-06 08:10:03 +11:00
Elderme
a257acfd4b Fixed memory leak and improved interfaces for rendering to texture 2016-01-04 21:36:00 +01:00
Benau
d4e312885a Make SFX depends on race result too 
Currently use gp_end for test
 2016-01-03 10:19:51 +08:00
Benau
2aaab61f93 Implement win or lose music for race result screen 
TODO: Proper music file
 2016-01-01 13:31:15 +08:00
Benau
94c5ba4193 Add more arena info in track screen 2015-12-24 07:53:49 +08:00
Benau
4e5197e7c1 Different max number of AIs per arena 
Now I make large arena like stadium to have max 8 player-slots,
should be very fun to play

Remember update stk-assets to test!
 2015-12-20 16:28:01 +08:00
hiker
68e37c902f Merge remote-tracking branch 'origin/master' into refactor_networking 2015-12-15 22:52:55 +11:00
Benau
12e4c76a6f Add minimap for battle mode when it has a navigation mesh 
TODO: update battle island arena to use only 4 vertices per poly
 2015-12-15 02:32:01 +08:00
Benau
7fccddb734 Show "Fribidized" user name and enable input for it 2015-12-14 02:56:42 +08:00
Benau
8f6a529531 Complete fix to arena selection menu (handle random arenas) 2015-12-10 15:49:47 +08:00
hiker
770d05f0de Fixed crash if more than one kart is connected to the server (since the 
network kart screen will only show local karts now).
 2015-12-10 17:37:28 +11:00
hiker
e0b3de17f6 Added new isLocalPlayerKart() function to controller, which is used 
to detect when sfx and graphical effects should be shown. The isPlayerKart
funtion is used to detect a (local or remote) player, e.g. for rubber-banding
the AI, or finding the Xth player kart.
 2015-12-10 17:35:31 +11:00
Benau
cebefcf374 Fix some gui interface bugs: 
1. Fix credits fading effect

2. Display have many no of (addons mostly) arenas are hidden due to
   missing of navigation mesh

3. Fix wrong size of kart stats bar
 2015-12-10 10:25:52 +08:00
Benau
11c4b41f13 More menu fix 2015-12-09 12:42:13 +08:00
Benau
aac5a368b8 Avoid invaild Ai karts number during switching game modes 2015-12-09 01:27:02 +08:00
Benau
2644b0458b Merge remote-tracking branch 'origin/master' into battleAI 2015-12-08 10:09:35 +08:00
auriamg
f0fafc2651 Merge pull request #2245 from Flakebi/kart-properties 
Kart properties
 2015-12-07 18:44:14 -05:00
Marianne Gagnon
2252495fdc Scripting refactor : add new property animator helper, transfer light animations to this new animator class. Can be used in the future to animate more properties 2015-12-05 19:42:06 -05:00
Benau
8a0cbea933 Merge remote-tracking branch 'origin/master' into battleAI 2015-12-05 16:27:06 +08:00
hiker
97756dd337 Only show kart selection widgets for local (and this means atm only 
one) player.
 2015-12-04 08:12:29 +11:00
Deve
9b3908cc62 Some lightning improvements: 
- move OpenGL-related code to graphics directory, as it should be
- solve issue with applying effect multiple times in multiplayer mode
- remove old already disabled opengl code
 2015-12-03 19:25:40 +01:00
hiker
9765c56a44 Enable voting for tracks. 2015-12-03 08:24:17 +11:00
hiker
ee7097af35 Added some default settings for race mode and send them to the server. 
Changed major and minor mode in protocols from 1-byte to int, since 1-byte
is too small to store the actual values.
 2015-12-03 07:53:56 +11:00
Benau
084a4ee844 Fix crashes when no navmesh 
User should have no way to start with ai in battle mode,
when the arena has no navmesh.

Unless artist debug mode or more than 1 human players.
 2015-12-02 10:08:03 +08:00
hiker
03d857db3e Removed unnecessary code. 2015-12-02 08:17:03 +11:00
hiker
6d272d8a5a Fixed crash when quicly exiting stk after refreshing the server list. 2015-12-01 23:25:04 +11:00
hiker
109288e0f5 Removed unused code. 2015-12-01 18:10:06 +11:00
hiker
76ddaeaef7 Force refresh of server list when exiting from the server info screen. 2015-12-01 17:47:03 +11:00
hiker
14390c2c5b Cosmetic changes. 2015-12-01 08:28:53 +11:00
hiker
bcfec98fa2 Removed all references to OnlineProfile, which makes LAN and WAN 
server behave idential (and it also fixed potential memory leaks).
 2015-12-01 07:57:42 +11:00
Flakebi
12a1227f20
Merge branch 'upstream/master' into kart-properties 2015-11-29 22:21:08 +01:00
Flakebi
aea68a2c14
Remove characteristics from kart 2015-11-29 04:08:12 +01:00
hiker
e2a6d1c33c Avoid crash (index could be -1). 2015-11-28 12:32:00 +11:00
hiker
8d843a7317 Show the connected players in the player list of the gui. 2015-11-27 23:05:05 +11:00
hiker
5c0f71ad07 Fixed names utf8ToWide and wideToUtf8; added convenience functions 
taking std:;string and core::stringw as parameter (removed .c_str()
in many function calls).
 2015-11-26 08:56:03 +11:00
hiker
f81bd5d0c5 Fixed names utf8ToWide and wideToUtf8; added convenience functions 
taking std:;string and core::stringw as parameter (removed .c_str()
in many function calls).
 2015-11-26 08:47:02 +11:00
hiker
2f126ab226 Moved NetworkPlayerProfile into its own file, added getter and 
setters for it.
 2015-11-26 07:41:37 +11:00
Marianne Gagnon
c806c1de49 Clear status text in register screen, fixes #2361 2015-11-23 19:04:24 -05:00
hiker
da2671c6ee An 'authorised' client can now tell the server to select karts. 2015-11-23 08:08:23 +11:00
Deve
8a0927f574 Fixed minor inconsistency in video settings dialog. 
Regression since 9b562d31f4
 2015-11-22 15:33:46 +01:00
Benau
aa9220772f Merge remote-tracking branch 'origin/master' into battleAI 2015-11-22 15:01:41 +08:00
Benau
e1f1461488 Fix some bugs and copyright year 2015-11-22 15:01:22 +08:00
Flakebi
ffa85d2206 Merge remote-tracking branch 'upstream/master' into kart-properties 2015-11-21 23:03:58 +01:00
Benau
62f5be0d9d First playable version of battle AI 
TODO:
backwards firing
better handling to obstacles
ai karts number selection
win/lose screen handling

Please use a better navmesh to test
 2015-11-21 15:58:03 +08:00
hiker
f05b6f6dd7 Improved handling of cancelling server creation. 2015-11-21 12:21:50 +11:00
hiker
980cdf835d Avoid crash when clicking on (empty) list while server list is being refreshed. 2015-11-16 18:44:14 +11:00
Benau
f4b723de82 Merge remote-tracking branch 'origin/battleAI' into battleAI 2015-11-15 12:29:01 +08:00
Benau
2b0e3b8828 Reverse type and state 2015-11-14 10:38:14 +08:00
Benau
962fe919d2 Color the text (mainly border including title and billboard) base on current skin 2015-11-14 01:06:28 +08:00
hiker
af9018ea64 Moved Server and ServersManager into network directory. 2015-11-12 17:52:04 +11:00
hiker
5fc830825f Refactoring: Created a separate NetworkConfiguration class which stores 
all information to create the STKHost.
 2015-11-12 09:53:12 +11:00
hiker
8953547305 Store TransportAddress of server in servers data structure. Avoid 
copying the currently connected server, instead avoid modifying the
server data structure while while a client is connected to a server.
 2015-11-10 08:31:07 +11:00
hiker
453ce8cf60 Added LAN server discovery. 2015-11-09 20:51:00 +11:00
hiker
60f550e9d1 Fixed coding style, removed unnecessary #include in hpp file. 2015-11-06 16:50:58 +11:00
hiker
541509f29a Added new requestPause and requestUnpause commands for protocols, 
minor code cleanups and improvements.
 2015-11-06 16:11:12 +11:00
hiker
847a788a9c Removed server creation request (which is now down automatically 
from STKHost).
 2015-11-05 23:34:27 +11:00
hiker
b7b37b9ec9 Updated documentation. 2015-11-05 07:59:28 +11:00
hiker
35793d99c8 Create an STKHost client instance if a connection to client is 
requested. The rest of the protocol is handled from STKHost.
 2015-11-05 07:57:49 +11:00
hiker
f2aa1ddea6 Code cleanup. 2015-11-05 07:55:59 +11:00
hiker
dc80fb1c11 Updated docs. 2015-11-02 16:24:05 +11:00
hiker
7c51be7724 Removed need for m_fake_refrehs, some coding style improvements. 2015-11-02 09:16:39 +11:00
hiker
0b62d2f82b Created two different constructors for STKHost - one for server, one for client. 2015-11-02 08:11:51 +11:00
hiker
6add49b065 Allow WAN server creation from GUI. 2015-11-01 23:42:24 +11:00
hiker
f05ee47e2b Moved lan/wan setting to static functions in STKHost. 2015-11-01 22:16:57 +11:00
hiker
4aea491ed0 Merge remote-tracking branch 'origin/master' into refactor_networking 2015-10-31 11:41:43 +11:00
auriamg
4762658a88 Merge pull request #2364 from Benau/freetype_cleanup 
Clean up freetype code
 2015-10-30 20:33:51 -04:00
Deve
8a288f05ff Implement lightning effect using shaders 2015-10-31 01:00:48 +01:00
Benau
b9b2b538fa Clean up freetype code 
1. Remove all ifdef of freetype

2. Require freetype in CMake

3. Clean up declaration

4. Add leak check

5. Make script language display better in title
 2015-10-30 18:08:02 +08:00
hiker
6297d8c65d Removed NetworkManager and ClientNetworkManager. 2015-10-27 08:23:59 +11:00
hiker
85cca69113 Moved GameSetup handling from NetworkManager to STKHost. 2015-10-25 00:19:30 +11:00
Deve
8bfe048f0f Remember race type in saved GP. 
Continue standard race as follow the leader and vice versa doesn't have a sense.
 2015-10-21 22:42:59 +02:00
hiker
10c612a0f6 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-10-20 22:44:26 +11:00
hiker
6fc4b9c19d Prevent crash in case of issues creating the server. 2015-10-20 09:37:51 +11:00
hiker
46b4d275a9 Minor refactoring and coding style fixes. 2015-10-20 09:34:14 +11:00
hiker
d5a9364ece Minor cosmetic changes. 2015-10-19 17:06:14 +11:00
Marianne Gagnon
1a58df0696 Fix issue in language selection screen (improper utf-8 decoding) 2015-10-18 19:53:20 -04:00
Marianne Gagnon
cee6d9d611 Merge branch 'master' into freetype_lazyloadchar 2015-10-17 21:34:19 -04:00
Benau
f557dce27e Fix some bugs in title font and clean up more code 2015-10-17 01:20:50 +08:00
Benau
a756f9f90e Better title font to all languages 
I tested all language, all of the them only needs 2 glyph page
to load their needed chars.
 2015-10-13 08:25:25 +08:00
hiker
45954e5881 Minor improvement. 2015-10-12 22:03:46 +11:00
hiker
c1d280eaa1 Cosmetic changes only. 2015-10-12 21:37:22 +11:00
hiker
4b0d4cb853 Fixed typo in comment. 2015-10-11 21:23:39 +11:00
hiker
525cf6df62 Fixed incorrect name of stkgui file. 2015-10-11 21:22:58 +11:00
hiker
f0c04a8bef Started to support LAN servers in the GUI (wip). 2015-10-10 12:13:32 +11:00
hiker
a66af6dc91 Cosmetic changes for coding style. 2015-10-09 16:47:18 +11:00
hiker
4d181d3358 Make icons visible if login status is changed. 2015-10-09 12:52:49 +11:00
hiker
92f18d03dc Removed unnecessary variable. 2015-10-09 09:43:50 +11:00
hiker
d687d17bfe Added (atm not working) LAN server menu entries. 2015-10-09 09:36:08 +11:00
hiker
917905c779 Removed unused functions. 2015-10-08 16:28:23 +11:00
hiker
00e7c35484 Match one more .stkgui and .cpp file name. 2015-10-07 16:37:42 +11:00
hiker
d391727879 Match more .stkgui and .cpp file names. 2015-10-07 16:33:01 +11:00
hiker
3aadc019a3 Made more .stkgui name correspond to the c++ file name. 2015-10-07 12:33:36 +11:00
hiker
14e84ed96b Minor style changes. 2015-10-07 08:22:02 +11:00
hiker
ccf8fd4e68 Renamed stkgui so that .cpp and .stkgui file names are identical. 2015-10-07 08:11:57 +11:00
Deve
6318e8c8f8 Fixed compiler warnings 2015-10-04 16:54:14 +02:00
Benau
3a5ec83ae9 Basic render of text using freetype 
This is a testing version of stk using freetype

It enable better arabic font display with less blurred glyph to all fonts thanks to hinting provide by freetype.

TODO: billboard text
 2015-10-04 11:59:44 +08:00
Flakebi
5e6e85ab79 Merge branch master into kart-properties 2015-10-03 15:20:06 +02:00
hiker
0e90042a0d Fixed incorrect handling of 0x1a character in credit files 
(which can happen in unicode, previously stk would stop
reading files after 0x1a).
 2015-09-28 09:12:45 +10:00
Deve
07b0ab0d78 Fixed disabling "remember window pos" button when fullscreen is enabled. 
Regression since commit 9b562d31f4
 2015-09-26 20:40:10 +02:00
MiroslavR
ccf9cee2ff Fix SuperTux difficulty button state not updating correctly 2015-09-18 20:48:18 +02:00
Marianne Gagnon
b3e2924df0 Fix opening wrong friend profile due to sorting, fixes #2313 2015-09-14 19:04:54 -04:00
Marianne Gagnon
b9183dde21 Bugfix : no music when losing GP, see #2296 2015-09-12 19:54:40 -04:00
Deve
4498870cb8 Merge pull request #2271 from konstin/network_cmake 
Allow enabeling Network Multiplayer through CMake flags
 2015-09-06 20:33:10 +02:00
Marianne Gagnon
5c342290b0 Fix corrupted text in GP editor 2015-09-01 19:39:21 -04:00
Marianne Gagnon
90b95c7fb5 Make sure there is music when winning a GP, fixes #2296 2015-08-31 19:33:05 -04:00
Marianne Gagnon
63ab79ff8d Fix string on GP result screen, fixes #2295 2015-08-25 21:28:09 -04:00
hiker
e6ad28cc81 Fixed #2097 (allow friends to be sorted). 2015-08-24 08:09:32 +10:00
hiker
309097b0db Fixed #2151 (by disabling 800x600 resolution, except in artist debug mode). 2015-08-20 11:03:46 +10:00
Flakebi
586724c855 Merge branch 'master' into kart-properties 
Conflicts:
	src/karts/kart.cpp
 2015-08-19 12:03:43 +02:00
Flakebi
80a649fc2d Merge branch 'master' into test 
Conflicts:
	src/utils/string_utils.hpp
	src/utils/translation.cpp
 2015-08-17 00:22:02 +02:00
Flakebi
b51eadae28 Merge branch 'master' into kart-properties 2015-08-16 16:45:47 +02:00
Torbjörn Söderstedt
bc4e532510 Use actual screen size when fading cutscenes. 2015-08-12 22:54:42 +02:00
Marianne Gagnon
70799539a6 Add graphical level preset between 4 and 5, the difference between the 2 was a little too steep 2015-08-10 19:04:35 -04:00
Marianne Gagnon
bc67f4f503 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-08-09 21:40:05 -04:00
Marianne Gagnon
d488c043d1 Continue work on scripting, fixing #2268. Use this as an opportunity to clean up a lot of old hardcoded overworld code, and replace it with cleaner scripting. Make sure to update SVN and the exporter (other commits in SVN coming soon) 2015-08-09 21:38:01 -04:00
Deve
fe1222c5cc Don't add tracks in reversed mode when it's not available. 
This fixes #2158.
 2015-08-09 20:52:12 +02:00
Deve
7ae541e638 Reload selected GP after changing the name. 
This fixes #2159
 2015-08-09 13:12:20 +02:00
konstin
c79c51e6c7 allow enabeling Network Multiplayer through CMake flags 2015-08-08 14:29:14 +02:00
hiker
2f902f769d Fixed minor memory leak. 2015-08-01 22:02:00 +10:00
Tobias Markus
a9761e30da Fix various issues reported by coverity 2015-07-30 18:46:01 +02:00
Marianne Gagnon
738e7bc780 Fix inverted if condition in input options screen, fixes #2255 2015-07-29 18:55:40 -04:00
hiker
b18d0275fd Display a finish (survival) time in FTL result screen. 2015-07-29 17:27:43 +10:00
Flakebi
5d36b95c95 Merge remote-tracking branch 'upstream/master' into kart-properties 
Conflicts:
	data/stk_config.xml
	sources.cmake
	src/karts/kart.cpp
	src/karts/kart.hpp
	src/karts/kart_properties.cpp
	src/karts/kart_properties.hpp
	src/tracks/track.cpp
 2015-07-29 02:48:43 +02:00
hiker
d27ba5f6fe Fix #2249 (show points and points increasing in a FTL GP). 2015-07-29 08:58:42 +10:00
hiker
6ada5a0666 Revert "Properly ignore the leader in the ftl scoreboard" 
(this patch only fixed the problem that happens when a non-leader
is number one. By now the code has fixed that it is guaranteed
that the leader is always number one, so this patch is not
necessary anymore, and it complicates the loop).

This reverts commit e9d78326fb.

Conflicts:

	src/states_screens/race_result_gui.cpp
 2015-07-29 08:12:23 +10:00
hiker
5efb44a430 Fixed scores in FTL GPs. All score handling is now done by the World, 
not race manager (which removes if tests).
 2015-07-28 09:39:00 +10:00
hiker
5c66273712 Fixed compiler warning. 2015-07-27 16:41:46 +10:00
hiker
d9e806f610 Changed unsigned int to int (dest_pos can become negative, and 
while de-facto it still works with unsigned, it's just bad style :) ).
 2015-07-26 00:32:11 +10:00
hiker
a9aa37ea97 Minor code style fixes. 2015-07-26 00:31:15 +10:00
hiker
c8909b9197 Fixed missing display of points for non-winners in a FTL GP (partly fix 
for #2249).
 2015-07-26 00:30:09 +10:00
hiker
cd256061e1 Fix #2248 (crash when taking screenshot). The assert was not appropriate 
(avoiding the call to clearAllMessages would have been quite ugly).
 2015-07-26 00:26:43 +10:00
hiker
76a779fc1c Merge branch 'ftl-scoreboard' of https://github.com/Flakebi/stk-code into Flakebi-ftl-scoreboard 2015-07-25 12:17:02 +10:00
hiker
8bc398a1c1 Merge remote-tracking branch 'origin/master' into Flakebi-fixes 2015-07-24 10:23:47 +10:00
Marianne Gagnon
aacf1293da Eliminated karts in GPs get 0 points. Fixes #2177 2015-07-23 20:01:54 -04:00
Flakebi
2eb0f151b7 Fix reversed rtl string part 2015-07-21 11:52:23 +02:00
Flakebi
1317714ba1 Adjust the speed and power values 2015-07-12 01:09:01 +02:00
Flakebi
5bfb1a2c6b Fix some bugs 2015-07-12 00:39:38 +02:00
Flakebi
9fc6f84545 Switch from properties to characteristics 2015-07-11 19:22:27 +02:00
Flakebi
fbf26df23d Merge branch 'master' into fixes 
Conflicts:
	src/graphics/2dutils.cpp
	src/graphics/graphics_restrictions.cpp
	src/graphics/render_skybox.cpp
	src/graphics/rtts.hpp
 2015-07-03 15:29:53 +02:00
hiker
9b562d31f4 Replaced Widget's set(De)Activated functions with one setActive(bool) 
function, which simplifies code for various screen a lot.
 2015-07-03 16:19:28 +10:00
Marianne Gagnon
be81a7fd11 Increase size of popup, text was truncated at least in french 2015-06-23 18:46:36 -04:00
Marianne Gagnon
0fdc7a2d98 Use plural form for resolution change message, fixes #2219. ALso fix crash in tinygettext code handling plural forms 2015-06-22 19:26:20 -04:00
Marianne Gagnon
e35d5a07b4 Little hack : make the kart selection screen seem faster by moving the cursor immediately, and loading the kart model only on next frame. See #2216 2015-06-11 20:22:30 -04:00
hiker
d4f3fc88d6 Merged pull requests #2191. 2015-06-02 14:50:32 +10:00
hiker
8fd0b9186a Merge pull request #2198 from nado/Fix-#2164 
Fix #2164 : Resized max length of mail address up to 254 chars
 2015-06-02 13:47:54 +10:00
Marianne Gagnon
722cd0e181 Merge branch 'Scripting' 2015-05-21 19:29:01 -04:00
Nado
2b36759ba3 Resized max length of mail address up to 254 chars 2015-05-18 09:33:21 +02:00
Marianne Gagnon
080936f144 Work on scripting 2015-05-17 19:27:25 -04:00
hiker
c91f9655d8 Unlock all karts in multiplayer mode. 2015-04-29 08:18:52 +10:00
hiker
75b24c96ad Unlock all tracks and GPs in split screen mode. 2015-04-29 08:07:06 +10:00
Flakebi
af88b4a16f Fix translation issues with grand-prixs 2015-04-26 23:31:57 +02:00
Flakebi
56aecdb692 Fix achievements RTL display 2015-04-25 16:10:54 +02:00
Flakebi
4b55526525 Clean more stuff for the new insertValues 2015-04-24 01:58:19 +02:00
hiker
00782180f7 Fixed crash when using translation debugging (only happens if 
DEBUG_TRANSLATIONS is defined).
 2015-04-16 15:28:49 +10:00
Flakebi
effe131e4a Dynamically test if text is rtl or not 2015-04-09 01:57:33 +02:00
hiker
c7e785b59c Fixed translator credits display (translators were repeated before). 
Added #undef'ed debug mode to only see translations.
 2015-03-31 16:16:30 +11:00
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
hiker
bcd9654a86 Added missing GPL license. 2015-03-30 11:42:28 +11:00
Flakebi
114644233a Improve RTL display of track names in story mode 2015-03-30 01:23:01 +02:00
Flakebi
06c8089dfc Fribidize more strings 2015-03-30 01:22:57 +02:00
Flakebi
e9d78326fb Properly ignore the leader in the ftl scoreboard 2015-03-29 04:16:24 +02:00
hiker
02d5b43d86 Replaced all texture->getOriginalSize() with texture->getSize() 
to take potentially resized textures properly into account.
 2015-03-26 17:12:51 +11:00
Marianne Gagnon
262eeca87f Update configuration of HD textures in GUI, especially through presets 2015-03-25 20:53:05 -04:00
Marianne Gagnon
5e34ac3a44 Fix bug #2037 (objects in library objects with curve animations not working) 2015-03-18 21:48:22 -04:00
ZyperPL
d9405aab3a Fixed highscores update 2015-03-14 16:16:41 +01:00
hiker
41a67d4250 Added privacy notice to 'enable internet' dialog; used redirecting 
URLs for privacy and terms&conditions.
 2015-03-12 10:33:42 +11:00
Marianne Gagnon
9d5c735ccb Merge branch 'tooltip' 2015-03-10 19:48:21 -04:00
Flakebi
e5abf4cec3 Merge branch 'origin/master' into fixes 2015-03-08 01:16:51 +01:00
Marianne Gagnon
c8ae3d117a Merge branch '1954-fix' 2015-03-03 18:58:26 -05:00
hiker
04ebd528bf Revert "Check the translation of the terms to make sure that they include" 
This reverts commit 53a830be0b.
 2015-03-02 18:26:21 +11:00
Marianne Gagnon
d5736f3a5e Fix #1954, part 1 2015-03-01 22:04:20 -05:00
hiker
53a830be0b Check the translation of the terms to make sure that they include 
our official url. If it is not contained, use the original English
terms.
 2015-03-02 08:45:56 +11:00
Flakebi
f9919c462f Improve tooltip text and center tooltips 2015-03-01 22:30:33 +01:00
hiker
a5d800d8d6 Made terms&conditions translatable (but hard-coded the URL). 2015-03-02 07:55:39 +11:00
hiker
cab6149193 Cosmetic change for coding style (removed 2 unnecessary constructors). 2015-03-01 22:46:03 +11:00
Marianne Gagnon
c205aa533b Add outline on font for instructions in the overworld, fixing cases where the text is hard to read 2015-02-28 20:41:12 -05:00
hiker
f542aea53d Fixed line endings style. 2015-02-27 22:33:03 +11:00
hiker
832aefeceb Bugfix: A user that was not online previously could not enter an online 
username if a user with an online user name was shown before.
 2015-02-26 16:29:10 +11:00
Flakebi
6805ead6e6 Add tooltip to explain usage of per-player handicaps 2015-02-24 23:24:28 +01:00
Marianne Gagnon
e3c408fc0e Implement interface to allow disabling IBL 2015-02-22 18:25:59 -05:00
Marianne Gagnon
975aa7628b Fix #1981 2015-02-14 18:36:03 -05:00
Flakebi
92f78aae29 Improve sorting resolutions 2015-02-13 11:47:10 +01:00
Flakebi
6e8f8a15bd Sort resolutions by size 2015-02-13 11:47:10 +01:00
hiker
cdb35b0804 Added missing initialisation, fixed line endings. 2015-02-13 08:42:09 +11:00
hiker
f437781dcc Fix #1980. 2015-02-13 08:41:19 +11:00
hiker
72ce6c8bf6 Fixed race over music not playing when sfx are disabled. 2015-02-12 07:57:51 +11:00
hiker
7d0875878b Simplified startMusic call. 2015-02-10 17:27:07 +11:00
hiker
325d1a11c1 Merge branch 'rename-h' of https://github.com/Flakebi/stk-code into Flakebi-rename-h 2015-02-10 11:34:21 +11:00
hiker
70ed2b47d0 Fix #1962. 2015-02-09 08:22:35 +11:00
Marianne Gagnon
758eb6e003 Use label with word_wrap instead of list for terms. See #1812 2015-02-06 20:11:15 -05:00
Flakebi
d56472c224 Rename some .h files to .hpp 2015-02-05 21:32:17 +01:00
Flakebi
366f8a26bb Fix more clang warnings 2015-02-05 02:44:06 +01:00
auriamg
f4909d7c46 Merge pull request #1957 from Flakebi/highscore 
Improve the layout of the race result screen
 2015-02-04 18:50:54 -05:00
Flakebi
32a044e292 Fix some clang warnings and bugs 2015-02-04 18:30:27 +01:00
Flakebi
1aa6f7c173 Improve the layout of the race result screen 2015-02-04 14:42:10 +01:00
hiker
b9a7c11dab Removed unnecessary #includes. 2015-02-03 14:30:18 +11:00
Flakebi
d6fee72295 Merge branch 'origin/master' into fixes 
Conflicts:
	src/graphics/graphics_restrictions.cpp
 2015-01-23 00:15:40 +01:00
hiker
e17add7bc8 Allow users to enable high res textures, even if their default 
value stats that they should be disabled.
 2015-01-22 11:38:15 +11:00
hiker
b6c26651e0 Pre-fill online username with local username. 2015-01-21 08:14:56 +11:00
hiker
f923a317a8 Select offline tab when internet access is disabled. 2015-01-20 16:39:06 +11:00
Flakebi
9c6dd1c1b5 Fix some compiler warnings 2015-01-18 23:28:53 +01:00
hiker
a74a20c699 Enable all message dialogs to work in the DialogQueue. 2015-01-18 12:40:06 +11:00
Marianne Gagnon
a2c8e1d982 Prevent crashes due to invalid values in shadow resolution 2015-01-12 19:05:54 -05:00
hiker
ba484d8be2 Fixed incorrect default selection in tabbed screen. 2015-01-13 08:12:43 +11:00
hiker
d70a398cc8 Merge branch 'Flakebi-fixes' 2015-01-13 08:06:39 +11:00
hiker
47026e614c Merge branch 'fixes' of https://github.com/Flakebi/stk-code into Flakebi-fixes 2015-01-12 22:29:08 +11:00
hiker
d47981dd43 Auto-login a new user from the register screen, without requiering 
to select the user or enter the password again.
 2015-01-12 22:27:45 +11:00
hiker
370091e1b9 Removed debug code. 2015-01-12 16:36:42 +11:00
hiker
342cb82653 Merge branch 'new_register_screen' 2015-01-12 12:19:56 +11:00
hiker
a2006c3e16 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-12 12:10:23 +11:00
hiker
7bd1126df8 Improve flow from register screen back to user screen. Now password 
and online user name do not need to be added again.
 2015-01-12 09:41:34 +11:00
Vincent Lejeune
019ec344fe Allow to reduce shadow resolution 2015-01-11 00:45:38 +01:00
Flakebi
3128e59d22 Update checkboxes and textfield in the tabbed user screen too 2015-01-09 21:37:02 +01:00