Commit Graph

11774 Commits

Author SHA1 Message Date
Guillaume P
14508bc2ac Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option 2014-05-02 19:18:58 +02:00
Guillaume P
7a3ba812d7 Use smaller textures when HD textures option is disabled. Generate them if they are not already in the cache directory. 2014-05-02 19:16:54 +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
Guillaume P
fac9cafa96 Create the directory where resized textures will be cached. 2014-04-29 18:57:36 +02: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
Guillaume P
03fbdc260d Add a new option for high-definition textures. 2014-04-28 18:42:23 +02: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
Daniel Butum
5ecfed293d Fix back button in the register screen and login as guest 2014-04-26 13:42:30 +03:00
Daniel Butum
fc5da9eb9a Fix back button in login screen and fix 'move on uninitialised value in MusicInformation' 2014-04-26 13:33:09 +03:00
vlj
a2e202a695 Missing "track->hasShadows" check 2014-04-26 02:22:33 +02:00
Marianne Gagnon
924e09b3e9 Very slight tweak 2014-04-25 20:02:16 -04:00
vlj
2ca11c3166 Auria provided tonemap coefficients 2014-04-26 02:00:50 +02:00
vlj
3e4254b3a7 Tonemap: Use J. Hable filmic operator
It gives better result on stk enterprise, slightly saturating blacks.
2014-04-25 17:57:10 +02:00
Marianne Gagnon
97b6db3fdc Honor the per-track flag to disable god rays 2014-04-24 19:24:23 -04:00
vlj
c5fbd5ff84 Reenable ability to change exposure/lwhite. 2014-04-25 00:59:02 +02:00
vlj
5b8b1a8b57 Temporary comment out exposure/lwhite settings 2014-04-25 00:29:33 +02:00
Vincent Lejeune
7239154a3a NormalMap should cast shadows too 2014-04-24 21:23:32 +02:00
Vincent Lejeune
84ddd7119e Use glPolygonOffset to remove shadow acne
It's a 2002 trick from M. Kilgard
2014-04-24 21:02:24 +02:00
vlj
85e720a58f Shadow: tweak bias to remove acnee 2014-04-24 18:33:05 +02:00
vlj
ef07b25202 Make possible to tweak exposure/lwhite in adm 2014-04-24 17:47:17 +02:00
hiker
84a1e32ade Let cmake test if stk-assets exists in the expected place. If not,
cmake is aborted with an error message. The option -DCHECK_ASSETS=off
option can be used to disable this test. The latter is also used
for travis.
2014-04-24 14:22:38 +10:00
hiker
9c35da4b6c Merge branch 'master' of https://github.com/abhishek1995/stk-code into abhishek1995-master 2014-04-24 14:01:37 +10:00