Commit Graph

2523 Commits

Author SHA1 Message Date
Benau
94c5ba4193 Add more arena info in track screen 2015-12-24 07:53:49 +08:00
Benau
4e5197e7c1 Different max number of AIs per arena
Now I make large arena like stadium to have max 8 player-slots,
should be very fun to play

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

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

3. Fix wrong size of kart stats bar
2015-12-10 10:25:52 +08:00
Benau
11c4b41f13 More menu fix 2015-12-09 12:42:13 +08:00
Benau
aac5a368b8 Avoid invaild Ai karts number during switching game modes 2015-12-09 01:27:02 +08:00
Benau
2644b0458b Merge remote-tracking branch 'origin/master' into battleAI 2015-12-08 10:09:35 +08:00
auriamg
f0fafc2651 Merge pull request #2245 from Flakebi/kart-properties
Kart properties
2015-12-07 18:44:14 -05:00
Marianne Gagnon
2252495fdc Scripting refactor : add new property animator helper, transfer light animations to this new animator class. Can be used in the future to animate more properties 2015-12-05 19:42:06 -05:00
Benau
8a0cbea933 Merge remote-tracking branch 'origin/master' into battleAI 2015-12-05 16:27:06 +08:00
hiker
97756dd337 Only show kart selection widgets for local (and this means atm only
one) player.
2015-12-04 08:12:29 +11:00
Deve
9b3908cc62 Some lightning improvements:
- move OpenGL-related code to graphics directory, as it should be
- solve issue with applying effect multiple times in multiplayer mode
- remove old already disabled opengl code
2015-12-03 19:25:40 +01:00
hiker
9765c56a44 Enable voting for tracks. 2015-12-03 08:24:17 +11:00
hiker
ee7097af35 Added some default settings for race mode and send them to the server.
Changed major and minor mode in protocols from 1-byte to int, since 1-byte
is too small to store the actual values.
2015-12-03 07:53:56 +11:00
Benau
084a4ee844 Fix crashes when no navmesh
User should have no way to start with ai in battle mode,
when the arena has no navmesh.

Unless artist debug mode or more than 1 human players.
2015-12-02 10:08:03 +08:00
hiker
03d857db3e Removed unnecessary code. 2015-12-02 08:17:03 +11:00
hiker
6d272d8a5a Fixed crash when quicly exiting stk after refreshing the server list. 2015-12-01 23:25:04 +11:00
hiker
109288e0f5 Removed unused code. 2015-12-01 18:10:06 +11:00
hiker
76ddaeaef7 Force refresh of server list when exiting from the server info screen. 2015-12-01 17:47:03 +11:00
hiker
14390c2c5b Cosmetic changes. 2015-12-01 08:28:53 +11:00
hiker
bcfec98fa2 Removed all references to OnlineProfile, which makes LAN and WAN
server behave idential (and it also fixed potential memory leaks).
2015-12-01 07:57:42 +11:00
Flakebi
12a1227f20
Merge branch 'upstream/master' into kart-properties 2015-11-29 22:21:08 +01:00
Flakebi
aea68a2c14
Remove characteristics from kart 2015-11-29 04:08:12 +01:00
hiker
e2a6d1c33c Avoid crash (index could be -1). 2015-11-28 12:32:00 +11:00
hiker
8d843a7317 Show the connected players in the player list of the gui. 2015-11-27 23:05:05 +11:00
hiker
5c0f71ad07 Fixed names utf8ToWide and wideToUtf8; added convenience functions
taking std:;string and core::stringw as parameter (removed .c_str()
in many function calls).
2015-11-26 08:56:03 +11:00
hiker
f81bd5d0c5 Fixed names utf8ToWide and wideToUtf8; added convenience functions
taking std:;string and core::stringw as parameter (removed .c_str()
in many function calls).
2015-11-26 08:47:02 +11:00
hiker
2f126ab226 Moved NetworkPlayerProfile into its own file, added getter and
setters for it.
2015-11-26 07:41:37 +11:00
Marianne Gagnon
c806c1de49 Clear status text in register screen, fixes #2361 2015-11-23 19:04:24 -05:00
hiker
da2671c6ee An 'authorised' client can now tell the server to select karts. 2015-11-23 08:08:23 +11:00
Deve
8a0927f574 Fixed minor inconsistency in video settings dialog.
Regression since 9b562d31f4
2015-11-22 15:33:46 +01:00
Benau
aa9220772f Merge remote-tracking branch 'origin/master' into battleAI 2015-11-22 15:01:41 +08:00
Benau
e1f1461488 Fix some bugs and copyright year 2015-11-22 15:01:22 +08:00
Flakebi
ffa85d2206 Merge remote-tracking branch 'upstream/master' into kart-properties 2015-11-21 23:03:58 +01:00
Benau
62f5be0d9d First playable version of battle AI
TODO:
backwards firing
better handling to obstacles
ai karts number selection
win/lose screen handling

