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
KroArtem
30977b7913
Merge remote-tracking branch 'upstream/master'
2014-02-23 19:41:00 +04: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
hiker
b4099b5354
Made the story mode xml file format more compact by saving only the
...
highest level at which a challenge was solved (lower levels will
automatically be marked as solved).
2014-02-22 11:44:21 +11:00
KroArtem
d2179e960d
#1156 , fix quotes in CMakeLists files, see http://cmake.org/Wiki/CMake/Language_Syntax#Quoting for more info
2014-02-21 23:09:10 +04:00
KroArtem
08fcb42e7b
Merge remote-tracking branch 'upstream/master'
2014-02-21 20:59:41 +04:00
hiker
90343ff276
Fixed missing initialisation of m_reset_after_race, and added
...
error message in case of missing achievement data.
2014-02-21 23:39:14 +11:00
hiker
b214799a35
Some refactoring in he Achievement classes, code style cleanup.
2014-02-21 22:15:36 +11:00
hiker
8307e0d8a3
Fixed memory leak.
2014-02-21 16:54:52 +11:00
hiker
1921dbdacd
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-21 13:38:55 +11:00
Vincent Lejeune
1325fa7940
Fix UI clipping.
2014-02-20 18:43:51 +01:00
Vincent Lejeune
8ba0fcb8e0
STKMesh: Transparent texture can move now.
2014-02-20 18:31:00 +01:00
hiker
8f36220b61
Renamed AchievementsSlot to AchievementsStatus.
2014-02-20 23:03:25 +11:00
hiker
700953f295
Removed unnecessary save function.
2014-02-20 22:37:27 +11:00
hiker
a3a5d5fc3b
Moved achievements data into PlayerProfile (and data is saved in players.xml
...
now instead of in a separate achievements.xml file).
2014-02-20 22:04:03 +11:00
Vincent Lejeune
40c4155bd2
STKMesh: Support for (non ref) moving texture
2014-02-20 00:01:02 +01:00
hiker
55665e21a3
Removed some compiler warnings.
2014-02-20 08:55:35 +11:00
hiker
b0b9712fb9
Removed friend relation between StoryModeStatus and UnlockManager.
2014-02-20 08:44:57 +11:00
samuncle
e3f85ba41b
Tweak the cam tilt
2014-02-17 23:47:07 +01:00
hiker
ceecec0fa0
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-02-18 08:52:19 +11:00
