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
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