Commit Graph

12980 Commits

Author SHA1 Message Date
Deve
90ecf50414 Show console on windows only in debug mode 2014-08-22 20:40:22 +02:00
Deve
8711955bdc Fixed onEscapePressed event in addons loading screen.
It actually was unused previously. I'm also not sure why there was assert(false) ?
2014-08-22 19:59:30 +02:00
Deve
ad870c37f4 Back to previous resolution when escape was pressed in confirm resolution dialog 2014-08-22 19:46:03 +02:00
hiker
52a7d071dd Fixed some Log:: messages that used incorrect syntax and did not print
some variables. Made all log:: messages use the same components 'addons'.
2014-08-22 16:34:18 +10:00
hiker
3ef30dfd48 Merge branch 'no_floating' 2014-08-22 12:46:10 +10:00
hiker
80e1effccf Added some debug output to get more info for #1464 (unnecessary download
of addon icons). To be removed later.
2014-08-22 12:44:46 +10:00
hiker
84e78d884a Merge remote-tracking branch 'origin/master' into no_floating
Conflicts:
	src/karts/kart.cpp
2014-08-22 12:23:55 +10:00
hiker
0e23c54562 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-08-22 12:15:14 +10:00
hiker
f0f4b8d9f6 Improved error message. 2014-08-22 12:14:06 +10:00
Vincent Lejeune
b5273d6426 Port gaussian17*shader (non compute) to TextureRead. 2014-08-22 02:21:20 +02:00
Vincent Lejeune
dc35efa9d7 Port nvidia workaround to TextureRead 2014-08-22 02:08:05 +02:00
hiker
c3821e703b Made line endings consistent. 2014-08-22 09:49:55 +10:00
Vincent Lejeune
5c879b623f Fix pointlight call 2014-08-22 00:47:19 +02:00
Vincent Lejeune
547018f0ab Port PointLight shader 2014-08-22 00:30:14 +02:00
Vincent Lejeune
cee48821d3 Port diffuse env map shaders 2014-08-22 00:20:04 +02:00
Vincent Lejeune
062bcb1ff0 Fix gl debug output rant about uninitialised sync 2014-08-21 23:31:45 +02:00
Vincent Lejeune
187c9fca85 Port SunLight to TextureRead 2014-08-21 23:29:40 +02:00
Vincent Lejeune
c38a26b92a Use a separate rtt for diffuse/specular 2014-08-21 23:26:16 +02:00
Deve
4584464798 Add icon to exe file as resource.
It's hard to test for me because currently I can compile it only on virtual machine and it takes long time.
But it should work.
2014-08-21 21:38:59 +02:00
hiker
c6f7448911 Use sqrt(speed) to scale the collision impulse, which results in
weaker impulses when hitting the terrain.
2014-08-21 22:34:51 +10:00
hiker
1179ebf4e9 Fix suspension to some more realistic values. 2014-08-21 21:33:26 +10:00
hiker
15cccf9301 Make the graphical y offset configurable (and basically disable
it for now by setting it to 0).
2014-08-21 17:28:06 +10:00
hiker
171b442ae6 Removed artificial Y offset to allow evaluation of more karts. 2014-08-21 09:59:29 +10:00
hiker
856eb747b4 Fixed shadows with a hack. 2014-08-21 08:01:54 +10:00
Stephen Just
78df1bf371 Fix hasGLExtension on Windows.
Windows requires loading the glGetStringi function explicitly.
Also included fallback for when it is not found.
2014-08-20 14:38:49 -06:00
Marianne Gagnon
c8b50c67ef Fix leak 2014-08-20 20:38:05 -04:00
Vincent Lejeune
d968ce11bf Add a function that kills shaders and use it when reloading shader.
Thus there is no mesh corruption.
2014-08-21 02:19:33 +02:00
Vincent Lejeune
5abc404ed9 Use stream_copy for tfb buffers. 2014-08-21 01:17:16 +02:00
Vincent Lejeune
dd1f0739f0 Properly clean program object in load shader function. 2014-08-20 23:30:25 +02:00
Vincent Lejeune
06df2d12c7 Forgot to free a temp array. 2014-08-20 23:16:20 +02:00
Vincent Lejeune
04f6c7e729 Use singleton template for VAOManager (ex VBOGatherer) 2014-08-20 23:08:04 +02:00
Deve
c2cf83bb6a xrandr: move restore resolution to separated function because it makes a mess... 2014-08-20 19:44:06 +02:00
Deve
56fa56a38f xrandr: don't restore resolution if output was disconnected during game 2014-08-20 19:44:06 +02:00
Deve
5c4c54bf20 xrandr: make sure that output_id and old_mode are declared 2014-08-20 19:44:06 +02:00
hiker
210a8e7ae9 Set the graphical suspension depending on physical suspension (capped).
Adjusted graphical chassis to be 0.1 higher to have similar look at previously
and avoid graphical chassis going into terrain,
2014-08-20 22:19:26 +10:00
hiker
e95536c265 Fixed height computation. Moved adding of gravity center
shift, which probably fixed the problems we had with
 'wheels inside kart chassis' tests earlier.
2014-08-20 21:35:22 +10:00
hiker
4a028afb8f Merge branch 'master' of github.com:supertuxkart/stk-code 2014-08-20 21:25:15 +10:00
hiker
4228fbb0d4 Temporary fixed windows compilation (glGetStringi not known). Needs
a proper fix!!
2014-08-20 21:24:20 +10:00
hiker
6073788813 Fix linux compilation (no nullptr). 2014-08-20 21:07:12 +10:00
Deve
6a48010644 Fixed compilation error with disabled xrandr 2014-08-20 06:49:38 +02:00
Stephen Just
6b3786457f Fix OpenGL extension detection on Linux/Mesa.
Created function in glwrap to test whether a GL extension is available.
This required using OpenGL3's glGetStringi. Backwards compat code can
be added to function if necessary.
2014-08-19 16:19:38 -06:00
vlj
160d4ae432 Merge branch 'texture-factorization' 2014-08-20 02:54:54 +02:00
vlj
fc945a429f Another place found 2014-08-20 02:46:48 +02:00
vlj
d11d56f6cd Replace std::vector<GLuint>{...} in post_processing 2014-08-20 02:42:59 +02:00
vlj
7de6b7adcd Use createVector in others places 2014-08-20 02:21:34 +02:00
vlj
4197e2c320 Another ifdef sets... 2014-08-20 02:05:16 +02:00
vlj
5559a9fd1d Add some #if !defined(APPLE) in debug screen 2014-08-20 02:02:34 +02:00
vlj
b3e6ed03b1 Use VERSION_3_3 macro 2014-08-20 01:56:16 +02:00
vlj
af4fdaf96b Add "functionnal" include in debug.cpp 2014-08-20 01:56:04 +02:00
vlj
953dd9db0d Put some others bunch of code between ifdef win32 2014-08-20 01:48:28 +02:00