Commit Graph

3306 Commits

Author SHA1 Message Date
Deve
a39c934d2b Fade background when general text field dialog is opened.
Fixes #3240
2018-06-06 22:11:10 +02:00
Benau
5e3a482588 Let player connecting in the middle of count down know 2018-06-07 01:34:25 +08:00
Deve
5e798ad6d4 Restore max texture size when reloading skin.
Fixes #3111
2018-06-05 23:55:31 +02:00
Benau
5da5a1972f Add auto start with timeout and player threshold for owner less server 2018-06-06 01:06:44 +08:00
Benau
2f00196420 Clarify voting phase 2018-06-04 14:23:29 +08:00
Benau
aa1bb720e3 No joinning of password-proected server if no password is given 2018-06-04 09:41:50 +08:00
Benau
2fbf0ab49f Avoid unnecessary slow down and mutex locking in server lobby 2018-06-04 09:28:38 +08:00
Benau
2fe50ba0c4 Make connect to server message stay longer if needed in lobby 2018-06-03 15:24:36 +08:00
Benau
490b865ddd Allow using %f with translated message 2018-06-03 15:15:25 +08:00
Benau
e122d045cc Allow showing player ranking in network user dialog 2018-06-03 15:08:52 +08:00
Benau
b43a5e4d18 Add AES encryption and validation for wan player 2018-06-02 12:28:29 +08:00
Deve
04170f5855 Avoid a crash on exit.
Still NetworkingLobby::unloaded() probably shouldn't be executed if networking screen is never opened, but initialize variables doesn't hurt anyway
2018-05-21 21:51:04 +02:00
Deve
5d840f6bf7 Move android stkgui files to its own directory 2018-05-21 21:30:24 +02:00
Benau
1a975f9ef4 Offer a way to know accurate ping to server within 3 seconds 2018-05-22 01:31:08 +08:00
Benau
34b8a07d80 Add proper line breaking 2018-05-21 11:19:18 +08:00
Benau
fdc299e073 Add player rankings in achievements 2018-05-20 01:15:39 +08:00
Benau
d2bf17e71a Show owner name as Official if official server hoster account is used 2018-05-16 16:07:08 +08:00
Alayan-stk-2
f5245a679e Fix #3236 (#3253)
* Don't generate IRC alerts

* Fix #3236

* Update .appveyor.yml
2018-05-15 19:16:56 -04:00
Alayan-stk-2
7f84dd39a6 Numerous improvements related to ghost replays (#3244)
* Update GUI files for replay improvements

* Updated replay capabilities

* Improve timer formatting possibilities

Mainly, the ability to choose to display or not minutes, and to choose how many digits are shown after seconds (from 0 : second as smallest timestep - to 3 : ms as smallest timestep)

Also displays "mm:ss.ms" rather than "mm:ss:ms".

* Some new list widget possibilities

Like the ability to update the header while the list is displayed (useful to add or remove columns)

* Update ghost kart for the new replay data

* Also update the ghost controller

* Live differences with ghost replays in linear worlds

* Replay-related UI changes

Big changes to the replay selection screen, and small change to the race UI (add the live timer in ghost races) and the race result UI (add the option to directly race against a newly saved ghost).

* Improves the replay action modal dialog

* Fix time-to-ticks regression

* Several requested improvements

* Improved ghost icon

Also updates the license

* GUI changes and improvements to accomodate multi-mode support

* Additional recorded data

* More functions to get the current race state

* Update replay variables to match what is used

* Updated replay-related config values

* Add ghost kart support to easter egg hunt mode

* Transparent attachments for ghost karts

* Use new stored data (color, item type)

Also :
- Interpolate speed for smoother display in watch-only mode
- Coding style improvements

* Fix coding style issues and add UI support for modes

* Fix coding style issues & support for easter egg mode

* Remove leftover prints

* Use getDifficultyName to remove hardcoded values

* Fix attach_ticks and coding style fixes

* Make the position of the timers fully relative

Otherwise, they would tend to touch each other in some resolutions

Also add a comment about the 59.9995f

* Make the list filling code clearer

Also use getDifficultyName

Most of the line changes shown by git correspond to moving around some bits or adjusting indentation.

* Remove a TODO as requested

* Fix dialog being dismissed too soon

* Remove a fixme

* Small clean up

* Fix logging

* Partial #3249 fix
2018-05-13 20:51:52 -04:00
Deve
0b79d9c1d1 Remove a line that is not needed anymore.
Now spinner widget is drawn correctly and min value >= 1 restriction exists in xml file anyway. In this way it shows correct value when particles effects are manually set to 0 in config.xml.
2018-05-13 22:03:15 +02:00
Benau
52e2a64893 Add ring for local player controller in minimap 2018-05-11 13:26:30 +08:00
hiker
85eb59c6af
Merge pull request #3232 from STK-helper/MiniMap
Increase minimap size and reduce its aliasing
2018-05-09 15:39:19 +10:00
Alayan-stk-2
473732b952
Add comment to clarify a if/else 2018-05-07 02:34:52 +02:00
Alayan-stk-2
7ee3d6576e
Use the new config options for display 2018-05-05 22:18:02 +02:00
Alayan-stk-2
bc569b9e04
Display the minimap during the start countdown
So the players (especially those not familiar with the tracks) can take a look at it before starting to race.
2018-05-05 21:09:33 +02:00
auria.mg
c6c005ded4 Revert "jgh"
This reverts commit e1a1196a9f.
2018-05-02 19:35:41 -04:00
auria.mg
e1a1196a9f jgh 2018-05-02 19:35:04 -04:00
Alayan-stk-2
74a77ed5ef
Cast width and height as floats before checking the ratio 2018-05-02 20:33:08 +02:00
Alayan-stk-2
d6c2cccccd
Reduce minimap size in splitscreen multiplayer
It won't work very well with 8 players, but still slightly better than when it was always 100.
2018-05-02 20:07:10 +02:00
Alayan-stk-2
bed03b2a43
Make minimap size 1.8 higher
This factor has been chosen because :
1) It allows the toplist to be able to still display 10 karts (maximum number reached in story mode or in networking (currently 12 but will be 8-10 for release according to Benau))
2) This size should fit nicely in the android GUI.

