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 |
|
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
|
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
|
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
|
ef07b25202
|
Make possible to tweak exposure/lwhite in adm
|
2014-04-24 17:47:17 +02:00 |
|
hiker
|
370e2e4935
|
Merge remote-tracking branch 'origin/master' into new_login
|
2014-04-24 12:26:29 +10:00 |
|
Marianne Gagnon
|
3f17545541
|
Use hasShadows flag from Track
|
2014-04-23 19:19:11 -04:00 |
|
Marianne Gagnon
|
2e53328847
|
Add debug sliders for vlj
|
2014-04-23 19:03:23 -04:00 |
|
hiker
|
ea2b797bb3
|
Keep track of online ids used in the player.xml file.
|
2014-04-24 08:17:44 +10:00 |
|
vlj
|
b939d06be5
|
Properly add Depth of Field
|
2014-04-23 22:08:37 +02:00 |
|
vlj
|
22d993dfbe
|
Merge branch 'tonemap'
Conflicts:
data/shaders/tonemap.frag
|
2014-04-23 18:20:30 +02:00 |
|
vlj
|
77795c796f
|
Revert "Revert "Enable tonemap.""
This reverts commit e57339841b.
|
2014-04-23 18:18:43 +02:00 |
|
vlj
|
fb56a4086f
|
Fix normalmap roughness
|
2014-04-23 18:09:48 +02:00 |
|
Vincent Lejeune
|
1bb4926ba2
|
Reorder post processes effects.
|
2014-04-23 18:09:48 +02:00 |
|
Vincent Lejeune
|
96c8180dfc
|
Remove color_in, it's been superseeded
Keep the shader because it will be partly used for dof.
|
2014-04-22 19:51:36 +02:00 |
|
hiker
|
2e3adee1a2
|
Merge branch 'master' of https://github.com/whichrakesh/stk-code into whichrakesh-master
Fix counting of bananas only for current player. Fixed conflicts.
Conflicts:
src/achievements/achievement_info.hpp
|
2014-04-22 17:20:40 +10:00 |
|
hiker
|
469ac9c433
|
Don't fire a cake if the target kart is invulnerable. Some cosmetic
changes to reduce line length, and added more comments.
|
2014-04-22 16:53:12 +10:00 |
|
hiker
|
ef341344e7
|
Merge branch 'skiddingAI' of https://github.com/gupascal/stk-code into gupascal-skiddingAI
|
2014-04-22 14:29:35 +10:00 |
|
hiker
|
886e7614e2
|
Fixed -help command line options (which was broken elsewhere before).
|
2014-04-22 14:24:32 +10:00 |
|
hiker
|
1bff514c27
|
Merge branch 'master' of https://github.com/leyyin/stk-code into leyyin-master
|
2014-04-22 14:14:49 +10:00 |
|
hiker
|
c8d679139f
|
Improved documentation.
|
2014-04-22 14:13:27 +10:00 |
|
Vincent Lejeune
|
b0e56ca2b0
|
Use some diffent value/equation for tonemap
|
2014-04-22 02:29:22 +02:00 |
|
Marianne Gagnon
|
5373390fac
|
Load textures for ambient lights separately from skybox textures
|
2014-04-21 20:25:51 -04:00 |
|