hiker
00cf9a3dbe
Merge remote branch 'origin/master' into new_login
2014-05-05 09:20:37 +10:00
hiker
fc3213a47d
Fixed linux compilation.
2014-05-05 09:17:19 +10:00
hiker
5ff9d7f198
Block new StoryModeLobbyScreen while login is in progress (and display ...
...
while this is happening). This allows to show error messages (e.g. user can
re-enter the password if login failed, without having to go to another menu
or perhaps even missing the fact that they are not logged in).
2014-05-05 08:59:27 +10:00
Marianne Gagnon
654651215a
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-05-04 18:54:46 -04:00
Marianne Gagnon
5acb763ac8
Work on cutscenes
2014-05-04 18:54:37 -04:00
Vincent Lejeune
849467d281
Unload texture transformation state cache.
2014-05-04 20:25:16 +02:00
Vincent Lejeune
d6d7c6179c
Simplify pointlight.vert
2014-05-04 19:46:21 +02:00
Vincent Lejeune
94ae8fb21e
Use a more tighly fitting quad for pointlights.
2014-05-04 19:21:09 +02:00
Marianne Gagnon
30929ef0a7
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-05-03 20:22:26 -04:00
Marianne Gagnon
ceb8265203
Merge branch 'NewGPCutscene'
2014-05-03 20:22:07 -04:00
Marianne Gagnon
bee4dcf36c
Work on new GPWin screen. Seems to work well now
2014-05-03 20:21:34 -04:00
Marianne Gagnon
6b3d1a4770
More work on porting GP win scene
2014-05-03 19:42:38 -04:00
Marianne Gagnon
dc5d7f707d
Work on GP end cutscene
2014-05-03 19:19:00 -04:00
vlj
35df307c3f
Tweak light extend.
2014-05-03 23:44:27 +02:00
vlj
5e62347d11
Fix attempt for #1308
2014-05-03 17:36:27 +02:00
Marianne Gagnon
423a833bb8
Add DOF checkbox to the graphics options
2014-05-02 19:02:58 -04:00
Marianne Gagnon
1b7c9ee1e2
Initial work to port GP win/lose cutscenes to new system
2014-05-02 18:47:43 -04:00
Vincent Lejeune
2d34bd0f47
Do not built grass shadow shader
2014-05-02 23:47:24 +02:00
Vincent Lejeune
b22066d0ab
Implement GL_ELAPSED_TIME query
...
This allows to measure gpu execution time very accurately.
2014-05-02 23:47:12 +02:00
vlj
2a1623d8ca
Use a more efficient screen to view conversion
...
Also use the opportunity to use UBO where possible.
2014-05-02 18:11:34 +02:00
vlj
2f1578ba32
Potential fix for #1305
2014-05-02 13:54:23 +02:00
vlj
401471fc18
Allow to toggle dof off
2014-05-02 13:44:10 +02:00
Marianne Gagnon
3ce6dde466
try increasing light count
2014-04-30 19:43:27 -04:00
hiker
d7219f3a2d
Added 'ok' button to 'new player' dialog. I can't seem to get them next
...
to each other, so for now they are just on top of each other.
2014-04-30 16:57:22 +10:00
hiker
bb737d0448
Added error sfx.
2014-04-30 16:57:04 +10:00
hiker
af9fb24d2e
Handle disabled internet (and provide a message to the user if he
...
tries to login with internet disabled).
2014-04-30 16:37:05 +10:00
hiker
a52b92083e
Fixed typo.
2014-04-30 12:25:34 +10:00
hiker
5c7d29830d
Fixed compiler warning.
2014-04-30 12:23:54 +10:00
hiker
3b8d988cd2
Fixed compiler warnings.
2014-04-30 11:34:53 +10:00
hiker
5124ba2bed
Merge remote-tracking branch 'origin/master' into new_login
2014-04-30 11:28:13 +10:00
konstin
b0169d2896
small corrections in grand_prix_data.cpp
2014-04-30 10:55:38 +10:00
konstin
367acd7738
Almost rewrite of GrandPrixData::reload()
2014-04-30 10:54:42 +10:00
konstin
d747b6af3f
Minor changes to the grand prix editor
2014-04-30 10:39:27 +10:00
hiker
3487f70740
Minor correction to patch from konstin.
2014-04-30 10:35:06 +10:00
konstin
ca08ee9d86
fixed identing, added comments, corrected spelling, etc.
2014-04-30 10:19:23 +10:00
Marianne Gagnon
4bddf29320
Fix bullet assertion failure
2014-04-29 19:48:54 -04:00
hiker
13024bf6ef
On first time start the player is automatically asked to create a new
...
player with a sensible default name.
2014-04-30 08:42:43 +10:00
hiker
ecef685b32
Adding new players now works.
2014-04-30 07:54:49 +10:00
hiker
b412d0507d
Merge pull request #1303 from leyyin/master
...
Fix some bugs in the online screens
2014-04-29 16:25:18 +10:00
Marianne Gagnon
8d2b56a34a
Improve flying mode, part 2
2014-04-28 19:55:41 -04:00
Marianne Gagnon
389ec42bde
Improve flying mode
2014-04-28 19:55:30 -04:00
hiker
6f5c523e86
Fixed display of players, thanks to auria.
2014-04-29 09:46:00 +10:00
hiker
396e3bb54e
Merge remote-tracking branch 'origin/master' into new_login
2014-04-29 09:10:37 +10:00
hiker
812da3e0c0
Some work on new login screen, though wip atm.
2014-04-29 09:02:44 +10:00
hiker
2f17264f39
Very eary first version of a new login screen.
2014-04-28 16:41:47 +10:00
hiker
b3291caea2
Moved 'startup now' code in separate function to make main more readable.
2014-04-28 07:51:24 +10:00
Vincent Lejeune
18aa119890
Tweak light attenuation.
...
Doesnt really change the look of the light but reduce their extent.
2014-04-27 18:31:00 +02:00
Vincent Lejeune
9ac57c3919
Tigher fit of light extent
2014-04-27 18:04:39 +02:00
Marianne Gagnon
2ee7f7a2e8
Bugfix : use ambient light from the sun when SH maps are not used
2014-04-26 20:04:16 -04:00
Daniel Butum
a769563878
Fix back button size in guest login screen
2014-04-26 14:03:14 +03:00
