hiker
4ada050ca7
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-27 12:28:12 +10:00
hiker
a24e0cf5aa
Also hide the 'online' label if a user is renamed.
2014-05-27 10:44:01 +10:00
hiker
726070b331
Use Log::, fix coding style issues.
2014-05-26 16:58:50 +10:00
Marianne Gagnon
986563fdf8
Fix transparency
2014-05-25 18:45:54 -04:00
hiker
4cc59a56ce
Fixed renaming of local player, removed old rename dialog.
2014-05-26 08:25:33 +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
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
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
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
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
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
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
vlj
84235b6491
Fix attempt for intel mesa
2014-05-19 00:25:25 +02:00
vlj
42db6d2bba
Forget another change
2014-05-19 00:13:17 +02:00
vlj
6b8df482df
Forget a hunk
2014-05-19 00:06:38 +02:00
vlj
df70681574
Fix attempt for linux
2014-05-19 00:05:52 +02:00
vlj
33f19e55b8
Fix for shadows.
2014-05-18 23:47:52 +02:00
vlj
31487814fe
Fix compile
2014-05-18 23:28:39 +02:00
Vincent Lejeune
eca3999d52
Do some cleaning
2014-05-18 19:56:25 +02:00
Vincent Lejeune
bf71c2f71d
Factorize code drawing shadows.
2014-05-18 19:45:52 +02:00
Vincent Lejeune
838b44fc00
Remove Cautics effect
...
It's not used anywhere and I have no way to test it so it's useless.
2014-05-18 19:28:53 +02:00
hiker
2d4f2c5b28
Try to fix one more potential linux compilation problem.
2014-05-18 22:32:58 +10:00
hiker
c1194600c3
Try to fix my fix for linux compilation ;)
2014-05-18 22:09:04 +10:00
hiker
c9c3b289be
Try to fix linux compilations problems (apparently on some systems
...
Screen is defined, which then interferes with out Screen class).
2014-05-18 22:00:28 +10:00
Marianne Gagnon
f0e3ee8832
Fix kart shadow vs kart animation (for the main player only)
2014-05-17 21:57:06 -04:00
vlj
32b2359f21
Spheremap: Flip y and add light.
2014-05-18 03:39:53 +02:00
vlj
30f35cadde
Fix texture sampled by spheremap
2014-05-18 03:28:57 +02:00
vlj
a2e1724389
Use correct mapping for spheremap
2014-05-18 03:19:18 +02:00
vlj
dc7e6cb99f
Revert to spheremapped reflection
2014-05-18 03:01:24 +02:00
Marianne Gagnon
b91484a2ef
try to fix linux compilation
2014-05-17 19:29:59 -04:00
vlj
7fcd7a3301
Add a fake skybox where no skybox is available
...
For spheremap shaders
2014-05-17 17:26:51 +02:00
vlj
8673d36885
Merge branch 'fboencapsulate'
2014-05-17 17:05:31 +02:00
vlj
af34fa54e7
Fix displace effect.
2014-05-17 17:03:50 +02:00
hiker
4aa1fde07d
Don't show password field if player has a saved session.
...
If player changes online username, make password field visible again
and clear saved session data. In case of login problem, clear
saved session data.
2014-05-17 12:40:14 +10:00
hiker
40564534d2
Fixed callbacks in case of using the tabbed version of the UserScreen.
2014-05-17 12:17:19 +10:00
hiker
6f4579d55d
Only auto-login player if last time they played they were online.
2014-05-17 12:05:49 +10:00
hiker
1946df97be
Fixed start with no players (including aborting the create user screen),
...
added 'lastWasOnline' flag to enable saving of a login token even
when the account is used offline in between.
2014-05-17 11:43:05 +10:00
vlj
9c98012e09
Fix dof and transparent fog.
2014-05-17 03:09:21 +02:00
vlj
883b39591f
Width and height are passed by UBO
2014-05-17 02:39:55 +02:00
vlj
c465900ee3
Use rtt with fitting size.
2014-05-17 02:05:31 +02:00
Marianne Gagnon
4ff8b813fa
Create RTTs only when loading a track
2014-05-16 19:30:39 -04:00
vlj
12ecd4e58e
Attempt to fix travis ci
2014-05-17 00:56:16 +02:00
Vincent Lejeune
fef87b4853
Reenable splitscreen
2014-05-16 19:37:16 +02:00
Vincent Lejeune
a8a97d28ce
Move final blit to render.cpp
2014-05-16 19:28:15 +02:00
hiker
b38a31f303
Simplified handling of current player: instead of storing a flag
...
in each player, PlayerManager now just uses its m_current_player
to write this information in the players.xml file.
2014-05-16 15:39:33 +10:00
hiker
63b270283d
Merge remote-tracking branch 'origin/master' into new_login
2014-05-16 14:34:09 +10:00
hiker
c4ed2fbc7c
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-16 14:29:06 +10:00
hiker
fd0b017b5f
Fixed compiler warnings (m_ssao is bool, not int).
2014-05-16 14:28:12 +10:00
hiker
71603816fa
Merge remote-tracking branch 'origin/master' into new_login
2014-05-16 14:21:13 +10:00
Marianne Gagnon
b049acb81d
Make STKMeshSceneNode destructor virtual, as it should
2014-05-15 21:17:01 -04:00
hiker
94457e7a53
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-16 09:56:19 +10:00
hiker
636f34160a
Finished using Log:: instead of printf, removed separate 'profile'
...
level, instead use 'profile' as component.
2014-05-16 09:54:32 +10:00
Marianne Gagnon
2b7dc07cda
Fix crash-on-second-load bug
2014-05-15 19:41:44 -04:00
hiker
629ecc8ecb
Removed old player management screen.
2014-05-16 08:50:10 +10:00
vlj
ecca6911d1
Encapsulate fbos in a class
2014-05-16 00:37:26 +02:00
hiker
1102702f5b
Removed saving of all online ids in players.xml file.
2014-05-16 08:31:58 +10:00
hiker
6650827784
Fixed various bugs in menu not showing up.
2014-05-16 08:24:15 +10:00
Bart Cools
61d9b7a0ea
Output of logging profile tests changed to the stdout.log instead of standard output. type of output also changed to space separated values instead of tsv
2014-05-15 18:30:16 +02:00
hiker
0459c33f66
Added a tabbed version of the user screen, and integrated it into
...
the option menu of STK.
2014-05-15 22:59:21 +10:00
hiker
f4a5949198
Fixed invalid memory read (thanks to valgrind).
2014-05-15 15:37:23 +10:00
hiker
cc03578056
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-15 12:41:35 +10:00
hiker
a3c01a6b2a
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-05-15 11:17:36 +10:00
hiker
d3f6aa5e52
Fixed some memory problems reported by valgrind.
2014-05-15 11:17:05 +10:00
Marianne Gagnon
78d8199de8
disable crash reporter in debug mode
2014-05-14 20:10:23 -04:00
hiker
717a989bf8
Fixed --profile-laps command line parameter.
2014-05-15 09:08:18 +10:00
hiker
137b5033dd
Merge remote-tracking branch 'origin/master' into new_login
...
Conflicts:
src/karts/controller/skidding_ai.cpp
2014-05-15 08:58:29 +10:00
