hiker
c84264a44e
Fixed linux compilation bug.
2014-02-17 10:57:40 +11:00
Joerg
90095882ee
Merge pull request #46 from hiker/new_login
...
Merged into our master.
2014-02-17 10:06:37 +11:00
Marianne Gagnon
289505d909
Add missing profiler
2014-02-16 17:42:06 -05:00
hiker
7a1670bc8a
Merge branch 'master' of github.com:supertuxkart/stk-code into new_login
...
Conflicts:
src/utils/profiler.cpp
2014-02-17 09:41:55 +11:00
hiker
8cccc72b9a
Fixed merge from upstream.
2014-02-17 07:48:18 +11:00
hiker
10db4d6c2c
Removed unused variable.
2014-02-17 07:47:01 +11:00
hiker
7b993cd210
Fixed VS compilation.
2014-02-16 21:31:41 +11:00
hiker
c2b4f42c93
Merge remote-tracking branch 'upstream/master' into new_login
2014-02-16 15:11:50 +11:00
Vincent Lejeune
d5d57bbae0
Shadows: Softer edge and smoother cascade transitions
2014-02-15 20:45:47 +01:00
Marianne Gagnon
fd8496ffba
Fix linux/gcc compilation
2014-02-13 18:57:51 -05:00
Marianne Gagnon
8227e1c092
Add first rudimentary way to dump profiler measurements to CSV. More work to do!
2014-02-12 21:06:12 -05:00
auriamg
0e722b30a3
Merge pull request #41 from sachith500/bug1118
...
Bugfix for 1118
2014-02-12 18:33:50 -05:00
Vincent Lejeune
57079cbff5
Shaders: Declare penumbraH/V and shadowgen
2014-02-12 23:32:18 +01:00
Vincent Lejeune
3d3333905d
Some factorization.
2014-02-12 22:41:32 +01:00
Vincent Lejeune
0243546e4d
Use an openGL 3.3 compatibility context when available.
2014-02-12 22:16:10 +01:00
Vincent Lejeune
3d61056b81
Revert "STKMesh: Force readonly materials."
...
This reverts commit 8c5a5b9b20
2014-02-12 18:46:28 +01:00
Vincent Lejeune
8c5a5b9b20
STKMesh: Force readonly materials.
...
We never changed materials on the fly but better safe than sorry.
2014-02-12 18:31:21 +01:00
Vincent Lejeune
bff2208947
Remove rain effect.
...
Rain enabled map crashes with non glsl codepath, and having a particle
effect handled separatly from others effect made it unmaintainable.
Rain must be implemented using gfx file with eventually a custom
property.
2014-02-12 17:51:18 +01:00
Vincent Lejeune
0cf6e4266a
Graphics: Clean some dead code.
...
Still leave some shadow related code as comment, I will need later to
port cand's work on penumbra shadow.
2014-02-12 17:51:17 +01:00
Sachith Hasaranga Seneviratne
56656b581d
Bugfix for 1118
...
Hide countdown as soon as race ends to prevent the drawGlobalTimer() method in race_gui from checking for failed challenges.
https://sourceforge.net/apps/trac/supertuxkart/ticket/1118
Signed-off-by: Sachith Hasaranga Seneviratne <sachith500@gmail.com>
2014-02-12 22:04:21 +05:30
Vincent Lejeune
70f89a8bce
Shadow: Use 4 cascades.
...
Now that we use GS and textures array it's easier to add a cascade.
4 is still not optimal but I'd like to avoid cascade count inflation as
much as possible ; 4 x 1024x1024 has the bandwidth requirement of the
single 2048x2048 shadowmaps we previously had.
2014-02-11 21:49:46 +01:00
Vincent Lejeune
934d1f10b8
Shadow: Use Geometry Shader for better perfs.
...
The 3 cascades are now rendered in a single pass, using 2D array texture and
a GS to do the dispatch ("layered rendering").
It's possible to use instancing instead but it requires the AMD_vertex_shader_layer
extension which is oddly part of opengl 4.2.
2014-02-11 21:07:44 +01:00
hiker
07a5d90aa0
Merge remote-tracking branch 'upstream/master' into new_login
2014-02-11 22:36:13 +11:00
hiker
ff585e4c73
Automatically compute active challenges when changing the current player.
2014-02-11 22:35:23 +11:00
hiker
7bba1ae478
Fixed saving first-time use of the story mode.
2014-02-11 22:28:41 +11:00
hiker
5b50f64310
Ignore emacs backup files (*~).
2014-02-11 13:41:16 +11:00
auriamg
b060b7651a
Merge pull request #37 from KroArtem/master
...
Fix coverity issues (memleaks, copy-paste error)
2014-02-10 19:23:45 -05:00
hiker
7b45db42e7
Removed debug print.
2014-02-11 10:13:23 +11:00
hiker
2fe21fc3b2
Added operator<<(const bool&), to get proper true/false written
...
instead of 0/1 - but it doesn't work yet :(
2014-02-11 09:52:46 +11:00
hiker
83bc8c83e6
Fixed empty user config.xml files.
2014-02-11 08:54:44 +11:00
hiker
810c536d43
Fixed various minor bugs.
2014-02-11 08:12:10 +11:00
hiker
0228b82ef4
Fixed incomplete merge.
2014-02-11 07:41:35 +11:00
Vincent Lejeune
da6e6daeaa
Create a BO with texture_2d_array for shadows.
2014-02-10 19:01:24 +01:00
Vincent Lejeune
c8844486fa
Shadow: Tweak bias
2014-02-10 15:58:09 +01:00
Vincent Lejeune
515bcbc750
Shadow: very crude csm support
2014-02-10 15:42:17 +01:00
Vincent Lejeune
ad2dcff431
Revert "Fixed running on hd3000 (8192 was too big for my system, not sure"
...
This reverts commit 748dcf1e15
2014-02-10 15:39:52 +01:00
hiker
8fc76729f9
Merge remote-tracking branch 'upstream/master' into new_login
2014-02-10 21:37:40 +11:00
hiker
8b7754cd4f
Merge remote-tracking branch 'upstream/master' into new_login
...
Conflicts:
src/challenges/game_slot.cpp
src/states_screens/kart_selection.cpp
src/tracks/track.cpp
2014-02-10 21:37:04 +11:00
hiker
748dcf1e15
Fixed running on hd3000 (8192 was too big for my system, not sure
...
what values should be used best, I used the previous code here).
2014-02-10 21:35:13 +11:00
hiker
230e1789f2
Made sorting of players descending (instead of using > in operator<),
...
removed kart and unique id from game slot, replaced some forgotten calls to
unlock_manager with calls to PlayerManager.
2014-02-10 17:00:16 +11:00
hiker
16521fce5a
Removed loading and saving of challenge.xml file.
2014-02-10 15:28:13 +11:00
Vincent Lejeune
4fd130b2ac
Shadow: Grass now cast shadows.
2014-02-09 23:24:01 +01:00
hiker
8d1591b260
Removed all references to current user/slot from unlock manager.
2014-02-10 08:57:16 +11:00
Vincent Lejeune
18896ff95e
Shadow: Support for alpha tested meshes.
2014-02-09 22:56:50 +01:00
hiker
5acf3e1681
Various compilation fixes, some cosmetic changes.
2014-02-10 08:41:54 +11:00
Vincent Lejeune
19d490a26d
Lights: Remove unused export value.
2014-02-09 21:18:15 +01:00
Vincent Lejeune
1c510881a7
Shadow: Fix broken specular with shadows enabled.
2014-02-09 21:16:16 +01:00
Vincent Lejeune
5d5ac34648
Shadow: soften edge a little
2014-02-09 20:03:54 +01:00
Vincent Lejeune
63db565fd7
Shadow: Better bias.
2014-02-09 19:42:22 +01:00
Vincent Lejeune
f0ef8e9913
Shadow: reenable shadows
...
It's just plain basic shadowmaps, a lot of tweak is still necessary but
it gives a way to see how light values are affected in some places.
(cave in chocolate for instance)
2014-02-09 19:20:55 +01:00
