10855 Commits

Author SHA1 Message Date
Dk
b4d922512e 1195 Multiplayer Kart selection screen commit 22 2014-03-08 21:08:06 +05:30
Dk
52e910a438 1195 Multiplayer kart selection commit 21 2014-03-06 23:39:33 +05:30
Dk
7c8a32a10e 1195 MUltiplayer kart selection cmmit 21 2014-03-06 23:31:34 +05:30
Dk
796c8b823a 1195 Multiplayer karts selection screen commit 20 2014-03-06 00:18:12 +05:30
Dk
7d87d79d20 1195 Multiplayer Kart Selection commit 19 2014-03-05 23:22:41 +05:30
Dk
c5d23f7154 1195 Multiplayer kart selection commit 18 2014-03-05 23:02:23 +05:30
Dk
de7d0aa995 Merge remote-tracking branch 'multiplayer/downstream' into downstream 2014-03-05 21:39:20 +05:30
Dk
eddc512b16 1195 Multiplayer kar selection screen commit 17 2014-03-05 21:37:07 +05:30
divvy81
6f98d1d371 Update Ocean.stkskin 2014-03-05 21:15:04 +05:30
Dk
b5feb9740a 1195 Multiplayer kart selection commit 16 2014-03-05 21:08:17 +05:30
Dk
0e17d39f1a 1195 Multiplayer kart selection commit 15 2014-03-05 20:47:05 +05:30
Dk
1dab0daeb5 1995 Multiplayer kart selection screen commit 14 2014-03-05 20:16:48 +05:30
Dk
72346ee101 1195 Multiplayer kart select commit 13 2014-03-04 00:16:35 +05:30
Dk
99a19ee739 multiplayer kart selection commit 12 2014-03-03 23:53:15 +05:30
Dk
14467e320b 1195 Multiplayer kart selection screen 2014-03-03 23:32:43 +05:30
Dk
33a5dbacfd 1195 multiplayer Kart selection 2014-03-01 00:05:24 +05:30
Dk
84cc9dd972 1195 Multiplayer kart selection 2014-03-01 00:01:32 +05:30
Dk
15faf7dbee 1195-Multiplayer kart selection 2014-02-28 16:51:27 +05:30
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 8c5a5b9b206b3e11810eaa73c7a3afc4e570264c.
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