Commit Graph

10853 Commits

Author SHA1 Message Date
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
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
Marianne Gagnon
289505d909 Add missing profiler 2014-02-16 17:42:06 -05:00
hiker
7a1670bc8a Merge branch 'master' of github.com:supertuxkart/stk-code into new_login
Conflicts:
	src/utils/profiler.cpp
2014-02-17 09:41:55 +11:00
hiker
a3f3613e1e Merge branch 'hiker/new_login' 2014-02-17 08:23:48 +11:00
hiker
8cccc72b9a Fixed merge from upstream. 2014-02-17 07:48:18 +11:00
hiker
10db4d6c2c Removed unused variable. 2014-02-17 07:47:01 +11:00
lurk26
c322579248 Update README.md
Updated compiling instructions for Windows.
2014-02-16 18:29:30 +05:30
hiker
7b993cd210 Fixed VS compilation. 2014-02-16 21:31:41 +11:00
hiker
c2b4f42c93 Merge remote-tracking branch 'upstream/master' into new_login 2014-02-16 15:11:50 +11:00
Vincent Lejeune
d5d57bbae0 Shadows: Softer edge and smoother cascade transitions 2014-02-15 20:45:47 +01:00
Marianne Gagnon
fd8496ffba Fix linux/gcc compilation 2014-02-13 18:57:51 -05:00
Marianne Gagnon
8227e1c092 Add first rudimentary way to dump profiler measurements to CSV. More work to do! 2014-02-12 21:06:12 -05:00
auriamg
0e722b30a3 Merge pull request #41 from sachith500/bug1118
Bugfix for 1118
2014-02-12 18:33:50 -05:00
Vincent Lejeune
57079cbff5 Shaders: Declare penumbraH/V and shadowgen 2014-02-12 23:32:18 +01:00
Vincent Lejeune
3d3333905d Some factorization. 2014-02-12 22:41:32 +01:00
Vincent Lejeune
0243546e4d Use an openGL 3.3 compatibility context when available. 2014-02-12 22:16:10 +01:00
Vincent Lejeune
3d61056b81 Revert "STKMesh: Force readonly materials."
This reverts commit 8c5a5b9b20.
2014-02-12 18:46:28 +01:00
Vincent Lejeune
8c5a5b9b20 STKMesh: Force readonly materials.
We never changed materials on the fly but better safe than sorry.
2014-02-12 18:31:21 +01:00
Vincent Lejeune
bff2208947 Remove rain effect.
Rain enabled map crashes with non glsl codepath, and having a particle
effect handled separatly from others effect made it unmaintainable.
Rain must be implemented using gfx file with eventually a custom
property.
2014-02-12 17:51:18 +01:00
Vincent Lejeune
0cf6e4266a Graphics: Clean some dead code.
Still leave some shadow related code as comment, I will need later to
port cand's work on penumbra shadow.
2014-02-12 17:51:17 +01:00
Sachith Hasaranga Seneviratne
56656b581d Bugfix for 1118
Hide countdown as soon as race ends to prevent the drawGlobalTimer() method in race_gui from checking for failed challenges.

https://sourceforge.net/apps/trac/supertuxkart/ticket/1118

Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
2014-02-12 22:04:21 +05:30
Vincent Lejeune
70f89a8bce Shadow: Use 4 cascades.
Now that we use GS and textures array it's easier to add a cascade.
4 is still not optimal but I'd like to avoid cascade count inflation as
much as possible ; 4 x 1024x1024 has the bandwidth requirement of the
single 2048x2048 shadowmaps we previously had.
2014-02-11 21:49:46 +01:00