Commit Graph

2864 Commits

Author SHA1 Message Date
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
hiker
354770f564 Added 0 number of laps to configuration to test ending a race. 2016-02-09 13:38:25 +11:00
Elderme
5b81d97482 Merge branch 'master' into renderer_refactoring 2016-02-07 13:56:25 +01:00
Benau
c3f589561c Initial work on supporting real race with ghost karts
To test, you need to pass --ghost to supertuxkart with choosing a
track that has replay recorded, you can record one with artist
debug mode.

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

2. Possible to identify own goal in result gui

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

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

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

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

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

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

3. Fix wrong size of kart stats bar
2015-12-10 10:25:52 +08:00