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

2523 Commits

Author SHA1 Message Date
Marianne Gagnon
90b95c7fb5 Make sure there is music when winning a GP, fixes #2296 2015-08-31 19:33:05 -04:00
Marianne Gagnon
63ab79ff8d Fix string on GP result screen, fixes #2295 2015-08-25 21:28:09 -04:00
hiker
e6ad28cc81 Fixed #2097 (allow friends to be sorted). 2015-08-24 08:09:32 +10:00
hiker
309097b0db Fixed #2151 (by disabling 800x600 resolution, except in artist debug mode). 2015-08-20 11:03:46 +10:00
Flakebi
586724c855 Merge branch 'master' into kart-properties 
Conflicts:
	src/karts/kart.cpp
 2015-08-19 12:03:43 +02:00
Flakebi
80a649fc2d Merge branch 'master' into test 
Conflicts:
	src/utils/string_utils.hpp
	src/utils/translation.cpp
 2015-08-17 00:22:02 +02:00
Flakebi
b51eadae28 Merge branch 'master' into kart-properties 2015-08-16 16:45:47 +02:00
Torbjörn Söderstedt
bc4e532510 Use actual screen size when fading cutscenes. 2015-08-12 22:54:42 +02:00
Marianne Gagnon
70799539a6 Add graphical level preset between 4 and 5, the difference between the 2 was a little too steep 2015-08-10 19:04:35 -04:00
Marianne Gagnon
bc67f4f503 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-08-09 21:40:05 -04:00
Marianne Gagnon
d488c043d1 Continue work on scripting, fixing #2268. Use this as an opportunity to clean up a lot of old hardcoded overworld code, and replace it with cleaner scripting. Make sure to update SVN and the exporter (other commits in SVN coming soon) 2015-08-09 21:38:01 -04:00
Deve
fe1222c5cc Don't add tracks in reversed mode when it's not available. 
This fixes #2158.
 2015-08-09 20:52:12 +02:00
Deve
7ae541e638 Reload selected GP after changing the name. 
This fixes #2159
 2015-08-09 13:12:20 +02:00
konstin
c79c51e6c7 allow enabeling Network Multiplayer through CMake flags 2015-08-08 14:29:14 +02:00
hiker
2f902f769d Fixed minor memory leak. 2015-08-01 22:02:00 +10:00
Tobias Markus
a9761e30da Fix various issues reported by coverity 2015-07-30 18:46:01 +02:00
Marianne Gagnon
738e7bc780 Fix inverted if condition in input options screen, fixes #2255 2015-07-29 18:55:40 -04:00
hiker
b18d0275fd Display a finish (survival) time in FTL result screen. 2015-07-29 17:27:43 +10:00
Flakebi
5d36b95c95 Merge remote-tracking branch 'upstream/master' into kart-properties 
Conflicts:
	data/stk_config.xml
	sources.cmake
	src/karts/kart.cpp
	src/karts/kart.hpp
	src/karts/kart_properties.cpp
	src/karts/kart_properties.hpp
	src/tracks/track.cpp
 2015-07-29 02:48:43 +02:00
hiker
d27ba5f6fe Fix #2249 (show points and points increasing in a FTL GP). 2015-07-29 08:58:42 +10:00
hiker
6ada5a0666 Revert "Properly ignore the leader in the ftl scoreboard" 
(this patch only fixed the problem that happens when a non-leader
is number one. By now the code has fixed that it is guaranteed
that the leader is always number one, so this patch is not
necessary anymore, and it complicates the loop).

This reverts commit e9d78326fb.

Conflicts:

	src/states_screens/race_result_gui.cpp
 2015-07-29 08:12:23 +10:00
hiker
5efb44a430 Fixed scores in FTL GPs. All score handling is now done by the World, 
not race manager (which removes if tests).
 2015-07-28 09:39:00 +10:00
