hiker
f1ecf999b2
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-03 10:03:02 +11:00
hiker
38bdca2038
Fixed typo.
2014-03-03 09:17:45 +11:00
hiker
0ec7542175
Added more comments.
2014-03-01 17:16:23 +11:00
hiker
e79a46ef38
Fixed crash when --track or --kart is used and no default player exists.
...
Also only print an error message if --track or --kart do not work (e.g.
the track/kart is not unlocked, or no default player exists) instead of
aborting STK.
2014-03-01 17:14:56 +11:00
Marianne Gagnon
d954fc6c72
Better fix for player info dialog
2014-02-28 19:54:18 -05:00
hiker
937533dbdb
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-03-01 11:35:46 +11:00
hiker
d1e02a6870
Removed commented out code.
2014-03-01 11:34:48 +11:00
hiker
9f6d6949f6
Merge branch 'master' of https://github.com/dimitrijejankov/stk-code into dim
2014-03-01 11:31:32 +11:00
Dimitrije Jankov
c8cba7df07
Fixes the player_info_dialog not loading...
2014-03-01 01:11:25 +01:00
Marianne Gagnon
093ac337d1
Fix GP info dialog
2014-02-28 18:28:42 -05:00
hiker
7e9682bde6
Merge branch 'master' of https://github.com/dimitrijejankov/stk-code into dim
2014-03-01 09:47:59 +11:00
Vincent Lejeune
168780a3ac
Clean some code.
2014-02-28 17:56:45 +01:00
Vincent Lejeune
af862cb6c5
#version autoadded to shaders and turn some v120
2014-02-28 17:29:05 +01:00
Dimitrije Jankov
a354648497
Fix for
...
Author: hikerstk
Atm the user config.xml file is in UTF (since previously it stored the
name of players which requires special characters). The player
information is now stored in a separate file, so the config.xml can be
written as ascii now (avoiding problems some people have that they can't
see or edit the file)
2014-02-28 15:32:38 +01:00
hiker
1903aee114
Changed lower and upper bound (at lower speed less speed should be
...
lost), capped speed fraction. Tweaked parachutes parameters somewhat.
2014-02-28 23:57:49 +11:00
Bart Cools
c131312b33
Implemented the possibility to give yourself "negative" attachments (parachutes, anvils, bombs) to be able to playtest more efficiently
2014-02-28 11:10:35 +01:00
Bart Cools
89a336ff9a
Tweaked the logic of parachutes to be more modifiable. There now is an upper bound percentage and lower bound percentage which will be applied if you are driving faster and slower respectively. Also added those values in stk_config.xml to make playtesting easier (ticket #1135 )
2014-02-28 11:10:25 +01:00
Dimitrije Jankov
9fc0d5be77
This fixes the issues my patch has caused...
...
1) if I start without existing user config files, it crashes (current
player is NULL)
2) the m_remember_me variable is not used
3) if I understand the code correctly, it sets the current player to a
guest player to indicate that there is no current player atm (which is
then used to start the login window). If this correct, then it would be
better to indicate this by setting the current player to NULL. Reason is
that this way we can easily detect incorrect usage elsewhere (since we
will get a crash, instead of storing data in the guest player, and we
will only later detect that something was not saved as expected).
2014-02-28 10:23:09 +01:00
hiker
14d6e6ae7e
Added missing initialisation of m_is_default.
2014-02-28 19:01:40 +11:00
Dimitrije Jankov
d0f93d3b98
Fixed the skiping of the lobby screen :)
2014-02-28 02:36:53 +01:00
Dimitrije Jankov
2ef991e9e7
Removed the m_default_player from the user_config.hpp because the
...
default user is loaded from the players.xml file
2014-02-28 00:38:35 +01:00
hiker
0ddeb3b434
More documentation, and usage of typedef instead of std::vector<...>.
2014-02-28 09:19:10 +11:00
hiker
bef02c116c
Bugfix: addPersistent/addToCache would call Profile::merge(), which
...
deletes the original profile --> the profile accessed after this call
was invalid.
2014-02-28 08:51:02 +11:00
hiker
76787599d9
Moved some class declarations into functions. Added comments.
2014-02-28 08:48:07 +11:00
hiker
db0c75b988
Make sure that the used bit of a profile is always set when updating
...
the cache bits (even though it probably doesn't matter, but that's
hard to understand, this way is cleaner).
2014-02-28 08:12:03 +11:00
hiker
efdb78f012
Added comments, sorted some functions so that all cache functions
...
are next to each other etc. No actual code change.
2014-02-27 16:55:32 +11:00
hiker
a686c43dd8
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-27 15:36:51 +11:00
hiker
42b72cc2a8
Added comments, minor code changes only.
2014-02-27 15:29:30 +11:00
Vincent Lejeune
108e82afc2
Fix Sara's moving textures.
2014-02-27 01:49:03 +01:00
Vincent Lejeune
9941b18d7f
Rework moving textures support.
2014-02-27 01:22:34 +01:00
hiker
d734d310ab
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-27 09:36:11 +11:00
Vincent Lejeune
7532ea1768
Skybox: Do some cleaning.
2014-02-26 22:28:06 +01:00
Vincent Lejeune
61ea376ff2
Use cubemap for skyboxes
2014-02-26 19:08:24 +01:00
hiker
1c6d63acc7
Added separate create() function for ProfileManager, and some cosmetic changes.
2014-02-26 16:34:46 +11:00
hiker
4d6b110e56
Removed unnecessary #include of user_config.hpp in other hpp files
...
(to reduce the amount of recompilation when user_config.hpp is changed).
2014-02-26 12:52:16 +11:00
hiker
04fe9b6329
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-26 12:07:51 +11:00
Marianne Gagnon
2a8476305d
Fix uninitialized variable
2014-02-25 20:06:02 -05:00
hiker
96a0c599d1
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-26 11:55:38 +11:00
Marianne Gagnon
196cbdee09
Fix bogus error level
2014-02-25 19:14:51 -05:00
Vincent Lejeune
c4a38b413f
Remove cullface disable in ref tested texture.
2014-02-26 00:43:29 +01:00
hiker
36c9c4d6c3
Fix the display of achievement progress: avoid that a value can be
...
larger than the goal value (otherwise after racing one track 12 times
the progress for Christoffel would should 12/10).
2014-02-26 10:36:02 +11:00
Marianne Gagnon
e1830b4e8a
Replace printf with log
2014-02-25 18:31:43 -05:00
hiker
0b33474f2f
For now disable shader by default, to avoid people not being able to
...
run stk at all (#1212 ).
2014-02-26 10:24:09 +11:00
Vincent Lejeune
6e6667a2ea
Check minor gl version
2014-02-26 00:00:50 +01:00
hiker
4139d145cf
Create a default user config file if no user config file exists.
...
This is for now useful for crash problems (e.g. to disable shaders).
2014-02-26 09:41:38 +11:00
hiker
ac2619007f
Fixed translation.
2014-02-26 09:16:40 +11:00
hiker
c6288af326
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-26 08:40:51 +11:00
hiker
b17d2ca0e2
Started to add support for offline achievement viewings (still not
...
fully working).
2014-02-26 08:19:24 +11:00
hiker
7644a5960f
Fixed bug (instance variables were access after the object was deleted);
...
addded code to show the achievement screen.
2014-02-26 08:17:49 +11:00
Vincent Lejeune
65c0750525
Clean some unneeded code and fix ssao viz.
2014-02-25 19:01:35 +01:00
