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

2183 Commits

Author SHA1 Message Date
Vincent Lejeune
95cf6c5f4a Put 2d function in their own header 2014-10-18 18:16:50 +02:00
hiker
c40a8eb377 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-18 23:44:11 +11:00
hiker
650b541def Try to fix #1622 (can't login due to a missing password entry field). 2014-10-18 23:43:27 +11:00
Vincent Lejeune
e165398fdd Fix texture 2014-10-18 04:10:59 +02:00
Vincent Lejeune
f67f207d4b Start fixing speedmeter 2014-10-17 18:19:23 +02:00
hiker
31c4b2c475 Merge branch 'master' of https://github.com/quizywiz/stk-code into quizywiz-master 2014-10-16 22:47:46 +11:00
Deve
9921c742e3 Merge pull request #1621 from marcoll/master 
Use length limit for dynamic ribbon labels in the GP editor
 2014-10-16 08:30:34 +02:00
hiker
bba7156aff Handle the setting of the listener position in the sfx thread. 2014-10-15 23:42:59 +11:00
hiker
607e94ea84 Fixed #1622 (missing password field in login screen). 2014-10-15 08:20:06 +11:00
hiker
8fcc373b2a Add volume, speed, and position settings to be done by the sfx 
thread. Removed more unnecessary error checks (which mostly flood
stdout with 'not playing ...' messages), and renamed volume, position
and speed to setVolume, setPosition and setSpeed.
 2014-10-15 07:55:18 +11:00
quizywiz
6dd9feff36 escape or back on friends profile takes you to your profile 
Also, fixed bug where user info dialog was accessing m_enter_profile
after it was deleted
 2014-10-14 12:07:08 +05:30
hiker
665f146923 Moved SFXStatus enum to SFXBase. 2014-10-14 08:05:04 +11:00
hiker
c5434aa845 Merge branch 'master' of https://github.com/marcoll/stk-code into marcoll-master 2014-10-13 09:55:25 +11:00
Marc Coll Carrillo
f0429ce95e Use length limit for dynamic ribbon labels in the GP editor 2014-10-11 10:50:06 +02:00
Marc Coll Carrillo
c159f1fca2 Merge remote-tracking branch 'upstream/master' 2014-10-10 22:39:55 +02:00
hiker
6dc18a3557 Change "Cancel" to 'Exit game' and make the back arrow invisible if 
the login screen is shown before the race start.
 2014-10-10 16:19:25 +11:00
hiker
5d019e3537 Don't show a password entry field for the currently logged in user. 2014-10-10 07:57:10 +11:00
hiker
f39e2d9cdf Actually display secret achievements once they have been achieved. 2014-10-10 07:49:14 +11:00
hiker
50c21cc11e Added secret achievement (i.e. progress not shown in list). 2014-10-09 23:32:17 +11:00
auriamg
3061123e3e Merge pull request #1606 from Flakebi/fix 
Fix some more bugs
 2014-10-08 18:18:37 -04:00
