Commit Graph

10911 Commits

Author SHA1 Message Date
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
hiker
14d6e6ae7e Added missing initialisation of m_is_default. 2014-02-28 19:01:40 +11: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
Marianne Gagnon
a5eba8bf83 remove leftover floating ribbon in giftbox model 2014-02-26 19:50:19 -05: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
9ffa4681d3 Better when actually include the shaders. 2014-02-26 21:53:29 +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
hiker
2916e3e351 Removed typedef (which is a work around for certain mesa versions)
from windows and osx.
2014-02-26 12:06:59 +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
hiker
b68b57676f Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-26 11:14:06 +11:00
Marianne Gagnon
196cbdee09 Fix bogus error level 2014-02-25 19:14:51 -05:00
hiker
244d00280c Applied patch from jpirie for fixing mesa 10 compilation problems. 2014-02-26 11:13:03 +11: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
hiker
6cce1199e9 Fixed typo in new achievement (attribute must be named goal). 2014-02-26 07:41:06 +11:00
Vincent Lejeune
65c0750525 Clean some unneeded code and fix ssao viz. 2014-02-25 19:01:35 +01:00
hiker
f8a462a39f Added support for different types of achievement checking: besides
'all-at-least' (all keys must be >= the corresponding goal value) now also
'one-at-least' (at least one key is >= a constant goal value) is supported.
Implemented 'Arch Enemy' achievement: hit the same kart at least 5 times
in one race.
2014-02-25 17:20:24 +11:00
hiker
2cb1f1fc78 Let only hits from the current player trigger an achievement. 2014-02-24 23:25:56 +11:00
hiker
99fe4388d4 Added an enum to reference the achievements by a name instead of
an integer number.
2014-02-24 17:14:42 +11:00
Marianne Gagnon
6eaa1e6db8 Fix crash in tracks without skybox 2014-02-23 19:35:30 -05:00
Marianne Gagnon
317f147406 Fix normals in item boxes and bananas 2014-02-23 19:05:09 -05:00
hiker
71f61f71c6 Fixed compilation errors - no idea why VS compiled it ok previously :( 2014-02-24 08:26:51 +11:00
hiker
4f266639aa Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-24 08:22:55 +11:00
hiker
5fc300d7bb Removed Single and MapAchievent (and Singe/MapAchievementInfo), instead
using the generic key-value mapping Map* has provided for everything.
Changed format of achievements.xml to be more compact.
2014-02-24 08:21:15 +11:00
Vincent Lejeune
2d1acf5353 Godray: improve the effect and its stability. 2014-02-23 20:16:03 +01:00
Vincent Lejeune
04fc4c3be7 Reenable Godray (on all track atm) 2014-02-23 20:02:15 +01:00
Vincent Lejeune
778cdcf3ce Godray/Godfade now declared in new pipeline. 2014-02-23 18:59:24 +01:00
Vincent Lejeune
a00abffb01 MotionBlur: Use direct GL calls. 2014-02-23 00:13:22 +01:00
Vincent Lejeune
58ef59dcd9 Split stkmesh into mesh and actual scene node 2014-02-22 23:31:27 +01:00