Commit Graph

2907 Commits

Author SHA1 Message Date
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