Tobias Markus
d8cce95b0e
Add forgotten override's where necessary
2016-02-21 01:36:15 +01:00
Benau
64522d9d13
Merge remote-tracking branch 'origin/master' into fix_replay
2016-02-17 14:03:58 +08:00
Marianne Gagnon
1e0586dc40
Add missing files forgotten in previous commit
2016-02-16 18:52:54 -05:00
Marianne Gagnon
9c49312714
Work on networking GUI, combine older server interfaces with the newer online/profile screens
2016-02-16 18:33:09 -05:00
Benau
71c1fadcd3
Merge remote-tracking branch 'origin/master' into fix_replay
2016-02-16 09:57:41 +08:00
Benau
c8ecb78ffa
Remove useless header
2016-02-15 15:16:26 +08:00
Benau
a6412d7a07
Add ghost icon, use it in race setup screen
2016-02-15 09:28:36 +08:00
Benau
05093852bc
Add sorting support in ghost replay selection screen
2016-02-15 01:12:13 +08:00
Benau
4ea6ea8ea6
Add confirm dialog when deleting replay file
2016-02-14 13:52:16 +08:00
Marianne Gagnon
52b3d533f5
Fix memory management issue
2016-02-13 21:18:03 -05:00
Benau
c46bccc6e3
Finished GUI
2016-02-13 11:55:42 +08:00
Benau
8a121ed32b
Add Ghost replay GUI
2016-02-13 01:34:00 +08:00
Benau
3f89512b34
Remove most isGhostKart() hack when avoidable
2016-02-11 09:01:09 +08:00
hiker
7e6711e163
Renamged NetworkWorld to RaceEventManager (since this class is
...
not a 'world' in the sense our game modes are).
2016-02-11 09:03:51 +11:00
Benau
bb88a0f0ec
Allow auto-save replay when specified in time trial mode.
...
It will disable AI when recording, also it will only save if the
race is completed, ie no one gave up or all events fit in max frame recorded.
2016-02-11 00:42:33 +08:00
hiker
99bc5477a2
Use a password to authenticate the client that is allowed to
...
control a server (now the controlling client can reconnect in
case it gets disconnected, previously with only allowing the host
with id 1 to control, the server could not be controlled anymore).
2016-02-10 18:03:42 +11:00
hiker
ee320588d5
Merge remote-tracking branch 'origin/master' into support_nw_splitscreen
2016-02-09 17:40:59 +11:00
hiker
354770f564
Added 0 number of laps to configuration to test ending a race.
2016-02-09 13:38:25 +11:00
Elderme
5b81d97482
Merge branch 'master' into renderer_refactoring
2016-02-07 13:56:25 +01:00
Benau
c3f589561c
Initial work on supporting real race with ghost karts
...
To test, you need to pass --ghost to supertuxkart with choosing a
track that has replay recorded, you can record one with artist
debug mode.
TODO: correct position handling
2016-02-06 14:52:50 +08:00
Benau
87862c27ae
Fix #2127
2016-01-31 10:16:12 +08:00
Elderme
1e7e126b55
merged with master
2016-01-30 15:00:22 +01:00
Benau
5c81a2a3e7
Seperate red and blue balls a bit in race gui
...
This make score like 10:10 a bit clearer
2016-01-25 12:51:43 +08:00
Benau
ea05f4b6ba
Allow saving default time limit option too
2016-01-22 12:27:09 +08:00
Benau
99162e3d0f
Fix wrong positioning of music description in soccer mode with time limit.
2016-01-22 12:01:01 +08:00
Benau
95f6f910b8
Allow saving selected team in single player soccer mode.
2016-01-22 11:32:06 +08:00
Benau
3a3963bf8d
Make STK soccer mode more like real match
...
1. Short win animation is shown in a kart if it scored correctly
2. Possible to identify own goal in result gui
Also player name is shown instead of kart name in result gui for all modes.
2016-01-19 16:21:58 +08:00
Benau
b7df193ed4
Add Red/Blue icon in soccer setup screen
2016-01-19 08:49:23 +08:00
Marianne Gagnon
025c117d58
Tweak soccer setup screen to be clearer
2016-01-17 21:21:55 -05:00
Elderme
e9087a7dd6
Merged with master
2016-01-17 14:42:11 +01:00
Benau
ab61e55a6d
Fix bugs in Race GUI
2016-01-17 12:11:09 +08:00
Benau
b410c8f67c
Make soccer menu useful in single player
...
Notice: As race_manager->setKartSoccerTeam(i, info.team) already
pre-set karts team, there is no need to test for
(getNumKartsInTeam(SOCCER_TEAM_RED) == 0 || getNumKartsInTeam(SOCCER_TEAM_BLUE) == 0),
so the the menu code is simplified.
2016-01-16 16:11:33 +08:00
Benau
b45d926a00
Clean up and bug fixes
2016-01-16 09:14:19 +08:00
Benau
e296ebe4af
Use white-black ball in minimap
2016-01-15 19:52:49 +08:00
Benau
d14a39e0f7
Initial work on soccer AI, plus lots of code re-factor/clean up.
...
To test, you need to update stk-assets with the dummy soccer field.
In single player, you are limited to be in red team for now, so just
shoot the ball into the blue goal. Also max-goal is limited to 4.
Regarding AIs, the steering with ball logic is handled in
SoccerAI::correctBallPosition, max AI supported in single player
is limited to 5 by now.
The AI is not as good as Zidane or Ronaldo, but steering with ball
for human is not as easy as not normal driving anyway, so don't
laugh at the AIs. :)
TODO: Friendly-team firing, polish the soccer field.
2016-01-15 18:25:52 +08:00
hiker
b7870b2377
Fixed crash (when going back from track screen to kart screen).
2016-01-15 16:25:02 +11:00
hiker
d3a7c75a62
Replaced many uses of getPlayer with Controller::canGetAchievements.
...
Removed some unused variables.
2016-01-15 08:02:36 +11:00
hiker
45399fc43f
Removed unused data.
2016-01-14 08:30:02 +11:00
hiker
846fd3f059
Started to support split screen by fixing and improving the handling
...
of local plauyer ids.
2016-01-14 08:20:14 +11:00
hiker
e70017a1a6
Code simplification.
2016-01-14 08:05:40 +11:00
hiker
e7dd7f4d1a
Replaced setLocalKartInfo with setPlayerKart. Updated some docs.
2016-01-12 13:00:45 +11:00
hiker
f0c5f43fe2
Removed setNumLocalPlayers (which is now part of setNumPlauers)<
...
fixed coding style in race manager.
2016-01-11 07:58:30 +11:00
hiker
e46c47d5c9
Removed m_local_player_karts data structure in RaceManager.
2016-01-08 17:03:50 +11:00
Elderme
c14ce23e66
Merged with master and solved conflict with the new graph structure
2016-01-07 14:56:09 +01:00
hiker
eb30294259
Disable access to network races.
2016-01-06 18:01:46 +11:00
hiker
b8ed2025ed
Merge remote-tracking branch 'origin/master' into refactor_networking
2016-01-06 17:53:45 +11:00
hiker
c1560ddb02
Renamed getPlayerID() to getGlobalPlayerId(); started to refactor
...
StartGameProtocol.
2016-01-06 08:10:03 +11:00
Elderme
a257acfd4b
Fixed memory leak and improved interfaces for rendering to texture
2016-01-04 21:36:00 +01:00
Benau
d4e312885a
Make SFX depends on race result too
...
Currently use gp_end for test
2016-01-03 10:19:51 +08:00
Benau
2aaab61f93
Implement win or lose music for race result screen
...
TODO: Proper music file
2016-01-01 13:31:15 +08:00
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