Flakebi
|
c4cdfc4a0e
|
Merge branch 'upstream/master' into fixes
Conflicts:
src/input/input_manager.cpp
src/states_screens/kart_selection.cpp
|
2014-11-26 07:34:26 +01:00 |
|
deve
|
cac87cce34
|
Fixed mingw compilation.
I don't know how it worked previously because MEMORYSTATUSEX was there rather longer time and it needs this definition.
|
2014-11-26 06:46:03 +01:00 |
|
Marianne Gagnon
|
eda6f6c2f5
|
Merge branch 'master' into OSXFullscreen
|
2014-11-25 19:35:09 -05:00 |
|
hiker
|
ea3a433147
|
Fix #1620 (Player's achievements can only be seen when logged in).
|
2014-11-25 17:12:47 +11:00 |
|
hiker
|
49474a5370
|
Fixed my "Better handle out-of-memory situations." ... to now actually work :P
|
2014-11-25 17:08:31 +11:00 |
|
hiker
|
ebfbf5e2aa
|
Updated pot file (just to check launchpad integration, no string freeze yet).
|
2014-11-25 15:05:51 +11:00 |
|
hiker
|
8ef2c63857
|
Merge branch 'tobbi-cppcheck'
|
2014-11-25 14:15:37 +11:00 |
|
hiker
|
6fbcd90226
|
Better handle out-of-memory situations.
|
2014-11-25 14:14:32 +11:00 |
|
hiker
|
aac261d873
|
Use proper format (instead of casting unsigned to int).
|
2014-11-25 14:02:34 +11:00 |
|
hiker
|
63e5acdf2b
|
The (float) cast is not necessary, and makes it harder to read.
|
2014-11-25 14:00:43 +11:00 |
|
hiker
|
51be8195bc
|
Merge branch 'cppcheck' of https://github.com/tobbi/stk-code into tobbi-cppcheck
|
2014-11-25 13:58:59 +11:00 |
|
hiker
|
af186b6926
|
Fixed compiler warnings.
|
2014-11-25 13:58:28 +11:00 |
|
Marianne Gagnon
|
346bae4d03
|
Fix LOD issues in multiplayer, fixes #1710
|
2014-11-24 19:08:20 -05:00 |
|
Marianne Gagnon
|
cd7bc96d68
|
Fix invalid snow particles XML file that would cause assertion failures
|
2014-11-24 18:31:38 -05:00 |
|
samuncle
|
82b8548066
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code
|
2014-11-24 21:10:08 +01:00 |
|
Deve
|
220d3dbc9a
|
Restore screenshot properties
|
2014-11-24 20:41:49 +01:00 |
|
samuncle
|
92801f2b74
|
Tweak the snow
|
2014-11-24 20:23:55 +01:00 |
|
Deve
|
54b311f6f7
|
Allow to set custom ratio for images from xml file.
It avoids crashes and memory leaks after changing resolution.
|
2014-11-24 19:31:46 +01:00 |
|
hiker
|
5fd1e30a75
|
Fixed crash when using --slipstream-debug, but colour change to indicate
slipstream states does not work yet.
|
2014-11-23 21:54:41 +11:00 |
|
hiker
|
9a02693d31
|
Fixed compiler warnings, renamed playerID to player_id (to follow
our style guide).
|
2014-11-23 21:13:49 +11:00 |
|
hiker
|
24b1a3af32
|
Fixed compiler warnings.
|
2014-11-23 21:13:12 +11:00 |
|
Marianne Gagnon
|
5d5460d845
|
Add way to test intro cutscene easily; do not throttle sound effects on cutscenes
|
2014-11-22 18:21:31 -05:00 |
|
samuncle
|
91736e1941
|
Add the support for emit map. For the moment it's only for solid objects
|
2014-11-22 15:59:22 +01:00 |
|
Flakebi
|
1585199ccc
|
Change variable names again
|
2014-11-22 13:44:27 +01:00 |
|
Flakebi
|
bc62d2e6ff
|
Merge branch 'upstream/master' into fixes
|
2014-11-22 13:37:05 +01:00 |
|
Flakebi
|
632efb296c
|
Fix first player in kart selection doesn't get focused
|
2014-11-22 13:35:31 +01:00 |
|
Vincent Lejeune
|
d426a395bb
|
Use old formula for glossmap
|
2014-11-22 02:03:20 +01:00 |
|
Marianne Gagnon
|
3d7518b1d0
|
Merge branch 'fpsCam'
|
2014-11-21 18:26:13 -05:00 |
|
Marianne Gagnon
|
c7b43b49e7
|
Tweak variable names
|
2014-11-21 18:25:50 -05:00 |
|
Vincent Lejeune
|
f3a637fb99
|
Fix sun area light
|
2014-11-21 02:44:27 +01:00 |
|
Vincent Lejeune
|
79e5e9f880
|
Revert "Use f0 in fresnel schlick"
This reverts commit acdafc5566.
|
2014-11-21 02:09:02 +01:00 |
|
Vincent Lejeune
|
593f462ec5
|
Revert "Use color for specular"
This reverts commit fcba1dab86.
|
2014-11-21 02:09:00 +01:00 |
|
Vincent Lejeune
|
4a8afd2d40
|
Implement sun as an disk area light.
Solid angle is defaulted to sun's one.
|
2014-11-21 01:54:30 +01:00 |
|
Marianne Gagnon
|
954dba0873
|
Other OSX fullscreen attempt
|
2014-11-20 18:21:18 -05:00 |
|
Tobias Markus
|
2c12942871
|
Revert change in irr_driver.cpp
|
2014-11-20 23:17:25 +01:00 |
|
Tobias Markus
|
22c22b864a
|
Fix further issues
|
2014-11-20 23:15:05 +01:00 |
|
Flakebi
|
9e5eced8df
|
Improve smooth camera movement and move settings to user config
|
2014-11-20 23:01:40 +01:00 |
|
Vincent Lejeune
|
fcba1dab86
|
Use color for specular
|
2014-11-20 22:57:32 +01:00 |
|
Vincent Lejeune
|
acdafc5566
|
Use f0 in fresnel schlick
|
2014-11-20 22:51:22 +01:00 |
|
Vincent Lejeune
|
fcb43fb983
|
Clean some useless decl
|
2014-11-20 22:34:19 +01:00 |
|
Vincent Lejeune
|
3d070995f3
|
Remove a shader callback
|
2014-11-20 22:27:00 +01:00 |
|
Tobias Markus
|
416c97bf0e
|
Fix last error
|
2014-11-20 22:20:45 +01:00 |
|
Vincent Lejeune
|
baf1db8769
|
Factorize some code
|
2014-11-20 22:11:14 +01:00 |
|
Vincent Lejeune
|
bcd3452b70
|
Remove bubble shaders
|
2014-11-20 22:05:19 +01:00 |
|
Tobias Markus
|
61ccfaac77
|
Fix errors in src/ that cppcheck yielded with the default configuration
|
2014-11-20 22:01:46 +01:00 |
|
Vincent Lejeune
|
a78b889b05
|
Modelise Beer Lambert absorption for fog
|
2014-11-20 21:23:33 +01:00 |
|
Flakebi
|
aecd9c4b80
|
Fix crash with --no-graphics
|
2014-11-20 21:22:58 +01:00 |
|
Marianne Gagnon
|
10ffb5411e
|
Filter OpenGL warnings to silence some unecessary noise
|
2014-11-19 19:31:49 -05:00 |
|
Vincent Lejeune
|
8356941986
|
Add missing counters
|
2014-11-20 01:05:10 +01:00 |
|
Marianne Gagnon
|
d776bee39a
|
Try to fix OSX fullscreen OpenGL profile
|
2014-11-19 18:43:55 -05:00 |
|