Otherwise, there is still some margin before it hinders view in 4:3 resolutions.
2018-05-02 19:40:00 +02:00
Benau
a5b234ceef Reset player action in pause menu for network, fix #3230 2018-05-02 15:37:47 +08:00
Benau
ac54ee8888 Remove max 80 words limit now we use uint16_t for wide char 2018-05-01 12:42:59 +08:00
Benau
d17fddcac8 Fix handicap in splitscreen and network 2018-05-01 01:10:12 +08:00
Alayan-stk-2
6a25384ed9 SuperTux in Story Mode (and other improvements) (#3207)
* Add SuperTux difficulty & update number of karts

Also make the expert challenge slightly easier to match more the difficulty of other challenges.

* Add SuperTux difficulty & update number of karts & points required

Also give some more time margin in easier difficulties, as it is a hard challenge compared to most.

* Add SuperTux difficulty & update number of karts & points required

Also change the lap count to 4 as it is a very short track (sub 30s)

* Add SuperTux difficulty

Also tweak the expert challenge to have a more appropriate difficulty

* Add SuperTux difficulty & update number of karts

* Add SuperTux difficulty & update number of karts & points required

* Add SuperTux difficulty & update number of karts & points required

Also correct the requirement position, since this is not a FTL race anymore.

* Add SuperTux difficulty & update number of karts & points required

Also slight balancing improvements for the usual difficulties.

* Add SuperTux difficulty & update number of karts & points required

Also adds a position requirement in expert

* Add SuperTux difficulty & update number of karts & points required

* Add SuperTux difficulty & update number of karts & points required

* Add SuperTux difficulty & update number of karts & points required

Also change the number of laps to 5, as this is a very short track. The time requirements for easier difficulties have been kept proportionally similar to before.

* Add SuperTux difficulty & update number of karts & points required

Also change the number of laps to 4.

* Add SuperTux difficulty & update number of karts & points required

Also add a position requirement to expert and intermediate.

* Add SuperTux difficulty & update number of karts & points required

Also change the number of laps to 4, as a lap often is 30s or less in expert/supertux

* Add SuperTux difficulty & update number of karts & points required

* Add SuperTux difficulty & update number of karts & points required

* Rename islandtrack.challenge to gran_paradiso.challenge

* Rename challenge file

* Add SuperTux difficulty & update number of karts & points required

Also makes the time limit in expert less easy and tweak position requirement.

* Add SuperTux difficulty & update number of karts

* Add SuperTux difficulty & update number of karts & points required

* Add SuperTux difficulty & update number of karts & points required

* Add SuperTux difficulty & update number of karts & points required

* Add SuperTux difficulty & update number of karts & points required 

Doesn't unlock the SuperTux difficulty anymore - it's managed elsewhere.

* Add SuperTux difficulty & update number of karts & points required

* Add SuperTux difficulty & update number of karts & points required

* Add new unlock challenges, for difficulty and karts

* Add a lap to oliver's math class

* Replace Northern Resort by Volcano Island

* Replace Volcano Island by Candela City

Candela City was in no (official) GP before this.

Also sets Green Valley to 3 laps.

* Add Northern Resort and remove Fort Magma

In 0.9.3, this GP has only 4 races in Story Mode (5 for the other GPs) because Fort Magma is locked.

Of all the tracks outside this GP before, Northern Resort is one of the hardest, the AI being rather good there.

* Temporary cup for SuperTux challenges

Recolored version of the gold cup

* Update challenge selection UI for the SuperTux challenges

* GUI used before SuperTux difficulty unlocking

This is the old select_challenge.stkgui

* Swap the two sara

* Replace Kiki by another kart to unlock on Benau's demand

* Update for improved Story Mode

* Update for improved Story Mode

* Add support for SuperTux challenges

* Add support for SuperTux challenges

* Add support for SuperTux challenges

* Add support for SuperTux challenges

* Update for SuperTux ; also adds the ability to unlock a challenge by points

* Update for unlocking by points

* Add support for SuperTux challenges

* Add support for SuperTux challenges

* Add support for SuperTux challenges

* Minor changes to function calls

* Update for SuperTux challenges

* Add support for SuperTux challenges

* Update for Story Mode GP changes

* Allows to display the correct number of points for GP challenges

* Set the unlock of the 1st bonus kart to correct non-test value

* Add support for SuperTux challenges

Including a bigger challenge selection diaolg

* Add default value

* Icon to indicate that there is an unlockable

The number of points needed to unlock it are displayed next to it.

* Changed format : the point requirements is now specified in the file

* Changed format : the point requirements is now specified in the file

* Changed format : the point requirements is now specified in the file

* Function for unlock by points UI

* Add default for unlock list node and use requirements node for all

* Make unlockByPoints simpler and more flexible

Now the code will iterate in StoryModeStatus and send the unlock_list challenges for treatment here. The question of getting the right challenge statuses beings solved, it allows for a great simplification and much more flexibility

* Update unlockByPoints declaration

* Adds support for next unlockable UI

* Improve call of unlockByPoints

Also calculations for displaying in the UI how many point the next unlockable by points requires.

* Add icon for next unlockable

* Displays icon/number to make the player aware of the next unlockable

Also displays the number below the icon rather than on the side, for more clarity.

* Changes to display karts in the unlock scene

* Update unlock functions declarations

* New function to clarify code and more logical recently unlocked list management

In the previous version, everything was added to the recently unlocked list at some point, necessitating a clearing at the end of computeActive, which also removed from the list the non-race challenges. Checking if the feature is newly unlocked to add it to the list remove the need of that clearing.

* Declaration for unlockFeatureByList

* Display newly unlocked karts

* Display newly unlocked karts

* Clear the list of recently unlocked features at the end

* Update testing code

* Update unlocks finding function call

* Improve UI scaling

* Fixes indentation

* Update the number of points before checking for unlock by points

* Add const to declarations

* Remove const_cast

* Remove a const_cast

There are other const_cast in the menu debug items (but they are unrelated to this PR)

* Fix menu being bolder
2018-04-29 18:27:03 -04:00
deve
a2659f479c Merge branch 'master' of https://github.com/supertuxkart/stk-code 2018-04-27 06:52:58 +02:00
deve
b90a9fbf0d Don't allow totally disable particles in GUI.
Now we don't use tfb shader to compute particles, so it seems to not have a sense anymore.
And it's still possible to set particles_effects=0 in config.xml if someone will need it.
2018-04-27 06:50:39 +02:00
deve
bf1392cadc Keep important particles enabled on lowest settings 2018-04-27 06:44:56 +02:00
Deve
b770fa19fb Auto refresh for lan server detection 2018-04-25 20:26:23 +02:00
hiker
59b796a7f5 Since broadcasting to 255.255.255.255 does not work in all cases,
add code to create a set of potential broadcast addresses and
use them all. Duplicated will be filtered out (since likely a server
will replace more than all).
2018-04-23 23:30:48 +10:00
Benau
7ddd498156 Add a separator as auria suggested when reentering the lobby 2018-04-22 14:32:41 +08:00
auria.mg
ad7555d8ea Fix race GUI glitch kart icons to line horizontally at the start of a race 2018-04-21 21:04:21 -04:00
Benau
448ad5abcf Clean up network local player handling 2018-04-21 16:32:43 +08:00
Benau
ba681a7cf8 Initial GP in network 2018-04-21 16:00:14 +08:00
Benau
32c1255c10 Make sure no dialog exists when going back to lobby 2018-04-20 14:18:05 +08:00
Benau
0c33803159 Let the network game keep going even race paused dialog shown 2018-04-20 13:30:17 +08:00
Benau
e5c991e3d2 Merge remote-tracking branch 'origin/master' into kobato 2018-04-20 13:03:34 +08:00
Benau
99a25bb837 Implement a proper end and restart race in network 2018-04-20 12:19:58 +08:00
Benau
9a32bdcbe1 Fix #1636 2018-04-20 12:19:58 +08:00
Benau
0ecc6e34b9 Add deve request for auto-server port detection 2018-04-20 12:19:58 +08:00
Deve
a7deff5c3e Avoid a crash in general text field dialog.
onEnterPressed can be executed twice - in event handler and in input manager.
2018-04-20 12:19:58 +08:00
Benau
789d75bf26 Remember last sucessfully connected server address 2018-04-20 12:19:58 +08:00
Benau
d6af63da67 Fix possible android crash 2018-04-20 12:19:58 +08:00
Benau
2c6883842e Add connect-now equivalent to online screen
Specify port to allow to connect to one of multiple servers in same machine
2018-04-20 12:19:58 +08:00
Benau
88728b074c Fix lobby crash in graphics server 2018-04-20 12:19:58 +08:00
hiker
da039bf6a9 Renamed member variable and method to better describe them. 2018-04-20 12:19:57 +08:00
hiker
98555a8f35 Merge remote-tracking branch 'origin/master' into game_protocol 2018-04-19 10:57:37 +10:00
hiker
acdba401a9
Merge pull request #3090 from qwertychouskie/simplify-version-number-change
Reduce number of places version number needs to be changed on release
2018-04-18 09:44:13 +10:00
Alayan-stk-2
c72cf74138 Fixes server_only build issue (#3199) 2018-04-16 20:16:51 -04:00
auria.mg
54d3476c13 Merge branch 'FixGaugeI' 2018-04-16 18:29:00 -04:00
Alayan-stk-2
ba2df185e2
Fixes speedometer saturation 2018-04-16 14:34:02 +02:00
Alayan-stk-2
15ff516b53
New helper function for drawing meters 2018-04-16 14:28:15 +02:00
Alayan-stk-2
746d862e84
Various improvements
1)Use a new helper function for the drawing as the code was nearly identical at three different places
2)Fixes the coloring of transparent points : full color as intended, rather than black
3)Additional drawing points to properly manage the gauge_goal going outside of the gauge_full space
2018-04-16 14:27:27 +02:00
Alayan-stk-2
8bd6cafddf
Attempt to fix #3195 2018-04-16 12:46:23 +02:00
Deve
868dbf792c Avoid a crash in general text field dialog.
onEnterPressed can be executed twice - in event handler and in input manager.
2018-04-15 21:14:43 +02:00
Alayan-stk-2
f16ed91bd5 Go back to the overworld in losing challenges (#3192) 2018-04-14 20:38:23 -04:00
Alayan-stk-2
79fd0f12a5
Fixes a too small index 2018-04-13 23:32:37 +02:00
Deve
c8c390cdaa Tweak nitro meter in android race gui 2018-04-11 21:09:40 +02:00
Alayan-stk-2
8f4744b061 Improved speedometer and nitrometer (#3177)
* New speedometer and nitrometer gui

* Update Speedometer and Nitrometer

* Improve nitro background

* Improve nitro bar drawing

* Improved meters

* Improve meter and rank drawing

* Agressive smoothing and higher visibility

* Helper function for meter drawing

* Helper function for meter drawing

* Improved meters

* New nitro bar, slight 3D effects and hopefully fix compilation

* Update license
2018-04-10 21:14:50 -04:00
Deve
1ee5f3aa8a Keep acceleration sensitivity for up/down button when accelerometer is enabled 2018-04-10 21:09:05 +02:00
Deve
4ef196d086 Fixed minor bug in touch settings dialog 2018-04-10 00:25:38 +02:00
Deve
3f69fd37ed Some improvements for touch device 2018-04-10 00:22:09 +02:00
auria.mg
61469a6806 Mitigate AI-related edge cases of original fx 2018-04-08 20:47:24 -04:00
Benau
1b6e8f11b8 Make sure lobby display the quick play server name 2018-04-01 11:08:02 +08:00
Benau
47c679e398 Disable wan buttons in init in case of connect-now going back 2018-04-01 10:24:10 +08:00
Benau
6b5a01755c Clean added player if going to login screen 2018-04-01 09:56:03 +08:00
Benau
852c78729f Adjust connect-now for new lobby 2018-03-31 16:14:22 +08:00
Benau
7f17d7ab25 Rebuild the network screen stacks up to wan / lan screen 2018-03-31 15:23:20 +08:00
Benau
1a6c219d3f Fix voting timeout in case of time zone difference
Also allow voting when pressing the spinner or reverse checkbox
2018-03-31 14:35:55 +08:00
Benau
47a86cc36f Add initial support for GP and soccer info in lobby 2018-03-31 01:19:23 +08:00
Benau
6c56939f49 Allow to reuse same stkgui for different screen instance 2018-03-31 00:11:39 +08:00
hiker
1b72d88593 Merge remote-tracking branch 'origin/kobato' into game_protocol 2018-03-31 01:12:22 +11:00
hiker
b1013f6030 Merge remote-tracking branch 'origin/network_improvements' into game_protocol 2018-03-31 00:38:57 +11:00
hiker
a3f68f621f Renamed member variable and method to better describe them. 2018-03-30 23:22:00 +11:00
hiker
17200d7809 Merge remote-tracking branch 'origin/master' into game_protocol 2018-03-30 22:47:30 +11:00
Benau
01c1287900 Always remove kart selection screen to avoid setRootID -1 assertion 2018-03-27 16:19:30 +08:00
Benau
c6fa384d94 Fix uninitialized values and broken local kart selection if reenter 2018-03-27 15:44:19 +08:00
Benau
b75428e4e5 Use distance with km 2018-03-27 11:56:36 +08:00
Benau
70def13ca2 Use a more sophiscated server-client token validation 2018-03-27 01:02:31 +08:00
Benau
b5ff84bd46 Further clean up create server screen 2018-03-26 12:37:06 +08:00
Benau
8db959a755 Fix server selection column proportion 2018-03-26 12:27:40 +08:00
Benau
0e2112d7f0 Add server distance calculation 2018-03-26 02:11:04 +08:00
Benau
42e1873458 Fix possible null pointer dereference 2018-03-26 00:32:26 +08:00
Benau
946a902f98 Adjust server creation screen for 1280x720
And add some more game modes
2018-03-24 15:44:15 +08:00
Benau
85895074aa Merge branch 'origin/master' 2018-03-24 09:31:06 +08:00
Benau
025ca63df0 Display ping to server in lobby 2018-03-23 22:19:44 +08:00
Benau
1e2cb2dc4a Fix clang screen.hpp warning 2018-03-23 20:20:09 +08:00
Benau
e5c66d541b Hide friend request button if already made friend 2018-03-23 15:00:19 +08:00
Benau
dac7158ce0 Show WAN server owner if it's localhost or friends' 2018-03-23 13:41:07 +08:00
Benau
61b6389764 Use crown icon for server owner 2018-03-23 10:08:48 +08:00
Benau
ef15a1881c Better default focus for network dialog 2018-03-23 10:06:04 +08:00
Benau
0599e8c0d7 Fix broken network kart selection for some keyboard configuration 2018-03-22 14:53:29 +08:00
Benau
d8b68a2cbc Remove guest account in network splitscreen 2018-03-22 14:43:16 +08:00
Benau
ebadc84945 Fix assertion when going back fron network to normal kart selection screen 2018-03-22 13:26:44 +08:00
Benau
c026261e0f Improve splitscreen dialog for easier adding 2018-03-22 12:52:37 +08:00
Benau
152dfe7c55 Add toggling of network splitscreen in online menu 2018-03-22 01:38:29 +08:00
Benau
6fca802c8e Add network split screen kart selection 2018-03-21 15:41:44 +08:00
auria.mg
41cd33ce55 Fix Wrong Way message, fixes #3159 2018-03-20 20:05:34 -04:00
Benau
4379244f3e Adjust based on auria's feedback 2018-03-20 14:56:17 +08:00
Benau
e58d86d4d5 Merge branch 'origin/game_protocol' 2018-03-20 08:32:45 +08:00
hiker
c456edd9f2 Convert more time handling to handling ticks. 2018-03-20 09:25:39 +11:00
Benau
d436446de2 Add no-kart-selection network splitscreen 2018-03-20 02:54:10 +08:00
Benau
cfd1de43bb Display all votes in the RHS of tracks screen 2018-03-19 15:08:38 +08:00
auria.mg
ee64a22349 GUI bugfix 2018-03-18 20:22:50 -04:00
Benau
e66c4eed35 Properly hide the rectangle box in ghost track screen 2018-03-17 11:12:21 +08:00
Benau
8c702a376e Move assign mode to exit callback 2018-03-16 21:31:46 +08:00
Benau
758581d13c Merge branch 'origin/game_protocol' 2018-03-16 17:11:40 +08:00
Benau
cf898c2795 Remove waiting for other screen now that you can instantly know votes 2018-03-16 11:35:16 +08:00
Benau
f78276a930 Show player vote in message queue for immediate effect 2018-03-16 00:54:02 +08:00
Benau
bc56c07c51 Hide the chatbox when disable chatting 2018-03-15 14:02:29 +08:00
Benau
e715140835 Change for new server code in stk-addons 2018-03-15 12:37:02 +08:00
Deve
a3c0254f81 Better fix for login screen 2018-03-14 20:49:05 +01:00
Benau
1b8d4c80dc Initial work to port network profile to use weak_ptr 2018-03-14 15:48:02 +08:00
Benau
2e0558323b Merge branch 'origin/network_improvements' 2018-03-14 10:05:07 +08:00
Benau
5699a86586 Allow toggling the display of only private server 2018-03-14 00:50:19 +08:00
Benau
901c5eabec Allow specifying server password in dialog 2018-03-13 16:04:59 +08:00
hiker
d3a60356c9 Merge remote-tracking branch 'origin/fix-timestep' into game_protocol.
Started to use ticks instead of time floating point values in networking.
2018-03-13 18:37:12 +11:00
Benau
c73536263f Add password protected and version info to server 2018-03-13 14:39:20 +08:00
Benau
fe0adadd16 Simplify linebreak 2018-03-13 12:52:04 +08:00
Benau
a33a9a040b Allow text box widget to listen enter event 2018-03-13 09:00:44 +08:00
Deve
952b973b89 Valgrind complains about changing variable after closeScreen 2018-03-12 23:03:15 +01:00
Benau
0f6dbbb4a0 Add default-disabled lobby chatting 2018-03-12 16:51:30 +08:00
Benau
bb3bcdca3e Change int to int map to uint32_t for server ban list 2018-03-12 12:39:16 +08:00
Benau
d527c0eee2 Use icon to identify server owner, online and offline players
Also hide the friend request button for offline players
2018-03-12 11:28:13 +08:00
auria.mg
361e03c375 Fix more keyboard issues, fixes #3131 2018-03-11 19:06:48 -04:00
auria.mg
2087a72cf3 Improve keyboard-only navgation. See #3131 2018-03-11 18:50:55 -04:00
Benau
95208967cf Add kicking player for server owner 2018-03-12 02:05:38 +08:00
Benau
3bbec8aa27 Initial work on lobby redesign 2018-03-12 00:18:53 +08:00
Benau
d538dfc7e6 Header cleanup 2018-03-09 21:17:31 +08:00
Benau
2d86adce3c Fix quitting the server 2018-03-08 13:19:24 +08:00
hiker
8cf885652f Merge remote-tracking branch 'origin/master' into game_protocol 2018-03-08 09:51:00 +11:00
hiker
fa624c90e1 Merge remote-tracking branch 'origin/master' into fix-timestep 2018-03-08 09:50:14 +11:00
Benau
cd713f6c99 Move hiding icons for android to beforeAddingWidget 2018-03-07 11:04:00 +08:00
Deve
022dd68a17 Some fixes for gamepad on android 2018-03-06 23:23:15 +01:00
Benau
88e9d6a34c Fix server selection screen loading dots 2018-03-06 14:40:29 +08:00
Benau
03285a33a3 Move ModalDialog::dismiss() after setJoinedServer 2018-03-06 01:38:09 +08:00
Benau
ebcaa2c1ad Fix auto connect 2018-03-05 13:04:17 +08:00
auria.mg
aa027bd09c Fix GUI bug 2018-03-04 18:38:58 -05:00
Benau
2b56a97b08 Clean up Server, ServersManager and quick play
For now we choose the server with the least player for quick play
2018-03-05 01:54:44 +08:00
Deve
8f78d4e891 Add a popup on first run on android, so that user can choose if accelerometer should be enabled 2018-03-04 00:08:24 +01:00
Benau
58757c2927 Hide create server buttons for android 2018-03-03 14:31:38 +08:00
Benau
594780a758 Don't use setVisible for IconButtonWidget in beforeAddingWidget 2018-03-03 14:22:44 +08:00
auria.mg
0cd5b5672e Fix assert failure 2018-03-02 19:46:43 -05:00
Deve
729e508027 Disable accelerometer in options if it's not available 2018-03-02 22:30:22 +01:00
Benau
43cf29af86 Merge remote-tracking branch 'origin/network_improvements' 2018-03-02 17:39:16 +08:00
Benau
efa294d4f4 Clean up lan and wan server code 2018-03-02 15:21:27 +08:00
Benau
a27512f515 Use ostringstream to add server option 2018-03-01 12:50:51 +08:00
Deve
a00c1cadc8 Simplify accelerometer selection in settings 2018-02-28 22:01:30 +01:00
Benau
3141b67f89 Use a signal handler to partially clean up STK when terminating 2018-03-01 02:19:26 +08:00
Benau
13d4cc50cf Use server id file to determine the status of no-graphics server 2018-02-28 16:09:53 +08:00
Benau
18eb0a613a Allow non-saved password user to create wan server 2018-02-28 15:05:34 +08:00
Benau
cd5cb5ef6d Use STKHost to determine graphics-client-server 2018-02-27 14:10:44 +08:00
Benau
0e2d5ab460 Allow server and client together in graphics 2018-02-27 02:40:50 +08:00
Benau
d8007c4518 Update server for new xml code
And initial work for starting a complete stk server
2018-02-26 14:23:34 +08:00
Benau
571a524f59 Update lobby for new gui engine code 2018-02-25 13:31:45 +08:00
Benau
34caab24fe Update networking lobbdy for better display info 2018-02-25 02:09:07 +08:00
Benau
b26b784b6a Various improvements to WAN and LAN connection 2018-02-24 15:48:30 +08:00
hiker
95f0bf9e3b Used functions in stk_config to convert between ticks and times. 2018-02-23 23:22:49 +11:00
Benau
a93182740e Reset NetworkConfig when exiting WAN game screen 2018-02-23 15:46:03 +08:00
Benau
1023e6580e Unregister STK server when exiting 2018-02-23 14:01:20 +08:00
hiker
81342ddd00 Fixed several mixups of ticks and time. 2018-02-22 19:25:11 +11:00
hiker
27b5409487 Use ticks (at the physics frame rate) for time measurement, which
avoids potential floating point errors (in networking).
2018-02-21 22:18:45 +11:00
Benau
8daebe06e1 Allow creating wan server in command line
It can only be used with a saved online player, also fix a weird
crash if server failed to create (wan is NULL)
2018-02-20 15:11:58 +08:00
Benau
3223d05c6c Merge remote-tracking branch 'origin/master' into network_improvements 2018-02-20 00:14:29 +08:00
Benau
6fd7fb0e0e Allow reconnecting to lan servers as many time as possible 2018-02-18 13:24:29 +08:00
Benau
0a5c1a69c7 Use shared_ptr for protocol to avoid leaking
With weak_ptr it's also possible to auto clear LobbyProtocol when
STKHost is shutdown
2018-02-18 12:39:05 +08:00
Benau
bcf8e4e5fe Allow shutdown STKHost from dialog 2018-02-17 16:25:53 +08:00
Benau
05f7c014dd Create a prototype for thread-safe protocol manager
Using weak and shared_ptr, if !lock(), than it was atomtically
destroyed
2018-02-15 16:47:04 +08:00
Benau
469f7d2fc5 Drop player if he has incompatible karts / tracks 2018-02-14 12:23:05 +08:00
auria.mg
e26239e364 Improve the input sensing text to be a bit clearer 2018-02-13 20:35:07 -05:00
Benau
8a1ef31f4a Allow remove unusable karts or tracks in network game 2018-02-14 01:57:05 +08:00
auria.mg
196b5a2bbe Minor ajustments to kart color screen, make kart slightly bigger, make XML cleaner 2018-02-12 20:22:35 -05:00
auria.mg
ceeb79f3a4 Restore accidentally removed resolution ajustment in kart color selection screen 2018-02-12 20:16:31 -05:00
auria.mg
2830dabfc1 Improve kart color selection screen, fixes #3122 2018-02-12 20:08:51 -05:00
hiker
434a9c5dcc Fixed compiler warnings. 2018-02-09 16:14:38 +11:00
hiker
4d75042f3b Fixed compiler warnings. 2018-02-09 16:12:44 +11:00
Benau
9a5ce54c4f Merge remote-tracking branch 'origin/master' into game_protocol 2018-02-09 00:53:02 +08:00
Benau
19c705f27c Make wrong way message always centered, fix #3115 2018-02-08 13:15:22 +08:00
Ben Krajancic
d96b6b92ce Split screen regression fixes (#3116)
* Fix lapcount

* Fix selection box color

* Fix messages on screen

* Fix scaling

* Fix for icons

* Styling fixes

* fix style issue

* Fix calls

* Final call fix
2018-02-07 18:52:53 -05:00
Ben Krajancic
0f3518e71b Unlimited Split-Screen (#3104)
* Initial SplitScreen

All are upside down and player 1, 5 player does 6 even...

* Working version of splitscreen

* black screen fix

* te fix

* Update race_gui.cpp

* Change item

* wrong way fix and refactorings

* Fix icon scale, cleaning code for lap count

* Remove tabs

* Add settings option

* Fix FOV

Right now the FOV gradually  decreases when going from 1,2,3,4 players. Then after 4 players it wont drop any lower. This behaviour can easily be replaced in the future

* Prevent overflow

* Unlimited splitscreen

* Space out duplicate skins across additional players

* Update stk_config.cpp

* Update irr_driver.cpp

* Update options_screen_ui.cpp

* Update irr_driver.cpp

* Update options_screen_ui.cpp

* Update race_gui.cpp

* Update irr_driver.cpp

* Fix for empty pixels at edges

* Fix referring to template not int

* Fix compile errors

* Progress towards fixing selection screen

* Begin process for selections

* Fix selection screen for >4 people

Important GUI changes included

* Disable changing rows/cols ingame

* fix sp related crash

* Styling fixes
2018-02-05 20:01:32 -05:00
Benau
9ebcdc5af3 Set DeviceManager assign more to ASSIGN in network kart selection
Because input manager use this to determine backspace functionality
(for rescue in game or leave a screen)

This will be reset to NO_ASSIGN when you go back to main menu screen
2018-01-29 14:50:29 +08:00
Benau
6bcee60a1c Merge remote-tracking branch 'origin/master' into game_protocol 2018-01-24 10:20:06 +08:00
Benau
59045cd064 Merge remote-tracking branch 'origin/master' 2018-01-13 15:44:57 +08:00
Benau
7902e2ad06 Fix focusing of kart color slider dialog 2018-01-13 11:58:32 +08:00
Benau
bb0cf72635 Add required code and color selector for rainbow karts 2018-01-13 00:38:46 +08:00
Benau
9ccb34c2a1 Adjust graphics presets for SP 2018-01-12 12:03:31 +08:00
Qwerty Chouskie
6aefa2542b Reduce number of places version number needs to be changed on release 2018-01-11 08:56:23 -08:00
Benau
68ceceb6e3 Remove unused texture code 2018-01-11 12:47:02 +08:00
Benau
4823c46ad9 Preload the container id of materials 2018-01-10 13:10:12 +08:00
Benau
f4fb2cb41c Fix no graphics and server only run 2018-01-10 11:35:02 +08:00
auria.mg
6a21ca75fb Improve text legibility 2018-01-07 19:09:42 -05:00
auria.mg
3c591bcf39 Tweak text color to improve legibility 2018-01-07 18:47:01 -05:00
Benau
294f0d79d1 Port feature unlocked to use SP 2018-01-05 01:06:58 +08:00
Benau
d24796aa6f Use win / lose animation in grand prix result screen 2018-01-03 16:33:55 +08:00
Benau
1e0b611c7d Draw kart shadow with dynamic draw call 2017-12-29 01:36:36 +08:00
Ben Krajancic
7c10a5559d Ghost replay selection fix (#3081)
* Label unknown replay makers as "Unknown"

* Language neutral result
2017-12-27 21:08:34 -05:00
Benau
7797115867 Add SP for correct normal and easier shader system 2017-12-25 14:00:10 +08:00
hiker
2f747cf614 Remove REQUIRED_LOGIN #ifdef which is not needed anymore with the new menu. 2017-12-09 00:57:08 +11:00
hiker
825deed8dd Merge remote-tracking branch 'origin/master' into game_protocol
Fixed various conflicts.
2017-12-09 00:56:30 +11:00
auria.mg
1afb62c97d Bring back the ability to skip the unlock cutscense, fixes #3069 2017-12-03 18:44:50 -05:00
auria.mg
48aded5f6d Login screen : proper post-login redirection 2017-11-27 18:07:42 -05:00
auria.mg
579a4aa3cc Improve the way to enable/disable the networking menu, use the --online switch that previously existed 2017-11-26 21:54:48 -05:00
auria.mg
4f528c258d Disable new networking menus, will be enabled back in the networking branch 2017-11-26 21:48:45 -05:00
auria.mg
d92476ae70 First implementation prototype of the new netwoking UI, as discussed. 2017-11-25 18:51:49 -05:00
auria.mg
c59af9136c Merge branch 'KartPerGamemode'
# Conflicts:
#	src/states_screens/gp_info_screen.cpp
2017-11-21 19:20:49 -05:00
hiker
40bdb4d777 Added #define to disable the online login for now. Makes it easier
to start and debug LAN play.
2017-11-21 18:15:03 +11:00
Deve
4d4c514c75 Corrrect gp info screen to keep consistency with track info screen.
Now num karts config param is updated only if spinner button or start button has been pressed.
2017-11-15 22:11:21 +01:00
hiker
f38f30a75c Merge branch 'master' into game_protocol 2017-11-15 08:12:38 +11:00
Deve
20ffc3a693 Avoid a crash in ghost replay screen.
It was crashing when add-on track was uninstalled.

It only avoids a crash and it's not true fix, because replays list should be updated when add-ons have been installed/uninstalled.
2017-11-13 22:35:18 +01:00
hiker
5b9dc6895d Fixed server-only execution. 2017-11-13 12:48:03 +11:00
hiker
4fced331fe Merge remote-tracking branch 'origin/master' into game_protocol 2017-11-10 16:08:03 +11:00
Deve
468c24acd3 Avoid negative AI karts number in follow the leader 2017-11-09 23:38:53 +01:00
Deve
165b2fea9c Avoid running follow the leader GP with 0 AIs 2017-11-09 23:23:05 +01:00
Ben Krajancic
53827cbe21 Fixing selection issue on end-race screen (#3008)
* Small clarification to prevent build errors

Building outside of this directory prevents the executable from launching, this small addition can help prevent this issue from happening.

* Initial Commit

* Code cleanup

* Fix compile error

* Fix incorrect comparison

* Fix focusing erorr twice over

It may be worth making 'setfocusable' part of setvisible
2017-11-08 19:11:29 -05:00
hiker
beca172af3 Fixed server-only execution. 2017-11-08 01:25:25 +11:00
LeMagnesium
237927e3e5 Mark "fortmagma" as locked until the door can open (#3015)
Keep the "fortmagma" challenge marked as locked on the GUI minimap even if enough points (180+) have been gathered to unlocked it, when the door is not open yet
2017-11-05 18:33:56 -05:00
hiker
54b32ba6b1 Merge branch 'master' into game_protocol 2017-11-05 13:03:15 +11:00
auria.mg
04c9763e77 Clarify UI in game paused dialog of story mode, fixes #3004 2017-11-01 19:29:02 -04:00
Ben Krajancic
a94d22cce7 No option to abort grand prix on last track (#3003)
* Small clarification to prevent build errors

Building outside of this directory prevents the executable from launching, this small addition can help prevent this issue from happening.

* Initial Commit

* Code cleanup

* Fix compile error

* Fix incorrect comparison
2017-10-31 19:15:57 -04:00
Fantasmos
98231956fb rename to more appropriate variable 2017-11-01 08:38:34 +11:00
Fantasmos
83c14fc0dc Added default num karts for GP 2017-10-31 18:11:45 +11:00
auria.mg
4f7cdbe294 Fix #2977 2017-10-29 14:07:41 -04:00
Benau
b15ab1f043 Fix #2988 2017-10-30 01:34:40 +08:00
Benau
d9d3afc36e Fix wrong normal, vertex 2 color and memory leak of texture quad
Fix #2979
2017-10-29 16:19:14 +08:00
Benau
e57c2bbbd3 Remove the dead elephpant 2017-10-29 09:20:50 +08:00
Fantasmos
cb1a2b1e25 Rename m_num_karts to be more appropriate, removed redundant variables I've made 2017-10-28 12:51:49 +11:00
Fantasmos
4a0db1926d Highlighted issue that needs resolving 2017-10-28 12:09:23 +11:00
Fantasmos
4fbc39572b Removed Tab, first working version! 2017-10-28 11:56:52 +11:00
Fantasmos
ca330b1ac0 Map compiles now and can be set 2017-10-28 11:35:11 +11:00
Fantasmos
f10feb77fd Can now load a map type 2017-10-28 09:16:28 +11:00
Fantasmos
823d3112ad Begun making template for dictionary 2017-10-27 22:31:54 +11:00
Fantasmos
af7fefee1e note errors 2017-10-26 11:32:43 +11:00
auria.mg
256ad66e13 #2734 2017-10-25 20:20:00 -04:00
auria.mg
067db4c8ce Fix #2734 2017-10-25 20:16:36 -04:00
Fantasmos
df69a684a3 Identified cause of compile error 2017-10-26 09:39:48 +11:00
Fantasmos
74cdd07ba7 Added string array for karts per gamemode, and references to it to replace num_karts 2017-10-26 09:11:57 +11:00
Benau
0f17d7e23a Fix #2917 2017-10-25 09:14:26 +08:00
Benau
e61eb3415a Remove hardcoded max 1024 bones for skinning 2017-10-20 17:10:08 +08:00
Benau
88e15147b8 Merge remote-tracking branch 'origin/win-64bit' 2017-10-17 00:55:22 +08:00
Benau
9304f6fa3c Disable the usage of all parts colorized
Please use colorization mask for better effect
2017-10-11 13:05:15 +08:00
Benau
b09eec4bcb Allow speed weight objects to be attached to bone 2017-09-18 11:27:21 +08:00
Deve
fd00ef4d92 Fixed a crash in grand prix editor 2017-09-09 21:25:56 +02:00
Deve
f96863c421 Add a possibility to totally disable particles.
Particles cause a crash on some radeon devices, so people can at least disable it to make the game working.
Also tfb causes quite big slowdown on slow devices even if there is no particles displayed, so it can give few more fps.
2017-09-08 00:33:46 +02:00
deve
2de3a39e04 Make device name translatable 2017-08-30 06:46:55 +02:00
Deve
184ecce836 Reset multitouch buttons state when game is restarted 2017-08-29 22:00:45 +02:00
Deve
65363a2fa0 Move multitouch race gui creation.
It's to avoid duplicated buttons because result gui uses gui_base too.
2017-08-29 22:00:45 +02:00
Deve
2fdb33990e Tweak some touch device params.
Better on 5'', worse on 10''... Can be changed in options anyway.
2017-08-28 22:25:32 +02:00
Benau
ad369b88da Remove .b3d usage in stk-code 2017-08-21 16:02:06 +08:00
Deve
d698e62053 Minor fix in video settings dialog 2017-08-19 22:09:42 +02:00
hiker
f3d56b37df Merge branch 'master' into win-64bit 2017-08-16 17:29:57 +10:00
auria.mg
94bb657102 Ignore input sensing coming from the wrong gamepad 2017-08-08 20:44:31 -04:00
hiker
28890aad33 Merge branch 'master' into game_protocol
Some minor changes to make code easier to read.
2017-08-09 09:50:46 +10:00
Geoffrey Mon
a73af6eb0d Save and use usernames in replay files (#2754) (#2893)
* Save and use usernames in replay files

Fixes #2754.

* Store usernames of each racer in recorded replay files
* Display those usernames in a column of the replay selection UI
  and in race result dialogs
* RaceResultGUI::getKartDisplayName functionality moved into
  Controller::getName

* Move Controller::getName definition to avoid unnecessary #include

* Backwards compatibility: use kart name if username is not in replay

* Fix code style issues
2017-08-03 19:51:42 -04:00
Geoffrey Mon
f3a962c391 Save and use usernames in replay files
Fixes #2754.

* Store usernames of each racer in recorded replay files
* Display those usernames in a column of the replay selection UI
  and in race result dialogs
* RaceResultGUI::getKartDisplayName functionality moved into
  Controller::getName
2017-08-02 12:55:23 -04:00
Deve
7d4fbb8d0c Minor modification in play tutorial text. Fixes #2535 2017-07-29 00:43:17 +02:00
hiker
ea3f9f8945 Merge branch 'master' into game_protocol 2017-07-24 21:12:36 +10:00
Deve
0dba3c8f67 Add a prefix to irrlicht key codes 2017-07-20 22:58:11 +02:00
Benau
10909b9556 Remove m_scale_rtts_factor == 1.0f in image quality for now
Because not working in advanced pipeline
2017-07-20 10:19:30 +08:00
QwertyChouskie
7b185ce2f1 Add new GPwin cutscene (#2875)
* Add new cutscene

* Cleanup

* Make all podiums arrive at the same time
2017-07-06 20:54:42 -04:00
Deve
6fc285b794 Show only native resolution in settings on android.
Changing resolution is atm. not available, so adding 1024x768 doesn't have a sense.
2017-07-06 23:18:43 +02:00
Deve
9fc1acc4c0 Allow to draw steering wheel on the right side 2017-07-05 21:21:33 +02:00
Deve
2cda14686d Simplify touch device settings 2017-07-05 20:43:57 +02:00
hiker
03f4b76a32 Fixed various compiler warnings. 2017-05-09 09:34:37 +10:00
hiker
efec344738 Fixed more 64-bit related compiler warnings. 2017-04-11 22:30:57 +10:00
hiker
f2138e062d Tried to fix all 64-bit related compiler warnings triggered from files
in graphics.
2017-04-08 23:25:33 +10:00
hiker
5af4ea35a7 Fixed 64-bit related compiler warnings. 2017-04-07 23:43:01 +10:00
Marianne Gagnon
b85d84c9dd Remove outdated Apple-specific code 2017-03-23 21:02:16 -04:00
Deve
2a64ce94c8 Some fixes for scale rtts.
- Don't force using rtts when advanced lighting is disabled because it actually makes the game slower
- Keep the minimap and kart selection screen in high quality
2017-03-18 22:26:35 +01:00
Benau
21cbcd9185 Load speedmeter texture before rendering the first frame 2017-03-18 08:30:50 +08:00
Benau
0f218cff32 Allow re-create ThreadedTexLoader with suitable capacity 2017-03-16 13:15:33 +08:00
Benau
02c8c87d5d Remix all image quality options 2017-03-16 01:04:53 +08:00
hiker
12e6bab90a Merge branch 'master' of github.com:supertuxkart/stk-code 2017-03-09 22:42:06 +11:00
Deve
21cb853079 One more tweak for hiding story mode icon if it's not available.
Now it should work properly, sorry for the mess.
2017-03-08 22:09:47 +01:00
Deve
35139877f6 Fixed a crash on changing resolution 2017-03-06 23:10:29 +01:00
Deve
d4cecd5a8b Show story mode icon only if overworld track exists.
It allows to decrease apk size a bit.
2017-03-05 23:31:53 +01:00
hiker
bf61b98444 Merge branch 'master' of github.com:supertuxkart/stk-code 2017-02-23 17:18:10 +11:00
Deve
0767abe2bc Draw a touch steering button that allows to run challenges.
It was broken because the fire button uses now the icon of collected weapon, so that it's not displayed at all when there is no weapon.
2017-02-22 21:43:36 +01:00
auria.mg
eb9f656b44 Add config flag to persist GUI visibility state at samuncle's request 2017-02-20 19:16:49 -05:00
hiker
8e8de3c5e2 Merge branch 'master' of github.com:supertuxkart/stk-code 2017-02-20 07:45:26 +11: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
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
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
hiker
5690eb0edd Merge branch 'master' of github.com:supertuxkart/stk-code 2017-01-26 23:14:43 +11: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
3edff9523e Fixed compiler warning. 2017-01-25 22:16:40 +11:00
hiker
ecc4e30cbe Fixed compiler warning. 2017-01-25 21:51:26 +11:00
hiker
096d68c361 Merge remote-tracking branch 'origin/master' into game_protocol 2017-01-25 18:15:24 +11:00
hiker
426cbaaff5 Added '--auto-connect' command line option to automatically connect
a client to the first LAN server it finds and start a race - strictly
for debuggint ;)
2017-01-25 14:29:48 +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
hiker
31619aecff Merge remote-tracking branch 'origin/master' into game_protocol 2016-12-20 10:31:24 +11: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
95ca3fcac1 Try to fix rare GUI crash, likely caused by pushing a screen in the
network thread while the gui is being drawn. Made the messages
causing this synchronous, i.e. executed by the main thread.
2016-12-15 08:10:04 +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
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
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