Commit Graph

11741 Commits

Author SHA1 Message Date
hiker
4cc59a56ce Fixed renaming of local player, removed old rename dialog. 2014-05-26 08:25:33 +10:00
hiker
64492fb6cb Merge branch 'pgabor-master' 2014-05-25 22:43:14 +10:00
hiker
79081f8ce8 Merge branch 'master' of https://github.com/pgabor/stk-code into pgabor-master 2014-05-25 22:38:03 +10:00
hiker
a07c931921 Removed file accidentally added (thanks to Konstin for noticing). 2014-05-24 22:12:04 +10:00
hiker
3b721d3803 New zipper icon by Connor. 2014-05-24 12:31:43 +10:00
hiker
22f5b39223 Fix linux compilation. 2014-05-24 12:16:44 +10:00
hiker
36cbb18e27 Fixed compiler warnings. 2014-05-24 12:07:47 +10:00
hiker
63bbf6e092 Converted files to standard unix format. 2014-05-24 12:00:25 +10:00
hiker
fc32fcc865 Fix crash when deleting the current player (also prevent the user from
deleting the last user, since STK (after login) needs a current player).
2014-05-24 11:52:09 +10:00
hiker
6ca40916f7 Used proper icons for user screen. 2014-05-24 11:22:12 +10:00
hiker
ab70c55d02 Fixed infinite recursion. 2014-05-24 10:31:20 +10:00
hiker
05e6414cb8 Try to fix travisci compilation. 2014-05-24 10:24:37 +10:00
hiker
e879dcf0a8 Merge remote-tracking branch 'origin/master' into new_login 2014-05-24 10:06:50 +10:00
hiker
3739e7515d Support old configs (i.e. if icons don't exist, they will be
created at startup).
2014-05-24 10:05:54 +10:00
vlj
a1465b9039 Factorize draw code for pass1 shaders 2014-05-23 17:04:38 +02:00
vlj
9929678ba4 Fix a regression introduced by skybox fix 2014-05-23 16:55:55 +02:00
hiker
11d80d47ad Added support for player icons. 2014-05-23 22:43:19 +10:00
Deve
da41a06ae4 Add fallback for such exotic window managers as "larswm" which don't support netwm.
It's because Cand complains :)
2014-05-22 18:39:28 +02:00
hiker
911faa0676 Fix #1339. 2014-05-22 16:06:32 +10:00
hiker
de8c6ac8b8 When a player logs in with an online account, reset any other saved
session for this online account (since these token are now invalid).
2014-05-22 08:21:41 +10:00
hiker
f4688fa621 Added support to change the online account for the same player. 2014-05-22 08:12:55 +10:00
hiker
c551ea0c14 Added online name of the player to be logged in/out to the sign in/out
message.
2014-05-22 07:45:19 +10:00
hiker
498c6b46db Removed m_save_session, some code cleanup. 2014-05-22 07:44:26 +10:00
samuncle
d5f781433d Adding a new particle system for falling leaves 2014-05-21 23:23:08 +02:00
clbr
a52ad1318c Merge pull request #1338 from amtkhdkr/mybranch
Email Validation
2014-05-21 13:53:36 +03:00
amtkhdkr
9c7f2d4de9 Whitespace cleanup 2014-05-21 16:18:56 +05:30
amtkhdkr
b7ab039cc6 Whitespace cleanup 2014-05-21 16:16:24 +05:30
amtkhdkr
efdaac1040 Use core::stringw functions 2014-05-21 16:14:44 +05:30
amtkhdkr
3577660f84 Rolling back changes,no need to edit here 2014-05-21 13:11:52 +05:30
amtkhdkr
397c2e4a33 Tested changes for wchar 2014-05-21 13:04:44 +05:30
amtkhdkr
091ff10039 Spaces removed 2014-05-21 12:05:27 +05:30
amtkhdkr
50119a493c Checked for valid email id. 2014-05-21 11:57:56 +05:30
amtkhdkr
cd573d8446 Checked for valid email id.
Email id is checked for (z)(z)*@(z).(z)
where z is an alphanumeric character. 
Following emails are valid: abc@xyz.com a@abc.com
d@ddyC00l@abc.com foo@ab.com
Following are invalid: abc foo@ @foo.com @.com .com@
2014-05-21 11:41:32 +05:30
samuncle
bffc615a49 Tweak the scattering value to reduce the effect 2014-05-21 02:36:48 +02:00
Marianne Gagnon
8b8a17de21 Improve material compat fallback + update one handwritten materials XML 2014-05-20 20:04:21 -04:00
hiker
1472e69c66 Merge remote-tracking branch 'origin/master' into new_login 2014-05-20 22:17:03 +10:00
hiker
8441dbbd32 Fixed saving login credentials. It's now possible to switch
user (and automatically a logout and login is triggered).
2014-05-20 22:13:26 +10:00
Marianne Gagnon
106c23a09b Merge remote-tracking branch 'origin/master' into MaterialsRefactor 2014-05-19 20:48:08 -04:00
vlj
b87f420496 Spheremap: fix low brightness 2014-05-20 02:46:50 +02:00
Marianne Gagnon
f778f68649 Merge remote-tracking branch 'origin/master' into MaterialsRefactor 2014-05-19 20:37:44 -04:00
vlj
c79d96df69 Add lightviz to instanced node 2014-05-20 02:35:50 +02:00
vlj
c88d66a862 Add lightviz to spheremap 2014-05-20 02:35:49 +02:00
Marianne Gagnon
778649f182 More material work 2014-05-19 20:01:51 -04:00
Marianne Gagnon
6410cf8776 Start refactoring materials 2014-05-19 19:30:44 -04:00
vlj
3f1c85a897 Merge pull request #1336 from supertuxkart/shader-fix
Fix shader problems when UBO is disabled.
2014-05-20 00:19:02 +02:00
Stephen Just
493b7b7c69 Fix whitespace in glwrap.cpp 2014-05-19 10:02:35 -06:00
Stephen Just
0167e6d95a Fix up whitespace in shaders.cpp 2014-05-19 09:59:13 -06:00
Stephen Just
f4992b80fc Fix errors when compiling shaders with UBOs disabled 2014-05-19 09:57:31 -06:00
hiker
ebcce3da32 Avoid freeing potentially uninitialised variable. 2014-05-19 13:58:37 +10:00
hiker
9ae67f5c7a Merge remote-tracking branch 'origin/master' into new_login 2014-05-19 12:36:17 +10:00