hiker
5c66273712 Fixed compiler warning. 2015-07-27 16:41:46 +10:00
hiker
d9e806f610 Changed unsigned int to int (dest_pos can become negative, and 
while de-facto it still works with unsigned, it's just bad style :) ).
 2015-07-26 00:32:11 +10:00
hiker
a9aa37ea97 Minor code style fixes. 2015-07-26 00:31:15 +10:00
hiker
c8909b9197 Fixed missing display of points for non-winners in a FTL GP (partly fix 
for #2249).
 2015-07-26 00:30:09 +10:00
hiker
cd256061e1 Fix #2248 (crash when taking screenshot). The assert was not appropriate 
(avoiding the call to clearAllMessages would have been quite ugly).
 2015-07-26 00:26:43 +10:00
hiker
76a779fc1c Merge branch 'ftl-scoreboard' of https://github.com/Flakebi/stk-code into Flakebi-ftl-scoreboard 2015-07-25 12:17:02 +10:00
hiker
8bc398a1c1 Merge remote-tracking branch 'origin/master' into Flakebi-fixes 2015-07-24 10:23:47 +10:00
Marianne Gagnon
aacf1293da Eliminated karts in GPs get 0 points. Fixes #2177 2015-07-23 20:01:54 -04:00
Flakebi
2eb0f151b7 Fix reversed rtl string part 2015-07-21 11:52:23 +02:00
Flakebi
1317714ba1 Adjust the speed and power values 2015-07-12 01:09:01 +02:00
Flakebi
5bfb1a2c6b Fix some bugs 2015-07-12 00:39:38 +02:00
Flakebi
9fc6f84545 Switch from properties to characteristics 2015-07-11 19:22:27 +02:00
Flakebi
fbf26df23d Merge branch 'master' into fixes 
Conflicts:
	src/graphics/2dutils.cpp
	src/graphics/graphics_restrictions.cpp
	src/graphics/render_skybox.cpp
	src/graphics/rtts.hpp
 2015-07-03 15:29:53 +02:00
hiker
9b562d31f4 Replaced Widget's set(De)Activated functions with one setActive(bool) 
function, which simplifies code for various screen a lot.
 2015-07-03 16:19:28 +10:00
Marianne Gagnon
be81a7fd11 Increase size of popup, text was truncated at least in french 2015-06-23 18:46:36 -04:00
Marianne Gagnon
0fdc7a2d98 Use plural form for resolution change message, fixes #2219. ALso fix crash in tinygettext code handling plural forms 2015-06-22 19:26:20 -04:00
Marianne Gagnon
e35d5a07b4 Little hack : make the kart selection screen seem faster by moving the cursor immediately, and loading the kart model only on next frame. See #2216 2015-06-11 20:22:30 -04:00
hiker
d4f3fc88d6 Merged pull requests #2191. 2015-06-02 14:50:32 +10:00
hiker
8fd0b9186a Merge pull request #2198 from nado/Fix-#2164 
Fix #2164 : Resized max length of mail address up to 254 chars
 2015-06-02 13:47:54 +10:00
Marianne Gagnon
722cd0e181 Merge branch 'Scripting' 2015-05-21 19:29:01 -04:00
Nado
2b36759ba3 Resized max length of mail address up to 254 chars 2015-05-18 09:33:21 +02:00
Marianne Gagnon
080936f144 Work on scripting 2015-05-17 19:27:25 -04:00
hiker
c91f9655d8 Unlock all karts in multiplayer mode. 2015-04-29 08:18:52 +10:00
hiker
75b24c96ad Unlock all tracks and GPs in split screen mode. 2015-04-29 08:07:06 +10:00
Flakebi
af88b4a16f Fix translation issues with grand-prixs 2015-04-26 23:31:57 +02:00
Flakebi
56aecdb692 Fix achievements RTL display 2015-04-25 16:10:54 +02:00
Flakebi
4b55526525 Clean more stuff for the new insertValues 2015-04-24 01:58:19 +02:00
hiker
00782180f7 Fixed crash when using translation debugging (only happens if 
DEBUG_TRANSLATIONS is defined).
 2015-04-16 15:28:49 +10:00
Flakebi
effe131e4a Dynamically test if text is rtl or not 2015-04-09 01:57:33 +02:00
hiker
c7e785b59c Fixed translator credits display (translators were repeated before). 
Added #undef'ed debug mode to only see translations.
 2015-03-31 16:16:30 +11:00
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
hiker
bcd9654a86 Added missing GPL license. 2015-03-30 11:42:28 +11:00
Flakebi
114644233a Improve RTL display of track names in story mode 2015-03-30 01:23:01 +02:00
Flakebi
06c8089dfc Fribidize more strings 2015-03-30 01:22:57 +02:00
Flakebi
e9d78326fb Properly ignore the leader in the ftl scoreboard 2015-03-29 04:16:24 +02:00
hiker
02d5b43d86 Replaced all texture->getOriginalSize() with texture->getSize() 
to take potentially resized textures properly into account.
 2015-03-26 17:12:51 +11:00
Marianne Gagnon
262eeca87f Update configuration of HD textures in GUI, especially through presets 2015-03-25 20:53:05 -04:00
Marianne Gagnon
5e34ac3a44 Fix bug #2037 (objects in library objects with curve animations not working) 2015-03-18 21:48:22 -04:00
ZyperPL
d9405aab3a Fixed highscores update 2015-03-14 16:16:41 +01:00
hiker
41a67d4250 Added privacy notice to 'enable internet' dialog; used redirecting 
URLs for privacy and terms&conditions.
 2015-03-12 10:33:42 +11:00
Marianne Gagnon
9d5c735ccb Merge branch 'tooltip' 2015-03-10 19:48:21 -04:00
Flakebi
e5abf4cec3 Merge branch 'origin/master' into fixes 2015-03-08 01:16:51 +01:00
Marianne Gagnon
c8ae3d117a Merge branch '1954-fix' 2015-03-03 18:58:26 -05:00
hiker
04ebd528bf Revert "Check the translation of the terms to make sure that they include" 
This reverts commit 53a830be0b.
 2015-03-02 18:26:21 +11:00
Marianne Gagnon
d5736f3a5e Fix #1954, part 1 2015-03-01 22:04:20 -05:00
hiker
53a830be0b Check the translation of the terms to make sure that they include 
our official url. If it is not contained, use the original English
terms.
 2015-03-02 08:45:56 +11:00
Flakebi
f9919c462f Improve tooltip text and center tooltips 2015-03-01 22:30:33 +01:00
hiker
a5d800d8d6 Made terms&conditions translatable (but hard-coded the URL). 2015-03-02 07:55:39 +11:00
hiker
cab6149193 Cosmetic change for coding style (removed 2 unnecessary constructors). 2015-03-01 22:46:03 +11:00
Marianne Gagnon
c205aa533b Add outline on font for instructions in the overworld, fixing cases where the text is hard to read 2015-02-28 20:41:12 -05:00
hiker
f542aea53d Fixed line endings style. 2015-02-27 22:33:03 +11:00
hiker
832aefeceb Bugfix: A user that was not online previously could not enter an online 
username if a user with an online user name was shown before.
 2015-02-26 16:29:10 +11:00
Flakebi
6805ead6e6 Add tooltip to explain usage of per-player handicaps 2015-02-24 23:24:28 +01:00
Marianne Gagnon
e3c408fc0e Implement interface to allow disabling IBL 2015-02-22 18:25:59 -05:00
Marianne Gagnon
975aa7628b Fix #1981 2015-02-14 18:36:03 -05:00
Flakebi
92f78aae29 Improve sorting resolutions 2015-02-13 11:47:10 +01:00
Flakebi
6e8f8a15bd Sort resolutions by size 2015-02-13 11:47:10 +01:00
hiker
cdb35b0804 Added missing initialisation, fixed line endings. 2015-02-13 08:42:09 +11:00
hiker
f437781dcc Fix #1980. 2015-02-13 08:41:19 +11:00
hiker
72ce6c8bf6 Fixed race over music not playing when sfx are disabled. 2015-02-12 07:57:51 +11:00
hiker
7d0875878b Simplified startMusic call. 2015-02-10 17:27:07 +11:00
hiker
325d1a11c1 Merge branch 'rename-h' of https://github.com/Flakebi/stk-code into Flakebi-rename-h 2015-02-10 11:34:21 +11:00
hiker
70ed2b47d0 Fix #1962. 2015-02-09 08:22:35 +11:00
Marianne Gagnon
758eb6e003 Use label with word_wrap instead of list for terms. See #1812 2015-02-06 20:11:15 -05:00
Flakebi
d56472c224 Rename some .h files to .hpp 2015-02-05 21:32:17 +01:00
Flakebi
366f8a26bb Fix more clang warnings 2015-02-05 02:44:06 +01:00
auriamg
f4909d7c46 Merge pull request #1957 from Flakebi/highscore 
Improve the layout of the race result screen
 2015-02-04 18:50:54 -05:00
Flakebi
32a044e292 Fix some clang warnings and bugs 2015-02-04 18:30:27 +01:00
Flakebi
1aa6f7c173 Improve the layout of the race result screen 2015-02-04 14:42:10 +01:00
hiker
b9a7c11dab Removed unnecessary #includes. 2015-02-03 14:30:18 +11:00
Flakebi
d6fee72295 Merge branch 'origin/master' into fixes 
Conflicts:
	src/graphics/graphics_restrictions.cpp
 2015-01-23 00:15:40 +01:00
hiker
e17add7bc8 Allow users to enable high res textures, even if their default 
value stats that they should be disabled.
 2015-01-22 11:38:15 +11:00
hiker
b6c26651e0 Pre-fill online username with local username. 2015-01-21 08:14:56 +11:00
hiker
f923a317a8 Select offline tab when internet access is disabled. 2015-01-20 16:39:06 +11:00
Flakebi
9c6dd1c1b5 Fix some compiler warnings 2015-01-18 23:28:53 +01:00
hiker
a74a20c699 Enable all message dialogs to work in the DialogQueue. 2015-01-18 12:40:06 +11:00
Marianne Gagnon
a2c8e1d982 Prevent crashes due to invalid values in shadow resolution 2015-01-12 19:05:54 -05:00
hiker
ba484d8be2 Fixed incorrect default selection in tabbed screen. 2015-01-13 08:12:43 +11:00
hiker
d70a398cc8 Merge branch 'Flakebi-fixes' 2015-01-13 08:06:39 +11:00
hiker
47026e614c Merge branch 'fixes' of https://github.com/Flakebi/stk-code into Flakebi-fixes 2015-01-12 22:29:08 +11:00
hiker
d47981dd43 Auto-login a new user from the register screen, without requiering 
to select the user or enter the password again.
 2015-01-12 22:27:45 +11:00
hiker
370091e1b9 Removed debug code. 2015-01-12 16:36:42 +11:00
hiker
342cb82653 Merge branch 'new_register_screen' 2015-01-12 12:19:56 +11:00
hiker
a2006c3e16 Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-12 12:10:23 +11:00
hiker
7bd1126df8 Improve flow from register screen back to user screen. Now password 
and online user name do not need to be added again.
 2015-01-12 09:41:34 +11:00
Vincent Lejeune
019ec344fe Allow to reduce shadow resolution 2015-01-11 00:45:38 +01:00
Flakebi
3128e59d22 Update checkboxes and textfield in the tabbed user screen too 2015-01-09 21:37:02 +01:00
hiker
5ccedfc349 Use tabs in register screen (work in progress). 2015-01-09 09:42:18 +11:00
hiker
b0879514fb Merge branch 'master' of github.com:supertuxkart/stk-code 2015-01-08 13:33:16 +11:00
hiker
520625adae Removed 'sign' (in/out), use 'log' (in/out) instead. 2015-01-08 13:32:50 +11:00
hiker
474012c442 Prevent potential NULL pointer access. 2015-01-08 08:15:58 +11:00
Deve
2b6ef130da Make sure that next track is not higher than tracks size. 2015-01-07 21:42:22 +01:00
Deve
85800f48e6 Disable saving GPs on abort for now because it requires proper implementation. 
m_next_track should have higher value in this case because race is already finished.
 2015-01-07 21:24:52 +01:00
Deve
2d9e38f7f6 Display continue button only if next track isn't first available in GP. 
Fixed a crash.
 2015-01-07 21:15:53 +01:00
Marianne Gagnon
3a06962ec8 Don't use the digits font to render text, fixes #1864 2015-01-05 20:05:31 -05:00
Marianne Gagnon
c87531fc1b Disable auto-exit-on-animation-over for feature unlocked screen, should fix #1819 2015-01-05 19:36:04 -05:00
leper
cb3babef64 Fix some warnings. 2015-01-02 18:16:34 +01:00
konstin
fa10561d09 Merge branch 'master' of https://github.com/supertuxkart/stk-code into lights 2015-01-01 23:05:26 +01:00
Vincent Lejeune
d84d6381ea Remove lightning call 
It should use modern opengl call.
 2015-01-01 21:12:15 +01:00
konstin
531b94a0ac cleaning up and adding radius and energy sliders 2014-12-30 18:47:25 +01:00
Deve
c36ca55451 Restore tab name in tracks screen to avoid problems with gettext and to keep consistency with arenas/easter egg screens 2014-12-30 13:22:25 +01:00
Marc Coll Carrillo
00d27b3c63 Don't translate internal "nextgen" track group 2014-12-30 13:19:42 +01:00
Marc Coll Carrillo
a9193e09fd Unify random GP's ID and translatable name in a single place 2014-12-30 13:19:24 +01:00
Marc Coll Carrillo
9e6cd2a958 Fix translation problems in random GP screen 2014-12-30 13:19:10 +01:00
Deve
3e6677b755 Rename "title" to "name" in achievements to keep consistency with other xml files such as tracks and karts 2014-12-27 22:43:25 +01:00
Vincent Lejeune
f644543bc1 Move all gfx related config to a separate file 2014-12-27 03:14:16 +01:00
GunChleoc
5a7f7781af Some string fixes. 2014-12-23 13:24:50 +00:00
Deve
4f910713f5 Make some strings translatable 2014-12-20 14:03:11 +01:00
Marianne Gagnon
0af3f3de83 Misc tweaks, mainly to include new island tracks in challenges and GPs, and other minor fixes 2014-12-15 21:34:22 -05:00
Deve
dff1a330ea Fixed crash in kart selection screen 2014-12-12 19:36:53 +01:00
Marianne Gagnon
3226189d82 Force disable shadows and GI when OpenGL is not recent enough. Fixes #1722 2014-12-11 20:18:00 -05:00
Marianne Gagnon
334cca21ad Merge branch 'Math07_master' 2014-12-10 21:06:09 -05:00
hiker
05f2af79c9 Fixed #1770 (tabs disappear). 2014-12-09 16:50:16 +11:00
hiker
f0d430c833 Fix #1761 (Players tab in Options autofocus issue). 2014-12-08 15:22:12 +11:00
Mathieu Laprise
107e434fe9 Missing button in grand prix editor name dialog #1765 2014-12-06 15:14:27 -05:00
Marianne Gagnon
68db893e84 Message dialog: set buttons text before layout occurs, so that buttons get the proper size. Fixes #1764 2014-12-05 21:11:56 -05:00
hiker
5cb3e90dfc Fixed displaying online friend achievements. 2014-12-03 12:24:30 +11:00
hiker
4d3bbd2c78 Fixed translation support. 2014-12-03 11:40:04 +11:00
Marianne Gagnon
d38b7ca080 Fix a few strings 2014-12-02 18:38:54 -05:00
hiker
9dc6425242 Merge branch 'master' of https://github.com/thamlett/stk-code into thamlett-master 2014-12-03 08:05:34 +11:00
Timothy Hamlett
42d6f0480c Actually fix #1754 
Thanks to Hiker for the help!
 2014-12-01 21:48:12 -06:00
Timothy Hamlett
b0dbacc386 Fix #1754 2014-11-30 22:26:36 -06:00
hiker
006a7f95c9 Cherrypicked pull request #1743 (cppcheck performance fixes). 2014-12-01 15:14:27 +11:00
Marianne Gagnon
f31a458fb8 Disable compressed textures checkbox in options where unsupported 2014-11-30 18:44:43 -05:00
Marianne Gagnon
12c54cb92b Revert old workaround, fix the original issue in a cleaner way 2014-11-26 19:30:09 -05:00
Flakebi
c4cdfc4a0e Merge branch 'upstream/master' into fixes 
Conflicts:
	src/input/input_manager.cpp
	src/states_screens/kart_selection.cpp
 2014-11-26 07:34:26 +01:00
hiker
ea3a433147 Fix #1620 (Player's achievements can only be seen when logged in). 2014-11-25 17:12:47 +11:00
Deve
220d3dbc9a Restore screenshot properties 2014-11-24 20:41:49 +01:00
Deve
54b311f6f7 Allow to set custom ratio for images from xml file. 
It avoids crashes and memory leaks after changing resolution.
 2014-11-24 19:31:46 +01:00
hiker
9a02693d31 Fixed compiler warnings, renamed playerID to player_id (to follow 
our style guide).
 2014-11-23 21:13:49 +11:00
Marianne Gagnon
5d5460d845 Add way to test intro cutscene easily; do not throttle sound effects on cutscenes 2014-11-22 18:21:31 -05:00
Flakebi
632efb296c Fix first player in kart selection doesn't get focused 2014-11-22 13:35:31 +01:00
Marianne Gagnon
229a43a692 Preserve "startedFromOverworld" flag value properly. Fixes #1683 2014-11-17 19:07:37 -05:00
auriamg
af35bce41d Merge pull request #1714 from Flakebi/fixes 
Some minor fixes
 2014-11-16 21:21:45 -05:00
Vincent Lejeune
3cf3af57d8 Avoid using null pointer in feature_unlocked.cpp 2014-11-17 01:11:40 +01:00
Flakebi
f1383d1a93 Deactivate some checkboxes without advanced pipeline 2014-11-17 00:08:47 +01:00
Flakebi
be999895b4 Remove some unused code 2014-11-17 00:08:47 +01:00
Flakebi
b8484d3576 Fix #966 Don't select a kart/keyboard configuration automatically in multiplayer 2014-11-16 22:35:03 +01:00
hiker
8a60550e8b Prevent online user names starting with 0-9 (for #1471). 2014-11-15 12:56:04 +11:00
Deve
1a3ecf39fe Fixed crash in track info screen after changing resolution. 
Widgets after changing resolution are deleted, but TrackInfoScreen object and m_screenshot variable still exsist. Therefore check if it's not NULL isn't enough.
 2014-11-14 21:07:12 +01:00
hiker
753c3d7168 Fixed #1638 (text overflows behind buttons) - partially by removing 
the confirmation field for the emal address.
 2014-11-13 22:42:32 +11:00
hiker
25b4d35a65 Merge branch 'perPlayerDifficulties' of https://github.com/Flakebi/stk-code 2014-11-12 15:45:03 +11:00
Marianne Gagnon
2c8f86fabd Intro cutscene fixes 2014-11-05 18:13:47 -05:00
Flakebi
9dd86c8332 Don't handicap AIs 2014-11-04 23:57:33 +01:00
Deve
66a1ff2b2b Don't allow to run locked tracks in random GPs 2014-11-04 20:10:36 +01:00
Marianne Gagnon
aeed2618a4 Set anisotropic filtering to 16 on highest graphical level, fixes #1655 2014-11-03 17:47:07 -05:00
hiker
0be0d7ee72 Merge branch 'perPlayerDifficulties' of https://github.com/Flakebi/stk-code into Flakebi-perPlayerDifficulties 2014-11-03 06:52:31 +11:00
Flakebi
9ca1c03480 Applying merges correctly is difficult... 2014-10-31 18:54:52 +01:00
Flakebi
abf7bacfea Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	src/graphics/stkmesh.cpp
	src/states_screens/kart_selection.cpp
 2014-10-31 16:47:34 +01:00
hiker
b56280761f Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-31 15:32:26 +11:00
hiker
e9980fcb2f Completely removed device type, instead use isGamePad() and 
isKeyboard().
 2014-10-30 17:43:50 +11:00
Marianne Gagnon
aac454f846 Fix bug in feature unlocked screen, improve error message 2014-10-29 20:07:01 -04:00
hiker
b66fb2e56b Removed unnecessary parameter for gamepads in processAndMapInput, 
started a common virtual function for processAndMapInput. Removed
unnecessary #includes, cosmetic changes.
 2014-10-28 09:00:22 +11:00
hiker
99f69f4070 Moved KeyboardConfig and GamepadConfig from DeviceConfig to their 
own separate files.
 2014-10-27 13:26:52 +11:00
Flakebi
46f3fa5f74 Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	data/gui/options_ui.stkgui
	src/graphics/stkmesh.cpp
	src/states_screens/options_screen_ui.cpp
 2014-10-26 17:47:29 +01:00
Flakebi
690e632e1b Move handicap to ui options and to the player name spinner 2014-10-26 16:56:50 +01:00
hiker
ec908d85c6 Split GamepadDevice and KeyboarDevice from input_device into their 
own files. Renamed InputManager::getDeviceList() to getDeviceManager().
 2014-10-25 23:09:00 +11:00
Marianne Gagnon
047c6fc760 Add debug name to meshes and mesh buffers, helps debugging 2014-10-24 19:25:24 -04:00
hiker
2d5af3bee8 Change the text of the login name dynamically (i.e. from local 
name to online name).
 2014-10-24 16:52:37 +11:00
hiker
d1f68ca480 Go to the user screen when clicking on the user button. 2014-10-24 14:00:51 +11:00
hiker
8bc6aa91bb Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-24 10:34:59 +11:00
hiker
1920703f09 Converted label to button, just for tests. 2014-10-24 10:34:10 +11:00
hiker
3372d06759 Removed unused files. 2014-10-24 10:22:27 +11:00
hiker
b4f95d672a Started to indicate the name of the logged in user ... still work in 
progress (black writing on dark grey).
 2014-10-23 22:26:11 +11:00
hiker
69c155063a Added Yes/No dialog box, and used it for the 'allow STK to connect 
to internet' question.
 2014-10-22 09:15:42 +11:00
hiker
c012e98f9b Allow disabling of hw stats collection. 2014-10-22 08:20:26 +11:00
hiker
98a10d5614 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-21 08:49:03 +11:00
hiker
8d9f1aa002 Renamed SoundToggled to toggleSound. 2014-10-21 08:48:21 +11:00
Deve
04933af4b0 Redrawing GP info screen is not needed now. 2014-10-20 23:46:25 +02:00
konstin
4647a50acb Save GP on abort 2014-10-20 23:46:25 +02:00
konstin
ae24c6b40f only one saved GP per GP-ident 
Conflicts:
	src/graphics/glwrap.cpp
 2014-10-20 23:46:25 +02:00
Flakebi
57afd1d585 Merge remote-tracking branch 'origin/master' into perPlayerDifficulties, this time the right branch... 
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/graphics/glwrap.cpp
	src/graphics/weather.cpp
	src/states_screens/user_screen.cpp
 2014-10-20 22:36:54 +02:00
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