Commit Graph

11125 Commits

Author SHA1 Message Date
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
hiker
fb1c73718a Try to remove shaking of camera somewhat. 2014-02-18 08:51:03 +11:00
samuncle
4a5f09dca3 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-02-17 22:37:23 +01:00
samuncle
073a049389 Correction of a syntax error 2014-02-17 22:36:00 +01:00
hiker
23301d822a Experimentally adjust camera up vector depending on kart roll, which means
the camera will now follow the gravity changes.
2014-02-18 08:18:33 +11:00
hiker
a34d47d72a Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-18 07:53:30 +11:00
hiker
8cd1e2e491 Renamed the node name in the player.xml file to better describe what
it is, removed unused variable.
2014-02-18 07:38:44 +11:00
Vincent Lejeune
e5a174d85b Add compatibility keyword on and remove some unused shaders 2014-02-17 15:34:57 +01:00
hiker
94da45238c Renamed GameSlot to StoryModeStatus to better describe its function. 2014-02-17 23:16:53 +11:00
hiker
f2e6126f8d Renamed Challenge to ChallengeStatus (to better describe what
this class is doing).
2014-02-17 22:20:23 +11:00
hiker
1f7028f997 Ignore all bld* directories. 2014-02-17 20:12:15 +11:00
hiker
2b4729a145 Renamed player.?pp to player_profile.?pp (to follow our style
guide); removed unnecessary #includes.
2014-02-17 20:10:29 +11:00
hiker
6685966616 Fixed flying. 2014-02-17 17:00:11 +11:00
hiker
2595d31eba Implemented crude work around for drivers that do not support
opengl 3.3.
2014-02-17 16:52:40 +11:00
hiker
b313c680fc Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-17 11:44:09 +11:00
Marianne Gagnon
8c187f6e5a Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-02-16 19:06:03 -05:00
Marianne Gagnon
148ab7deb3 Improve profiler to CSV export 2014-02-16 19:05:30 -05:00
Joerg
721439748c Merge pull request #44 from lurk26/patch-1
Update README.md
2014-02-17 11:04:18 +11:00
hiker
753e5199b9 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-02-17 10:58:11 +11:00
hiker
c84264a44e Fixed linux compilation bug. 2014-02-17 10:57:40 +11:00
Marianne Gagnon
8763b95603 Merge branch 'master' of https://github.com/supertuxkart/stk-code
Conflicts:
	src/utils/profiler.cpp
2014-02-16 18:11:17 -05:00
Marianne Gagnon
1e8c2ff523 Use plain ofstream to write profiler CSV 2014-02-16 18:10:29 -05:00
Joerg
90095882ee Merge pull request #46 from hiker/new_login
Merged into our master.
2014-02-17 10:06:37 +11:00