Please use a better navmesh to test
2015-11-21 15:58:03 +08:00
hiker
f05b6f6dd7 Improved handling of cancelling server creation. 2015-11-21 12:21:50 +11:00
hiker
980cdf835d Avoid crash when clicking on (empty) list while server list is being refreshed. 2015-11-16 18:44:14 +11:00
Benau
f4b723de82 Merge remote-tracking branch 'origin/battleAI' into battleAI 2015-11-15 12:29:01 +08:00
Benau
2b0e3b8828 Reverse type and state 2015-11-14 10:38:14 +08:00
Benau
962fe919d2 Color the text (mainly border including title and billboard) base on current skin 2015-11-14 01:06:28 +08:00
hiker
af9018ea64 Moved Server and ServersManager into network directory. 2015-11-12 17:52:04 +11:00
hiker
5fc830825f Refactoring: Created a separate NetworkConfiguration class which stores
all information to create the STKHost.
2015-11-12 09:53:12 +11:00
hiker
8953547305 Store TransportAddress of server in servers data structure. Avoid
copying the currently connected server, instead avoid modifying the
server data structure while while a client is connected to a server.
2015-11-10 08:31:07 +11:00
hiker
453ce8cf60 Added LAN server discovery. 2015-11-09 20:51:00 +11:00
hiker
60f550e9d1 Fixed coding style, removed unnecessary #include in hpp file. 2015-11-06 16:50:58 +11:00
hiker
541509f29a Added new requestPause and requestUnpause commands for protocols,
minor code cleanups and improvements.
2015-11-06 16:11:12 +11:00
hiker
847a788a9c Removed server creation request (which is now down automatically
from STKHost).
2015-11-05 23:34:27 +11:00
hiker
b7b37b9ec9 Updated documentation. 2015-11-05 07:59:28 +11:00
hiker
35793d99c8 Create an STKHost client instance if a connection to client is
requested. The rest of the protocol is handled from STKHost.
2015-11-05 07:57:49 +11:00
hiker
f2aa1ddea6 Code cleanup. 2015-11-05 07:55:59 +11:00
hiker
dc80fb1c11 Updated docs. 2015-11-02 16:24:05 +11:00
hiker
7c51be7724 Removed need for m_fake_refrehs, some coding style improvements. 2015-11-02 09:16:39 +11:00
hiker
0b62d2f82b Created two different constructors for STKHost - one for server, one for client. 2015-11-02 08:11:51 +11:00
hiker
6add49b065 Allow WAN server creation from GUI. 2015-11-01 23:42:24 +11:00
hiker
f05ee47e2b Moved lan/wan setting to static functions in STKHost. 2015-11-01 22:16:57 +11:00
hiker
4aea491ed0 Merge remote-tracking branch 'origin/master' into refactor_networking 2015-10-31 11:41:43 +11:00
auriamg
4762658a88 Merge pull request #2364 from Benau/freetype_cleanup
Clean up freetype code
2015-10-30 20:33:51 -04:00
Deve
8a288f05ff Implement lightning effect using shaders 2015-10-31 01:00:48 +01:00
Benau
b9b2b538fa Clean up freetype code
1. Remove all ifdef of freetype

2. Require freetype in CMake

3. Clean up declaration

4. Add leak check