hiker
30413b8d6d Fix loss of associated online user name if stk is played offline 
(might be a fix for #1595).
 2014-10-08 23:14:43 +11:00
hiker
d5bc5ec110 Fix #1605: crash when downloading friends and achievements at the same time. 2014-10-08 08:00:58 +11:00
Flakebi
069853b11f Fix #1153 Cleanup logging code 2014-10-07 20:54:54 +02:00
deve
3855dd646a Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-10-07 06:54:42 +02:00
deve
6b43e2dd6f Don't allow too long GP names. 2014-10-07 06:54:02 +02:00
Flakebi
0193c4c7a5 Fix #1170 Add "Don't Assign" option when configuring inputs 2014-10-07 00:06:15 +02:00
Deve
a4ac9f95c2 Use length limit for text only if it's needed. 
This check is IMO not needed at all because translators will see if text fit in available area or not. But anyway this length should be large enough.
 2014-10-06 21:57:25 +02:00
Flakebi
f95eeb7f56 Fix #1602 2014-10-05 15:11:45 +02:00
Flakebi
dc78c35b50 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/karts/kart.cpp
 2014-10-05 12:10:39 +02:00
Marc Coll Carrillo
ee49604856 Issue #1588 
Fixed crashes in track info screen
 2014-10-04 12:15:11 +02:00
Deve
ce51824d47 Redraw GP info screen when number of oponents was changed. 
This allows to show or hide "Continue" button without opening screen once again.
 2014-10-02 21:56:46 +02:00
Deve
69217bd03c Grr, wrong file. 
Fixed continue GPs
 2014-10-02 20:21:46 +02:00
Deve
4ecff3e46b Use global number of oponents for grand prix 2014-10-02 20:09:59 +02:00
hiker
de9a1f51a7 Removed empty 'online overview' page, show the achievements page instead. 2014-10-02 07:59:24 +10:00
Flakebi
47da30dd24 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-30 19:22:18 +02:00
vlj
b79e969b11 Remove some others deprecated calls 2014-09-26 23:10:10 +02:00
hiker
2d7b8228e9 Fix #1565: Added better instructions for account creation screen (and also made the 
instructions actually visible).
 2014-09-26 08:57:52 +10:00
Flakebi
a02e8d4583 Apply merge properly... 2014-09-25 17:06:20 +02:00
Flakebi
2cf9707294 Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	src/states_screens/kart_selection.cpp
I hope I got everything
 2014-09-24 17:58:12 +02:00
auriamg
a8f6b78524 Merge pull request #1561 from marcoll/master 
Some minor corrections
 2014-09-23 18:46:30 -04:00
hiker
12c1183c86 Fixed #1560. 2014-09-24 08:12:08 +10:00
hiker
3054ffe146 Fix #1554 (don't display server related screens on GUI for 0.8.2). 2014-09-24 07:58:28 +10:00
Marc Coll Carrillo
9c56d66c2d Minor corrections (a couple of warnings, unused headers...) 2014-09-23 22:23:24 +02:00
hiker
7c3d49e631 Accidentally committed file. 2014-09-23 20:51:20 +10:00
hiker
53f05e868d Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-23 20:18:09 +10:00
Deve
cfa4d455b0 Merge pull request #1547 from marcoll/master 
Fix issues with the new "reverse grand prix" feature and user defined GPs
 2014-09-23 10:59:43 +02:00
