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

2845 Commits

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