Commit Graph

79 Commits

Author SHA1 Message Date
Flakebi
a84c5d596c Fix focus crash in kart selection screen 2014-09-02 03:43:08 +02:00
Flakebi
e2089fcea6 Switch per player difficulty to player config 2014-09-02 01:18:58 +02:00
Flakebi
a84094e55e Add difficulty to karts 2014-07-29 22:54:42 +02:00
Flakebi
71f8766cb1 Add per-player difficulty 2014-07-28 18:32:39 +02:00
Flakebi
bfd54cf37c Split kart selection screen into more files 2014-07-23 22:08:22 +02:00
Flakebi
0195d95bad Adding basic gui for per-player difficulties 2014-07-23 15:18:40 +02:00
Flakebi
a77778b1cd Display skill labels only once 2014-07-17 21:33:25 +02:00
Bart Cools
07b6579529 Fixed the GUI properties for multiplayer view, though the screen is way too full right now. Some changes (to GUI or screen) have to be done! 2014-06-19 15:01:34 +02:00
Bart Cools
084a4a46f3 GUI Property now more modifiable (with SkillLevelWidget in vector and types in an enum) 2014-06-19 15:01:11 +02:00
Bart Cools
e2abf6648f ProgressBar shows, made 3 SkillLevelWidgets, only updating the widgets when hovering over new kart isn't working yet 2014-06-19 15:01:11 +02:00
Bart Cools
d5d2ef991a Fix for sometimes disappearing skill bar 2014-06-19 14:58:11 +02:00
Bart Cools
7ac7955808 First work on GUI support for different properties 2014-06-19 14:58:11 +02:00
Bart Cools
95bb6835ae first work at adding kart properties widget to the kart selection screen 2014-06-19 14:42:46 +02:00
hiker
5c959e07a2 Fixed multiplayer kart selection. Now guests are created on demand,
and are not saved to the players.xml file anymore.
2014-06-02 08:08:42 +10:00
hiker
e39f2164b5 Removed OnlineProfile from ActivePlayer, since it was not used at all. 2014-05-31 10:26:02 +10:00
konstin
7cc83e1475 running whitespaces.py update 1 2014-03-29 11:33:43 +01:00
konstin
663fffdebb Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces"
This reverts commit 65e2dcf2f0.
2014-03-29 11:32:04 +01:00
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +01:00
auriamg
112c46fa14 Merge pull request #1236 from divvy81/downstream
Change of color player kart when any player quits
2014-03-08 19:11:14 -05:00
Dk
b4d922512e 1195 Multiplayer Kart selection screen commit 22 2014-03-08 21:08:06 +05:30
hiker
7cb7651c07 Renamed Profile to OnlineProfile to better distinguish the various profiles we use. 2014-03-07 11:02:07 +11:00
Dk
7c8a32a10e 1195 MUltiplayer kart selection cmmit 21 2014-03-06 23:31:34 +05:30
Dk
796c8b823a 1195 Multiplayer karts selection screen commit 20 2014-03-06 00:18:12 +05:30
Dk
7d87d79d20 1195 Multiplayer Kart Selection commit 19 2014-03-05 23:22:41 +05:30
Dk
c5d23f7154 1195 Multiplayer kart selection commit 18 2014-03-05 23:02:23 +05:30
Dk
eddc512b16 1195 Multiplayer kar selection screen commit 17 2014-03-05 21:37:07 +05:30
Dk
b5feb9740a 1195 Multiplayer kart selection commit 16 2014-03-05 21:08:17 +05:30
Dk
99a19ee739 multiplayer kart selection commit 12 2014-03-03 23:53:15 +05:30
Dk
14467e320b 1195 Multiplayer kart selection screen 2014-03-03 23:32:43 +05:30
Dk
15faf7dbee 1195-Multiplayer kart selection 2014-02-28 16:51:27 +05:30
hiker
5acf3e1681 Various compilation fixes, some cosmetic changes. 2014-02-10 08:41:54 +11:00
hiker
5474b5528f Removed unnecessary parameter from onUpdate calls. 2014-01-22 07:43:17 +11:00
deveee
ec13bcf802 Merge branch 'hilnius'
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14638 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-05 17:28:55 +00:00
hikerstk
bced8cdb9f Merged with trunk, part 1 (due to previous failures I am splitting this
patch).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:27:55 +00:00
hilnius
5f4270acc6 adding some comments and fixing the kart selection screen bug
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13688 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-15 09:45:22 +00:00
hilnius
8233b8067d merging uni's and trunk branches. Not everything tested right now
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13577 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-27 01:02:41 +00:00
hilnius
9151770aa0 fillig the GameEventsProtocol with events that concern powerup collect
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13419 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-06 19:10:33 +00:00
hilnius
b394bd9295 lot of code refactoring, now protocols can choose whether they receive network messages (and more generally events) in a synchronous mode (along with the main loop) or in an asynchronous mode
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13403 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 19:49:57 +00:00
hilnius
a51f7bfb74 modify the race_id management to ensure that we always have ids between 0 and the number of players
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13402 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-01 11:51:23 +00:00
hilnius
ea2b52a663 merging hilnius's branch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-31 18:03:11 +00:00
hilnius
ad18d9299d fixing last issues with the inherited kart selection screen : the screen is now deleted when back is pressed, and re-instantiated when it's loaded again. If not, there was a problem with two screens instantiating the same '.stkgui' file. The screen is not deleted when the user clicks a kart (eg when starting normal game) to allow a working popScreen()
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13378 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-29 12:42:21 +00:00
hilnius
79c5fc03e9 moving class declarations of objects used by the KartSelectionScreen to kart_selection.hpp
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13373 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-28 12:28:26 +00:00
hilnius
b737ad753a adding a way to have a network kart selection screen inheriting the normal kart_selection_screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-27 23:13:03 +00:00
hilnius
3e0fcb6d00 adding possibility for the server to decide when to start the selection
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13354 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-26 12:49:05 +00:00
curaga
57c3cbae3e Space cleanup pass on the headers
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 19:47:39 +00:00
hikerstk
05cec70d86 Fixed 'map fire to select' option by also work for gamepads, only
accept fire (and not any event like steering), and remove setting
the flag each frame.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12191 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-06 23:43:09 +00:00
hikerstk
fe20c7d6a1 Accept 'fire' key in addition to 'select' to select a kart.
Auria, please review for potential inclusing in 0.8.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12187 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-06 10:58:04 +00:00
auria
6325e02b16 Fix pressing escape in kart select screen gonig to overworld
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11948 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-11-15 00:09:36 +00:00
auria
dd487346aa Introduce (in a totally optional way) the C++2011 feature to explicitely mark overrides. This bit us quite a few times in the past, so if we start using this more then those with GCC 4.7 will at least catch the errors when they happen :)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11231 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-14 00:04:26 +00:00
auria
65b4eed110 Implement going in the garage to change kart
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10807 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-02-05 19:32:17 +00:00