5. Make script language display better in title
2015-10-30 18:08:02 +08:00
hiker
6297d8c65d Removed NetworkManager and ClientNetworkManager. 2015-10-27 08:23:59 +11:00
hiker
85cca69113 Moved GameSetup handling from NetworkManager to STKHost. 2015-10-25 00:19:30 +11:00
Deve
8bfe048f0f Remember race type in saved GP.
Continue standard race as follow the leader and vice versa doesn't have a sense.
2015-10-21 22:42:59 +02:00
hiker
10c612a0f6 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2015-10-20 22:44:26 +11:00
hiker
6fc4b9c19d Prevent crash in case of issues creating the server. 2015-10-20 09:37:51 +11:00
hiker
46b4d275a9 Minor refactoring and coding style fixes. 2015-10-20 09:34:14 +11:00
hiker
d5a9364ece Minor cosmetic changes. 2015-10-19 17:06:14 +11:00
Marianne Gagnon
1a58df0696 Fix issue in language selection screen (improper utf-8 decoding) 2015-10-18 19:53:20 -04:00
Marianne Gagnon
cee6d9d611 Merge branch 'master' into freetype_lazyloadchar 2015-10-17 21:34:19 -04:00
Benau
f557dce27e Fix some bugs in title font and clean up more code 2015-10-17 01:20:50 +08:00
Benau
a756f9f90e Better title font to all languages
I tested all language, all of the them only needs 2 glyph page
to load their needed chars.
2015-10-13 08:25:25 +08:00
hiker
45954e5881 Minor improvement. 2015-10-12 22:03:46 +11:00
hiker
c1d280eaa1 Cosmetic changes only. 2015-10-12 21:37:22 +11:00
hiker
4b0d4cb853 Fixed typo in comment. 2015-10-11 21:23:39 +11:00
hiker
525cf6df62 Fixed incorrect name of stkgui file. 2015-10-11 21:22:58 +11:00
hiker
f0c04a8bef Started to support LAN servers in the GUI (wip). 2015-10-10 12:13:32 +11:00
hiker
a66af6dc91 Cosmetic changes for coding style. 2015-10-09 16:47:18 +11:00
hiker
4d181d3358 Make icons visible if login status is changed. 2015-10-09 12:52:49 +11:00
hiker
92f18d03dc Removed unnecessary variable. 2015-10-09 09:43:50 +11:00
hiker
d687d17bfe Added (atm not working) LAN server menu entries. 2015-10-09 09:36:08 +11:00
hiker
917905c779 Removed unused functions. 2015-10-08 16:28:23 +11:00
hiker
00e7c35484 Match one more .stkgui and .cpp file name. 2015-10-07 16:37:42 +11:00
hiker
d391727879 Match more .stkgui and .cpp file names. 2015-10-07 16:33:01 +11:00
hiker
3aadc019a3 Made more .stkgui name correspond to the c++ file name. 2015-10-07 12:33:36 +11:00
hiker
14e84ed96b Minor style changes. 2015-10-07 08:22:02 +11:00
hiker
ccf8fd4e68 Renamed stkgui so that .cpp and .stkgui file names are identical. 2015-10-07 08:11:57 +11:00
Deve
6318e8c8f8 Fixed compiler warnings 2015-10-04 16:54:14 +02:00
Benau
3a5ec83ae9 Basic render of text using freetype
This is a testing version of stk using freetype

It enable better arabic font display with less blurred glyph to all fonts thanks to hinting provide by freetype.

TODO: billboard text
2015-10-04 11:59:44 +08:00
Flakebi
5e6e85ab79 Merge branch master into kart-properties 2015-10-03 15:20:06 +02:00
hiker
0e90042a0d Fixed incorrect handling of 0x1a character in credit files
(which can happen in unicode, previously stk would stop
reading files after 0x1a).
2015-09-28 09:12:45 +10:00
Deve
07b0ab0d78 Fixed disabling "remember window pos" button when fullscreen is enabled.
Regression since commit 9b562d31f4
2015-09-26 20:40:10 +02:00
MiroslavR
ccf9cee2ff Fix SuperTux difficulty button state not updating correctly 2015-09-18 20:48:18 +02:00
Marianne Gagnon
b3e2924df0 Fix opening wrong friend profile due to sorting, fixes #2313 2015-09-14 19:04:54 -04:00
Marianne Gagnon
b9183dde21 Bugfix : no music when losing GP, see #2296 2015-09-12 19:54:40 -04:00
Deve
4498870cb8 Merge pull request #2271 from konstin/network_cmake
Allow enabeling Network Multiplayer through CMake flags
2015-09-06 20:33:10 +02:00
Marianne Gagnon
5c342290b0 Fix corrupted text in GP editor 2015-09-01 19:39:21 -04:00
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