konstin
|
9ddd5a2d5c
|
reducing the pull request to it's content
|
2014-03-06 11:58:09 +01:00 |
|
konstin
|
baa56f3254
|
Merge remote-tracking branch 'upstream/master'
|
2014-03-06 11:45:19 +01:00 |
|
konstin
|
b561f440ba
|
1180 Loading Grand Prix's from locale directory
|
2014-03-06 11:30:51 +01:00 |
|
hiker
|
0208dbaf8a
|
Fixed #38, fixed #1230 (which is a duplicate).
|
2014-03-06 17:11:22 +11:00 |
|
hiker
|
58a5928b17
|
Fixed #1228 (crash when no default player is set and -N, -R, ... is used).
|
2014-03-06 17:06:41 +11:00 |
|
auriamg
|
605e4c6dff
|
Merge pull request #1218 from divvy81/downstream
1195 Multiplayer kart selection
|
2014-03-05 18:04:03 -05:00 |
|
hiker
|
b0018d4e5f
|
Removed unnecessary variable.
|
2014-03-06 08:49:30 +11:00 |
|
hiker
|
352863a763
|
Handled case that friends are not in cache when looking at the friend list
(which can happen when you look at friends of friends, your own friends
are persistent).
|
2014-03-06 08:21:54 +11:00 |
|
hiker
|
ebc2299150
|
Added more comments, code style cleanup only.
|
2014-03-06 08:04:43 +11:00 |
|
hiker
|
6450c569ac
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-03-06 07:44:18 +11:00 |
|
hiker
|
b80e9217f5
|
Fix camera tilting (some debug left-over broke it).
|
2014-03-06 07:43:51 +11:00 |
|
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 |
|
konstin
|
c09a3172f1
|
Solving Issue 1180 - Load addon GPs from local folder
|
2014-03-05 12:11:20 +01:00 |
|
hiker
|
eba8fd1e45
|
Remove passwords and tokens from Log:: output.
|
2014-03-05 10:34:28 +11:00 |
|
Vincent Lejeune
|
8600d3bc61
|
IBL: Spheremap now reflects skybox
|
2014-03-04 23:37:45 +01:00 |
|
Vincent Lejeune
|
391053e368
|
IBL: Implement IBL
|
2014-03-04 23:28:24 +01:00 |
|
hiker
|
02fa3ceed0
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-03-05 08:42:39 +11:00 |
|
Vincent Lejeune
|
718c1cacb0
|
Improved caustics effect.
|
2014-03-04 22:30:33 +01:00 |
|
hiker
|
586641120c
|
Fixed crash in online user search (triggered when pressing ESC while the
search is being executed).
|
2014-03-05 08:21:19 +11:00 |
|
Vincent Lejeune
|
8f127be9de
|
Fix caustic shader not picking caustic.png
|
2014-03-04 22:08:34 +01:00 |
|
Vincent Lejeune
|
ada5928aa2
|
Forgot a hunk
|
2014-03-04 18:47:10 +01:00 |
|
Vincent Lejeune
|
c93c921028
|
STKMesh: Support caustic material.
|
2014-03-04 18:42:33 +01:00 |
|
Vincent Lejeune
|
ada19f828c
|
Fix black glowing objects.
|
2014-03-04 17:52:23 +01:00 |
|
hiker
|
f549b729df
|
Remove camera tilting in flying mode.
|
2014-03-04 16:56:03 +11:00 |
|
hiker
|
3e478265bc
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-03-04 14:12:11 +11:00 |
|
Marianne Gagnon
|
a063d23b37
|
Fix intro cutscene
|
2014-03-03 18:57:10 -05:00 |
|
Vincent Lejeune
|
e1d879a1f2
|
STKMesh: Improve displace effect.
|
2014-03-03 23:59:12 +01:00 |
|
Vincent Lejeune
|
4ac634bb11
|
Fix motion blur edge.
|
2014-03-03 23:58:37 +01:00 |
|
hiker
|
46304e7f28
|
Removed m_fake_search, resorted functions to be in a more logical order,
added comments.
|
2014-03-04 08:15:46 +11:00 |
|
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 |
|
samuncle
|
7393fa0603
|
Add an attenuation based on depth
|
2014-03-03 16:38:26 +01:00 |
|
samuncle
|
ee76d9b579
|
Reduce the brightness of the vignette
|
2014-03-03 15:19:22 +01:00 |
|
samuncle
|
4b92ee1716
|
Add a vignette to simulate a real camera
|
2014-03-03 14:12:56 +01:00 |
|
hiker
|
7592200a44
|
Added more comments.
|
2014-03-03 21:55:46 +11:00 |
|
hiker
|
4fd6d29462
|
Removed debug code.
|
2014-03-03 16:37:54 +11:00 |
|
hiker
|
c1afacfc38
|
Added support for limited resizing of the online profile cache
if too many search results are found. Print warning (instead of
assert) to console if search results should be missing (because of
cache eviction).
|
2014-03-03 16:32:05 +11:00 |
|
hiker
|
7cdc064640
|
Fixed replay using the --ghost command line option.
|
2014-03-03 13:14:56 +11:00 |
|
hiker
|
f1ecf999b2
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-03-03 10:03:02 +11:00 |
|
hiker
|
38bdca2038
|
Fixed typo.
|
2014-03-03 09:17:45 +11:00 |
|
hiker
|
32d26f8855
|
Ignore doxygen output files in src/html.
|
2014-03-03 08:00:53 +11:00 |
|