hiker
aa64f31f83 Added Screen::push() function to shorten the calls to pushScreen(). 2014-09-23 16:43:50 +10:00
hiker
c28728d903 Removed more compiler warnings for 64 bit windows compilation. 2014-09-23 16:23:22 +10:00
hiker
ad20635cce Applied patch for #600 (support 64 bit compilation on windows). 2014-09-23 14:41:32 +10:00
hiker
9ce20435d2 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-23 09:04:14 +10:00
hiker
ea324a8252 Disable 800x600 resolution in release mode (it's useful for debugging, 
so I'll keep it in debug mode).
 2014-09-23 09:03:03 +10:00
hiker
29c162bdf8 Fixed compiler warnings. 2014-09-23 08:56:07 +10:00
Marc Coll Carrillo
bbbe0ddf8d Fix issues with the new "reverse grand prix" feature and user defined GPs 2014-09-19 23:25:03 +02:00
Deve
12977c3764 Merge pull request #1530 from marcoll/master 
Some improvements to the GP editor

Merged because it fixes some issues. Previously I wasn't able to create new GP without a crash.
 2014-09-19 21:54:38 +02:00
hiker
2600b17132 Removed unused code and objects. 2014-09-19 14:31:25 +10:00
hiker
e18c20db65 Fixed various compiler warnings. 2014-09-19 11:02:20 +10:00
hiker
86b351fbf4 Turn sfx_manager into a singleton. 2014-09-17 21:38:21 +10:00
Flakebi
9bcc76127f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-17 13:20:09 +02:00
Marianne Gagnon
835b329c46 kart selection screen : don't reload RTT scene if the selected kart hasn't changed 2014-09-14 19:16:06 -04:00
Deve
0eb09af027 Filtering actions is not needed now 2014-09-14 17:08:40 +02:00
Marc Coll Carrillo
5cf3ad220f Some improvements to the GP editor: 
- GP are now classified into groups, just like tracks: standard, user defined, and add-ons
    - allow empty GPs to be loaded by the GP manager, so that they can appear
      on the GP editor (but not on the track selection screen)
    - enable/disable buttons depending on the available options
    - provide some feedback after pushing the "save" button
    - some minor bug corrections and improvements
 2014-09-13 10:40:27 +02:00
Flakebi
cc60fe817b One more fix for singleplayer 2014-09-12 23:04:06 +02:00
hiker
991f60d06d Select 'start' as default in gp info screen. 2014-09-13 00:58:30 +10:00
hiker
ae726b0902 Show "?" if a track has no screenshot (instead of the screenshot of 
the previous track).
 2014-09-10 09:39:20 +10:00
Flakebi
9c911a2891 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-09 12:07:34 +02:00
Deve
5692e47739 Set selection to "start" by default in track info screen. 
Don't start the race using left or right arrow.
 2014-09-07 22:52:45 +02:00
Flakebi
f7b22cd97c Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-07 20:17:12 +02:00
Marianne Gagnon
016ba2caf3 Fix #1499 2014-09-06 17:58:59 -04:00
Marianne Gagnon
f0796b2380 Fix #1485 properly 2014-09-06 17:15:19 -04:00
Marianne Gagnon
a6f7c3a152 Add clean way to hide/show ribbon items and use it in GP info screen. Fixes #1485 2014-09-06 17:01:06 -04:00
Flakebi
5858c05e74 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-05 22:46:17 +02:00
hiker
6671182efd Fixed memory leak. 2014-09-04 23:37:38 +10:00
hiker
973399f5cb Fixed memory leak. 2014-09-04 21:14:37 +10:00
hiker
2514f8a872 Removed unnecessary GUIEngine::. 2014-09-04 17:19:15 +10:00
hiker
b3d1a41276 Removed unused code, added comments. 2014-09-04 17:05:47 +10:00
hiker
8ffe09de29 Combined GPInfoScreen and RandomGPInfoScreen into one class, requiring 
only one stkgui file.
 2014-09-04 16:49:15 +10:00
hiker
7c3164a9c1 Added 'reload' random GP support, fixed 'back' icon on screen. 2014-09-04 09:38:25 +10:00
hiker
12e403b909 Fixed setting of number of AI karts. 2014-09-03 17:19:30 +10:00
hiker
a591ba6778 Fixed setting of reverse in random GPs. 2014-09-03 17:13:20 +10:00
hiker
709583ead5 Removed Random GP dialog. 2014-09-03 17:01:36 +10:00
hiker
0a0609d91f Added GrandPrixData::isRandomGP. 2014-09-03 08:24:11 +10:00
hiker
ccdc90f029 Removed while loop with a 'random' abort condition - while it works 
it could result in STK hanging if a broken random generator should be
used.
 2014-09-03 08:08:41 +10:00
Flakebi
a84c5d596c Fix focus crash in kart selection screen 2014-09-02 03:43:08 +02:00
hiker
7dbfc151bf Added random GP functionality into gp_info screen. Changed GPData 
in GPInfoScreen from a pointer to be an object, while this adds
some coping of this object, it removes potential memory leaks.
 2014-09-02 09:32:12 +10:00
Flakebi
e2089fcea6 Switch per player difficulty to player config 2014-09-02 01:18:58 +02:00
Flakebi
70ad37aeb7 Fix crash in multiplayer kart selection screen 2014-09-01 22:57:58 +02:00
Flakebi
dc4a30202f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-01 11:31:26 +02:00
hiker
2a5591ad1f Enable continue button. 2014-08-27 22:57:03 +10:00
hiker
db3db6f8b5 First version of the GP info screen (instead of dialog). 2014-08-27 22:08:50 +10:00
hiker
672ec8e5e8 Fixed crash: m_tracks is NULL, and can't be used to get the default 
number of laps here.
 2014-08-26 16:39:54 +10:00
hiker
b029c3e990 Fixed setting of actual number of laps of a track; cleaned up docs. 2014-08-26 16:37:06 +10:00
hiker
c9fb0c5b16 Removed unnecessary include. 2014-08-26 16:36:05 +10:00
hiker
76767141f7 Removed old track info dialog, fixed crashes in track info screen 
(caused when making some spinners etc. visible).
 2014-08-25 22:20:42 +10:00
hiker
c9936ffb97 Forgot to actually add the new files :( 2014-08-25 10:47:36 +10:00
hiker
0de942b5f3 Alpha version of a track info screen (instead of a dialog). 2014-08-25 10:40:37 +10:00
hiker
bf23f31a10 Fixed typo. 2014-08-25 10:33:29 +10:00
hiker
fbc438b998 Fixed error message to correctly say that online user names needs to 
be at least 3 characters long - though at this stage we need to
wait for the server to be updated as well, since it will now reject
a shorter user name.
 2014-08-23 09:56:30 +10:00
Deve
8711955bdc Fixed onEscapePressed event in addons loading screen. 
It actually was unused previously. I'm also not sure why there was assert(false) ?
 2014-08-22 19:59:30 +02:00
Deve
ad870c37f4 Back to previous resolution when escape was pressed in confirm resolution dialog 2014-08-22 19:46:03 +02:00
hiker
3ef30dfd48 Merge branch 'no_floating' 2014-08-22 12:46:10 +10:00
hiker
f0f4b8d9f6 Improved error message. 2014-08-22 12:14:06 +10:00
hiker
210a8e7ae9 Set the graphical suspension depending on physical suspension (capped). 
Adjusted graphical chassis to be 0.1 higher to have similar look at previously
and avoid graphical chassis going into terrain,
 2014-08-20 22:19:26 +10:00
vlj
4197e2c320 Another ifdef sets... 2014-08-20 02:05:16 +02:00
vlj
5559a9fd1d Add some #if !defined(APPLE) in debug screen 2014-08-20 02:02:34 +02:00
konstin
33686e9abc make gp editor use default number of laps 2014-08-18 15:16:53 +02:00
konstin
e400b5c212 improve readability 2014-08-18 15:15:22 +02:00
konstin
2f6424c3a2 replace unecessary NULL-checks 2014-08-18 15:11:51 +02:00
Marianne Gagnon
83a1acc961 Merge branch 'save_gp' 2014-08-16 15:42:46 -04:00
hiker
de16d1ace3 Bugfix: A new local only user was now able to change the online account. 
If a new account is created with an online account, make the online account
the default.
 2014-08-13 21:46:53 +10:00
hiker
7111eb55ee Merge branch 'laps' of https://github.com/konstin/stk-code into konstin-laps 2014-08-13 16:01:22 +10:00
Marianne Gagnon
345a3bc451 Fix logic in video settings popup 2014-08-12 19:18:38 -04:00
hiker
11f3c1fc11 Added the recovery dialog back in :) 2014-08-11 22:39:08 +10:00
hiker
3f5ab358df Merge branch 'leyyin' 2014-08-11 14:22:30 +10:00
Marianne Gagnon
2c1feb5f06 Improve debug values popup 2014-08-10 19:09:44 -04:00
hiker
940a296366 Merge remote branch 'origin/master' into leyyin 2014-08-11 09:05:34 +10:00
konstin
f3d0d3cf4e better comments 2014-08-09 19:56:01 +02:00
vlj
768d51d0c3 Add sliders to change ssao parameters. 2014-08-09 19:22:30 +02:00
konstin
c59f243550 Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp 2014-08-09 17:06:16 +02:00
Vincent Lejeune
5dffc86d26 Use lambda for debug_slider instead. 2014-08-09 00:43:28 +02:00
Daniel Butum
28f7a45664 Do not show password_confirm field in the output when registering 2014-08-05 19:40:56 +03:00
Daniel Butum
c6c0c6e590 Rename some API calls 2014-08-05 19:12:56 +03:00
Daniel Butum
62e6a2d733 Merge remote-tracking branch 'upstream/master' 2014-08-05 00:19:49 +03:00
konstin
03b2379eef fix video options dialog 2014-08-04 21:11:53 +02:00
Daniel Butum
c10ca31452 Use new API paths when calling the stk server 2014-08-04 21:55:56 +03:00
Daniel Butum
b3f9f9f407 Refactor online namespace. Define api php file names from a single place 2014-08-04 18:41:47 +03:00
vlj
2fcb574c90 Automate UBO fix detection. 
It only concerns Intel Sandy Bridge (maybe Ivy Bridge ?) gpu on Windows.
 2014-08-04 01:45:08 +02:00
konstin
5fc44d25cd correct invisibility settings 2014-08-03 13:56:53 +02:00
Marianne Gagnon
db0241c5e2 more video settings fixes 2014-08-01 20:56:04 -04:00
Marianne Gagnon
5f70471bce Fix previous commit about shadows vs UBOs, had forgotten shadows is an int and not a bool 2014-08-01 20:39:25 -04:00
Marianne Gagnon
2a9d63b7ae Disable shadows when UBOs are off 2014-08-01 20:21:44 -04:00
Flakebi
bc458c42d3 Apply per-player difficulty 2014-07-30 22:26:59 +02:00
konstin
98d3728a4e finish the save gp button 2014-07-30 16:06:44 +02:00
konstin
fb50c9c338 moving the button to xml 2014-07-30 14:58:53 +02:00
konstin
5a43fecdd0 Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp 2014-07-30 13:59:41 +02:00
Flakebi
a84094e55e Add difficulty to karts 2014-07-29 22:54:42 +02:00
Flakebi
bcf7690809 Ignore vim swap files 2014-07-29 16:26:49 +02:00
Vincent Lejeune
bd7babe11f Rename cpp2011.h 2014-07-29 00:35:43 +02:00
Flakebi
71f8766cb1 Add per-player difficulty 2014-07-28 18:32:39 +02:00
hiker
dbe722316a If an addon icon can not be shown, delete the image file (which will 
trigger a re-download on the next start).
 2014-07-28 21:07:39 +10:00
konstin
7a2e4e6336 corrections 2014-07-26 12:00:24 +02:00
konstin
5167397441 Merge branch 'master' of https://github.com/supertuxkart/stk-code into laps 2014-07-25 14:18:54 +02:00
konstin
4e73ace0df allow the track info dialog to override the default lap number for a track 2014-07-25 14:06:04 +02:00
konstin
58a8a4ff31 fix index 2014-07-25 13:02:47 +02:00
hiker
9267e2d304 Merge branch 'lapnumber' of https://github.com/konstin/stk-code into konstin-lapnumber 2014-07-24 16:48:03 +10:00
konstin
eae71b3df9 remove C++11 2014-07-24 08:41:45 +02:00
Flakebi
bfd54cf37c Split kart selection screen into more files 2014-07-23 22:08:22 +02:00
konstin
eb5e148aa7 resolve conflict 2014-07-23 21:52:53 +02:00
konstin
7978c25fc5 more improvements 2014-07-23 21:49:53 +02:00
konstin
b6d7834c85 removing unnecessary codes and compiler warnings 2014-07-23 21:25:31 +02:00
konstin
e4f7b6041c use parent to remove copy+paste code 2014-07-23 16:43:25 +02:00
konstin
1d8b4c352d deriving GPWIn 2014-07-23 15:33:09 +02:00
konstin
02d21053fc begining with grand_prix_cutscene.cpp (first compiling prototype) 2014-07-23 15:28:57 +02:00
Flakebi
4fe34007cd Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-07-23 15:18:46 +02:00
Flakebi
0195d95bad Adding basic gui for per-player difficulties 2014-07-23 15:18:40 +02:00
konstin
80e61e0ca0 Adding save Button for random GP 2014-07-23 10:01:29 +02:00
Marianne Gagnon
06e4cbb9be Fix input config screen, since the list widget was improved it didn't display quite right 2014-07-22 20:09:38 -04:00
Flakebi
55090a0566 Unify log output 2014-07-22 12:54:11 +02:00
Flakebi
53fd34f7b8 Fix issues with in-game screens 2014-07-22 12:54:11 +02:00
Marianne Gagnon
fff498b9fe Improve graphics settings dialog to try to avoid mutually incompatible options 2014-07-21 19:58:45 -04:00
konstin
7a8743fb65 better text alingment in GP info dialog 2014-07-18 16:03:23 +02:00
konstin
0a93b7a2d3 fix #1410 2014-07-18 15:58:34 +02:00
Flakebi
a77778b1cd Display skill labels only once 2014-07-17 21:33:25 +02:00
konstin
b0f3a48d80 close #1397 2014-07-16 16:02:36 +02:00
konstin
ea56f66d83 Revert "unify separators" 
This reverts commit ad641eff67.
 2014-07-16 15:46:52 +02:00
konstin
ec73fcb2b7 minor stuff 2014-07-16 15:40:27 +02:00
konstin
0ec2cd6dc1 Merge branch 'master' of https://github.com/supertuxkart/stk-code into asdf 2014-07-16 15:16:11 +02:00
hiker
d0784f3fcd Fix #1407 (huge rank number in FTL HUD). 2014-07-16 16:28:32 +10:00
hiker
a8b2ad4f0a Merge remote-tracking branch 'origin/master' into konstin-m_random_gp 2014-07-16 08:12:16 +10:00
hiker
649848cac2 Mostly cosmetic changes (renamed variables, added comments). Changed 
'random' constructor of GrandPrixData into a function so that there
is no need to create a new GPData objects and then copy it.
 2014-07-16 08:11:09 +10:00
konstin
ad641eff67 unify separators 2014-07-15 17:15:42 +02:00
konstin
0df72779a9 Use default laps for track info dialog 2014-07-15 17:10:37 +02:00
Marianne Gagnon
a3dbb53540 Minor code tweaks for the new feature unlocked scene 2014-07-14 21:39:11 -04:00
hiker
f24e53538c Merge branch 'master' into konstin-m_random_gp 
Conflicts:
	src/states_screens/dialogs/gp_info_dialog.cpp
 2014-07-15 11:07:44 +10:00
hiker
ccb8d0e973 Fix crash: a reference to a string in a widget was used after the 
widget was deleted.
 2014-07-15 09:10:54 +10:00
hiker
ab57903f9f Try to convert m_gp from a GPData pointer to a GP object, compiles, but 
crashes.
 2014-07-14 23:08:46 +10:00
hiker
f24a000f78 Merge branch 'm_random_gp' of https://github.com/konstin/stk-code into konstin-m_random_gp 2014-07-14 14:54:59 +10:00
Marianne Gagnon
b456205b56 Another attempt at fixing kart selection screen, hopefully the right one 2014-07-13 19:48:13 -04:00
Marianne Gagnon
2be5c99d47 fix assertion failure on kart selection screen caused by manipulating variables directly instead of using the appropriate methods 2014-07-13 19:08:07 -04:00
Marianne Gagnon
6f0e3c0c08 Remove useless RTT and simplify rendering of icons on the minimap 2014-07-11 20:50:42 -04:00
konstin
4633d82c23 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-07-09 21:19:17 +02:00
Marianne Gagnon
8c74ab5e14 Forgot to hide debug item 2014-07-08 22:07:49 -04:00
Marianne Gagnon
ed97fca7b3 Ease debugging GPWin/GPLose/FeatureUnlocked scenes 2014-07-08 20:37:39 -04:00
konstin
ce7da4b237 running whitespace.py 2014-07-08 20:59:34 +02:00
konstin
240f0ec6b7 remove m_random_gp 2014-07-08 18:34:54 +02:00
hiker
32707b8f88 Changed m_grand_prix of RaceManager to be an object (and not a pointer to 
an object) anymore, which fixes a memory leak (and I also reverted my quick
fix from last night de7ceb0c2d to fix a crash,
which now not necessary anymore.
 2014-07-08 13:20:53 +10:00
Marianne Gagnon
e229effba0 Fix gnu and sara on kart selection screen 2014-07-07 19:43:49 -04:00
hiker
5611f1544d Fixed VS compilation. 2014-07-07 16:54:25 +10:00
hiker
c222bbcb1c Merge branch 'a' of https://github.com/konstin/stk-code into konstin-a 2014-07-07 16:15:34 +10:00
hiker
736c7264b9 Merge branch 'properties' of https://github.com/solistice/stk-code into properties 2014-07-04 08:34:48 +10:00
Bart Cools
c274a3beef Inserted fix for wrong use of parameters. The kart bars are now set correctly, but the use of "magical numbers" in the bars should be avoided somehow 2014-07-03 23:42:34 +02:00
hiker
be3882845c Merge branch 'properties' of https://github.com/solistice/stk-code into properties. 
Fixed conflict.
Conflicts:
	src/guiengine/widgets/model_view_widget.cpp
 2014-07-03 14:17:45 +10:00
Bart Cools
4a13eebc00 Merge branch 'master' into properties 2014-07-01 13:55:10 +02:00
Marianne Gagnon
394fb9be9b Merge branch 'master' into NewRTTMinimap 2014-06-26 20:23:02 -04:00
Bart Cools
000fa2cf73 Fixed skill bars to return correct values. Also minor fix in kart properties 2014-06-26 13:43:53 +02:00
vlj
79838bffe3 Add 50% transparency to minimap. 2014-06-26 00:46:55 +02:00
konstin
a8343b2885 Merge branch 'master' of https://github.com/supertuxkart/stk-code into a 2014-06-24 16:42:18 +02:00
Marianne Gagnon
e9acaa8e4d Do not hardcode minimap size 2014-06-23 19:34:29 -04:00
konstin
01623da5e9 remove +1 2014-06-23 16:13:54 +02:00
Marianne Gagnon
484f4b7e00 Merge branch 'master' into NewRTTMinimap 2014-06-21 18:56:11 -04:00
konstin
98f8ddb4e9 fix path to icon 2014-06-21 17:18:01 +02:00
konstin
59a14df340 fix track group spinner 2014-06-21 17:16:23 +02:00
konstin
f4ce845b6f Merge branch 'master' of https://github.com/supertuxkart/stk-code into a 2014-06-21 16:20:53 +02:00
konstin
7e9361bc8b avoid reading deallocated memory 2014-06-21 16:19:37 +02:00
hiker
78864c5df0 Removed unused variables. 2014-06-20 15:44:59 +10:00
hiker
eaded3bf46 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-20 11:04:15 +10:00
hiker
82d8cbf875 Fixed display or kart name in top left corner (caused by calling 
add on the label widget twice).
 2014-06-20 11:00:43 +10: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
9b89868320 reflect changes in network kart selection 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
e7852648fa Changes to the Skill Level Widget, only bar refuses to show 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
Flakebi
e16a7de617 Change xml style of screens and fix some issues with screens 2014-06-19 09:49:36 +02:00
Marianne Gagnon
cd9c2653b6 Initial work on porting minimap to new RTT 2014-06-17 19:26:12 -04:00
Marianne Gagnon
b9c45b7e0f Undo dubious code that causes crashes 2014-06-17 18:14:24 -04:00
Marianne Gagnon
6a4e46af5c Fix more issues on feature unlocked screen 2014-06-17 18:13:40 -04:00
hiker
a50177c96a Removed messages.?pp files (and used the strings directly where they 
are needed).
 2014-06-16 22:05:50 +10:00
hiker
364c7434f6 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-13 09:09:36 +10:00
hiker
d36ff8b6db Call reset function of RaceGUIBase, which fixes #1363 (missing thunderbird). 2014-06-13 09:07:52 +10:00
Marianne Gagnon
e3a2246e25 More work on cutscene screens 2014-06-12 18:43:20 -04:00
hiker
8228a5bc15 Merge branch 'master' of https://github.com/Flakebi/stk-code into Flakebi-master 2014-06-12 22:09:49 +10:00
hiker
025d7fa114 Tweaked position of font somewhat. Fixed missing rank display 
when kart is standing still.
 2014-06-12 22:00:00 +10:00
hiker
cfe93f96f2 Speed up the rank animation, and don't make the old value completely 
disappear (which makes the animation even faster).
 2014-06-12 15:58:40 +10:00
Marianne Gagnon
e5532c32ff Improve code to switch between GUI-cutscenes. Still not fully functional, but better 2014-06-11 19:37:04 -04:00
hiker
1dc63849c9 Use a sigmar as big digit font and display time and 
lap using this font (temporarily till we agree on a font).
 2014-06-12 09:27:45 +10:00
Marianne Gagnon
ffe657b1c2 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-06-10 19:59:37 -04:00
Marianne Gagnon
8a4b4ae213 Update cutscene shortcuts 2014-06-10 19:59:30 -04:00
hiker
97a23e83cb Merge branch 'big_digit' 2014-06-11 09:22:57 +10:00
hiker
e55d976aa2 Added simple animation when the player rank changes. 2014-06-10 16:58:43 +10:00
hiker
02b0cfd069 Use big digit font to display the kart rank inside of the speedometer. 2014-06-09 22:38:19 +10:00
Marianne Gagnon
61d6caa521 Work on feature unlocked scene 2014-06-07 19:51:34 -04:00
hiker
d0879cf075 Removed file that should never have been added in the first place ;) 2014-06-06 21:53:57 +10:00
Flakebi
de4e45280b Remember password better 2014-06-06 11:31:52 +02:00
Flakebi
03255a4156 Merge upstream/master into Flakebi/master 2014-06-06 10:06:25 +02:00
Marianne Gagnon
be5577045d Work on new feature unlocked cutscene, starting to work correctly, more testing (and art work) needed 2014-06-05 20:06:27 -04:00
hiker
d5d7f5bd92 Fixed logout of old player when switching to a new player. Fixed 
disabling the account name (to prevent people from changing their
online name).
 2014-06-06 08:05:25 +10:00
Flakebi
cd8c27cbec Save 'remember-password' setting per user 2014-06-05 22:07:00 +02:00
konstin
acc32703ed Merge branch 'master' of https://github.com/supertuxkart/stk-code into a 2014-06-05 18:26:28 +02:00
konstin
173725a9d4 add a restart button + better looking on 600x800 2014-06-05 18:26:11 +02:00
hiker
b61e8e24db Disable online flag in register screen if user did not enable 
internet in the dialog. Removed unused function.
 2014-06-05 21:28:30 +10:00
hiker
48b9016384 Fixed compiler warnings. 2014-06-05 17:07:54 +10:00
Marianne Gagnon
02c68d5b02 Merge branch 'NewRTTWidget' 2014-06-04 20:46:24 -04:00
hiker
b417a5c612 Fix deactivating entry field. 2014-06-05 10:12:26 +10:00
Vincent Lejeune
5f1413e140 Merge branch 'master' into NewRTTWidget 2014-06-05 01:30:45 +02:00
hiker
e3513b10c6 Merge branch 'master' of https://github.com/Flakebi/stk-code into Flakebi-master 2014-06-05 08:23:47 +10:00
hiker
781820abef Fix the online name (to force people to use only one online name). 
This prevents people from passing achievements from one online
account to another (once two way synching is in place).
 2014-06-05 08:17:59 +10:00
Flakebi
d7b3e0f46a Fix RegisterScreen 2014-06-04 16:45:54 +02:00
Flakebi
af6c121a22 Run whitespaces.py 2014-06-04 15:10:20 +02:00