ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,797 Commits 9 Branches 28 Tags 433 MiB
34fec63f9c
Commit Graph

8329 Commits

Author SHA1 Message Date
Marianne Gagnon
8e579d4874 Add UBOs flag to graphics options 2014-04-19 20:23:49 -04:00
vlj
87248b46f3 Tweak shadows CSM split. 2014-04-20 02:01:29 +02:00
vlj
fde29887f0 Fix roughness in instanced mesh. 2014-04-20 01:24:38 +02:00
Marianne Gagnon
478e904d1c Remove debug logging 2014-04-19 19:15:38 -04:00
vlj
18b2b341e7 Dont stick to integer coordinate for CSM. 2014-04-20 00:24:37 +02:00
vlj
1291d0cc93 Increase shadow fidelity. 2014-04-20 00:21:30 +02:00
vlj
a457b9f423 Shadows: Clean shaders. 2014-04-20 00:04:49 +02:00
vlj
dd3e15b298 Debug: display cascade in shadow debug mode 2014-04-19 23:57:27 +02:00
vlj
5d3d44e400 Avoid an extra blit in bloom. 2014-04-19 23:29:42 +02:00
vlj
ce6397c5e7 Remove an leftover return. 2014-04-19 23:20:40 +02:00
vlj
c353a60443 Glow: Use blit. 2014-04-19 23:20:12 +02:00
Daniel Butum
c7e9b87e90 Fix memory leak on early exit(0) in handleCmdLinePreliminary() 2014-04-19 20:44:30 +03:00
Vincent Lejeune
d7eaaf4885 Add a m_ubo_disabled switch in user config file. 
This should be used to workaround a bug in intel windows drivers.
 2014-04-19 18:38:57 +02:00
vlj
c695875654 PointLight: Use a 1/(1 + d + k d^2) attenuation 
This is not physically accurate, but a 1/d^2 attenuation makes light
extend too broad, and went too high if close from the source.
 2014-04-19 02:04:39 +02:00
Marianne Gagnon
f6d52511ea Merge branch 'Issue_1263' 2014-04-18 18:24:31 -04:00
Vincent Lejeune
c2d9e9fc42 Directly draw on default fbo if dyn lights are disabled 2014-04-18 19:06:57 +02:00
Vincent Lejeune
9437b16c00 Dont print glGetError result, prefer DEBUG_OUTPUT 2014-04-18 18:50:13 +02:00
Vincent Lejeune
b77a20f621 Bloom: Blit fbo instead of using a shader 2014-04-18 18:45:00 +02:00
Vincent Lejeune
9b926ce713 Do not write to 2 buffers outside of renderLights() 2014-04-18 18:34:02 +02:00
Guillaume P
cca44705cb Merge remote-tracking branch 'remotes/upstrem/master' into skiddingAI 2014-04-18 08:49:54 +02:00
Guillaume P
43441cf3cc A kart is now considered as slow if he is slower than the current kart. 2014-04-18 08:49:18 +02:00
hiker
c9fd09725a Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-17 15:40:36 +10:00
hiker
a8bf73633f Renamed CurrentUser to OnlinePlayerProfile. 2014-04-17 15:39:51 +10:00
hiker
f6d22922d2 Fixed linux compilation. 2014-04-17 13:18:31 +10:00
hiker
056aa5ed6f Refactor so that PlayerProfile provides a proper interface plus 
function/states for local use, and CurrentUser implements the
missing functions.
 2014-04-17 08:19:04 +10:00
hiker
447ca89c0a Removed CurrentUser usage from all files except PlayerManager 
and PlayerProfile.
 2014-04-16 11:13:35 +10:00
Vincent Lejeune
1a908b254f Use more compatible fbo format 2014-04-15 14:48:27 +02:00
hiker
5ec71c5b06 Moved getProfile from CurrentUser to PlayerManager::getCurrentOnlineProfile(). 2014-04-15 16:25:55 +10:00
Marianne Gagnon
70cb9cec59 Update graphics options screen 2014-04-14 19:32:44 -04:00
hiker
8b05f69031 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-15 09:08:04 +10:00
hiker
3b85f601b1 Support automatic online login even if current user is not saved 
(i.e. online login is now started after the player is selected).
 2014-04-15 09:07:13 +10:00
hiker
f33a9f7cf6 Fixed #1282: STK crash on startup for the first time. 2014-04-15 09:06:50 +10:00
Marianne Gagnon
9993e31601 First pass to update video options menu 2014-04-14 19:05:33 -04:00
Marianne Gagnon
60a3cfb3fd Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-14 18:32:36 -04:00
Vincent Lejeune
ea1ba4147d Try to fix additive blend for object 2014-04-14 23:50:12 +02:00
vlj
4c85f6255b Remove the ability to disable pixel shaders 
It doesn't work with GL 3.1 and mesa drivers (which requires a core
context)
 2014-04-14 22:11:20 +02:00
vlj
b7f6084fba Add a config option to disable dynamic lights 2014-04-14 22:06:24 +02:00
vlj
63db2d33c0 Fix a memleak 2014-04-14 21:50:14 +02:00
vlj
b0041633ee Handle skybox texture compression. 2014-04-14 21:48:38 +02:00
vlj
de1bbad76c Add some more graphic config options. 2014-04-14 21:46:51 +02:00
vlj
1d84ea850b Add an option for Tex compression 
Also turn m_ssao into bool.
 2014-04-14 21:37:50 +02:00
vlj
308c9c3b94 Fix too dark screen with MLAA enabled. 2014-04-14 03:48:35 +02:00
Vincent Lejeune
5b47891514 Apply MLAA after color_in. 2014-04-14 03:30:42 +02:00
Vincent Lejeune
ba27eb42ef Bloom: Weight the different sized contribution. 2014-04-14 02:45:15 +02:00
Vincent Lejeune
d342dd78d8 Bloom: Use power of two quads. 2014-04-14 02:15:13 +02:00
Vincent Lejeune
123a192963 Use half res FBO for SSAO 
SSAO is a medium frequency effect, using half res fbo is fine and
improve performance and look by doing an additionnal bilinear filtering.
Also tune up some values.
 2014-04-14 01:01:36 +02:00
Vincent Lejeune
4c37cadd5f Fix crash when loading instanced node without texture. 2014-04-13 22:56:14 +02:00
Marc Coll Carrillo
82cc7af4f6 Avoid the use of the new GP editor as a cheating aid 2014-04-13 21:34:28 +02:00
Guillaume P
3febfecbef Merge remote-tracking branch 'remotes/upstrem/master' into skiddingAI 2014-04-13 20:31:28 +02:00
Marianne Gagnon
99a50ec70c misc little changes 2014-04-13 14:25:10 -04:00
Vincent Lejeune
3cd85a829e Compress/convert to srgb per material basis. 
This allows to remove manual conversion in normalmap shader.
 2014-04-13 17:53:52 +02:00
samuncle
1f14e26bde Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-13 01:01:59 +02:00
samuncle
04e5bb1239 Tweak the new camera 2014-04-13 01:01:24 +02:00
Vincent Lejeune
59c50ebbdd Use ITexture instead of GLuint in GLMesh 2014-04-12 22:33:27 +02:00
Marianne Gagnon
a2d60cc97d move camera closer to kart 2014-04-11 21:24:07 -04:00
vlj
d873d2d4fd Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-12 02:17:31 +02:00
vlj
3828e70f5a Fix for glow effect 2014-04-12 02:15:02 +02:00
hiker
fcedb80a89 Fixed some compiler warnings. 2014-04-12 09:49:46 +10:00
hiker
b8c304b229 Merge branch 'SmoothMoveCamera' of https://github.com/divvy81/stk-code into smooth 2014-04-12 09:28:18 +10:00
Vincent Lejeune
68a71f6e22 Use for_in macro in stkmeshscenenode too. 2014-04-12 00:47:32 +02:00
konstin
9d22b74b54 Fixing compilation issues on linux 2014-04-11 20:14:20 +02:00
vlj
8775a5e006 Properly clean FBO and RTT. 2014-04-11 17:53:28 +02:00
hiker
71ddeda94f Tried to avoid compilation problem on travis (though afaik there are 
still other issues with building on travis atm), though atm only
by a quick hack.
 2014-04-12 01:48:55 +10:00
Dk
d1dcf826a8 Merge remote-tracking branch 'upstream/master' into SmoothMoveCamera 2014-04-11 17:48:16 +05:30
hiker
488c1231c9 Moved getUserState from CurrentUser to PlayerManager::getCurrentOnlineState(). 2014-04-11 16:37:48 +10:00
hiker
3a5a0a56b2 Moved isRegisteredUser from CurrentUser into PlayerManager::isCurrentLoggedIn. 2014-04-11 16:20:04 +10:00
hiker
071aa01f35 Changed all calls to CurrentUser::getID() to PlayerManager::getCurrentOnlineId(). 2014-04-11 16:06:51 +10:00
Marianne Gagnon
00e85b4637 Use PtrVector to get for_in iteration 2014-04-10 20:04:33 -04:00
vlj
09d13e2bfe Try to fix travis ci build. 2014-04-11 00:37:50 +02:00
hiker
df88a013c2 Fixed more conflicts, removed compiler warnings. 2014-04-11 08:14:38 +10:00
hiker
54c7d67b90 Merge branch 'master' of github.com:supertuxkart/stk-code 
Conflicts:
	src/graphics/render.cpp
	src/graphics/shaders.cpp
	src/graphics/stkmesh.cpp
 2014-04-11 08:08:13 +10:00
hiker
27a5959fcc Added stack trace to LeakCheck on windows. Re-enabled stack 
trace printing (though off as default).
 2014-04-11 08:00:10 +10:00
vlj
42482e0c41 Some more conversion 2014-04-10 23:03:57 +02:00
vlj
3a55bbe796 Generalize use of UBO. 2014-04-10 21:16:44 +02:00
Vincent Lejeune
fee89a3a3e Start decoupling tree based draw sequence. 2014-04-10 21:16:43 +02:00
Vincent Lejeune
55097aba91 Add shader file as comment for easier debug 2014-04-10 21:16:43 +02:00
Vincent Lejeune
9ba636f661 Gather View Projection and shadows matrix generation. 2014-04-10 21:16:42 +02:00
hiker
8483f58f9d Moved saved session data from UserConfig to PlayerProfile - which 
means that now each player can individually save an online session.
 2014-04-10 21:14:13 +02:00
hiker
a6f4f50281 Fixed documentation. 2014-04-10 21:14:12 +02:00
hiker
6a3698232e Removed unused parameters. 2014-04-10 21:14:11 +02:00
hiker
ec213fbe28 Removed signedInAs function. 2014-04-10 21:14:11 +02:00
hiker
79edc5fa48 Made getCurrentUser() a static function. 2014-04-10 21:14:10 +02:00
hiker
1d71f8f1e1 Moved ServerJoinRequest from CurrentUser into RequestConnection 
(from which file it is also used in online_screen). And cosmetic
changes everywhere.
 2014-04-10 21:14:09 +02:00
hiker
1299db94e6 Cosmetic changes only. 2014-04-10 21:14:08 +02:00
hiker
502987d3e0 Now each PlayerProfile has a (currently still called) CurrentUser 
which manages online connection data. Work-in-progress to use
only one object for all player data (instead of two atm: PlayerProfile
and CurrentUser).
 2014-04-10 16:32:58 +10:00
Dk
e0d22a28d6 Camera Moves Back Smoothly 2014-04-10 07:06:13 +05:30
Marianne Gagnon
f42e4203cd Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-09 18:55:22 -04:00
Marianne Gagnon
c2fb05cc61 Compute tangents for core track mesh, allowing normal maps 2014-04-09 18:55:17 -04:00
hiker
481b5f22bb Fixed compiler warnings. 2014-04-09 19:07:58 +10:00
hiker
5182cdb18b Fixed line endings. 2014-04-09 19:07:44 +10:00
hiker
25c96d88ec Moved saved session data from UserConfig to PlayerProfile - which 
means that now each player can individually save an online session.
 2014-04-09 08:33:42 +10:00
hiker
de697f26c8 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-09 08:28:01 +10:00
Vincent Lejeune
55489bc188 Use UBO instead of copying Shadow VP matrixes. 2014-04-08 21:45:04 +02:00
Vincent Lejeune
d67834574b Remove some instance of setTransform. 2014-04-08 14:15:29 +02:00
Vincent Lejeune
4f92d9bc6b Remove unused code. 2014-04-08 13:49:13 +02:00
Vincent Lejeune
f65b460f1c Remove some reference to ETS_WORLD. 2014-04-08 13:49:11 +02:00
hiker
8c197a24b2 Fixed documentation. 2014-04-08 16:52:29 +10:00
hiker
c599359737 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-08 12:52:59 +10:00
vlj
62c6029e7a Clean another line. 2014-04-08 02:05:55 +02:00
vlj
84488b192f Another round at cleaning. 2014-04-08 02:02:08 +02:00
vlj
246d581e4c Some cleaning. 2014-04-08 01:52:19 +02:00
hiker
384bdb1124 Removed unused parameters. 2014-04-08 08:19:14 +10:00
hiker
38051c0191 Removed signedInAs function. 2014-04-08 08:09:28 +10:00
hiker
43593d6312 Made getCurrentUser() a static function. 2014-04-08 08:06:52 +10:00
hiker
5956f2fdf7 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-08 08:00:51 +10:00
Vincent Lejeune
c5fd99a096 Clamp to edge when blurring fbo. 2014-04-07 22:38:20 +02:00
Vincent Lejeune
8fc3453eda Fix instancied glossy map. 2014-04-07 22:29:06 +02:00
Vincent Lejeune
939e574cd8 Make bloom effect more subtle. 2014-04-07 22:19:25 +02:00
vlj
e00ce85d7c Support FresnelSchlick factor. 2014-04-07 21:35:10 +02:00
vlj
79c6424703 Use specularmap as glossiness map. 2014-04-07 21:35:09 +02:00
Vincent Lejeune
8aa5031fc0 FBO: Combined TMP1 and TMP2 should embed DS. 2014-04-07 17:47:49 +02:00
hiker
d88f513ad6 Moved ServerJoinRequest from CurrentUser into RequestConnection 
(from which file it is also used in online_screen). And cosmetic
changes everywhere.
 2014-04-07 21:15:42 +10:00
hiker
cb8daa4977 Cosmetic changes only. 2014-04-07 16:52:09 +10:00
hiker
9b1b66689b Moved achievement notification for server from CurrentUser to 
Achievement.
 2014-04-07 13:19:07 +10:00
Marianne Gagnon
569d68dfe1 Add asset to 'clearWindow' to catch invalid uses 2014-04-06 21:05:09 -04:00
Marianne Gagnon
06a3d770e5 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-04-06 20:57:37 -04:00
Marianne Gagnon
61ad56f088 Fix recovery dialog 2014-04-06 20:57:28 -04:00
gl3nn
8d3d65270a Don't allow showing the notification dialog without using the dialog 
queue anymore.
 2014-04-07 02:12:45 +02:00
hiker
73e8fb3556 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-07 09:42:09 +10:00
Marianne Gagnon
a413fa3f15 Add proper instancing fallback when shaders are off 2014-04-06 18:46:25 -04:00
Marianne Gagnon
456d57f7ce Instancing : don't crash when shaders are off 2014-04-06 18:31:15 -04:00
hiker
cb959acb44 Added 'action' parameter to setUserDetail, and made it work when 
the user is not logged in, so that it can be used for the recovery request.
 2014-04-07 08:25:48 +10:00
hiker
6b7dcedc02 Don't log the value of 'current', 'new1' and 'new2' (which are used 
when changing passwords).
 2014-04-07 08:13:33 +10:00
vlj
dd51124680 Fix specular light buffer not written to. 2014-04-06 17:40:51 +02:00
Vincent Lejeune
ada1d2617c Clear SSAO fbo at least once. 
On intel driver (windows) texture swizzling seem not to work everytime
so use an untouched rtt instead of swizzling SSAO rtt if ssao is
disabled.
 2014-04-05 21:21:01 +02:00
Vincent Lejeune
150ee87471 Use glFrameBufferTexture on shadows buffer 
We're sure there is at least gl 3.2 support.
 2014-04-05 20:53:38 +02:00
Vincent Lejeune
a951a8c885 Wrong glsl check when compressing textures. 2014-04-05 20:48:50 +02:00
Vincent Lejeune
04176d52a8 Do not create shadow vao for ctx < gl 3.2 2014-04-05 20:16:15 +02:00
Vincent Lejeune
012cf599b4 Use 2D version of glFramebufferTexture 
glFramebufferTexture is not supported on GL 3.1 context, while
glFramebufferTexture2D is.
Also fix an inverted comparaison.
 2014-04-05 19:22:03 +02:00
hiker
8e8f02a1dc Bugfix: if the recovery dialog was shown and cancelled, no more mouse 
events got sent to the LoginDialog. Seems to be the same problem that was
reported in #1216, and properly fixed in
d954fc6c72. Auria, can you check if this is correct?
 2014-04-06 01:27:04 +11:00
hiker
0a107897ca Moved user search and password change from CurrentUser into the 
corresponding dialogs.
 2014-04-06 01:25:31 +11:00
hiker
800a012283 Removed unnecessary copy of Addon. 2014-04-05 22:25:35 +11:00
hiker
a9ecf5b601 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-05 22:00:30 +11:00
hiker
4a3cf13bc4 Moved voting code from CurrentUser to VoteDialog. 2014-04-05 21:59:56 +11:00
Vincent Lejeune
2264f8e3a7 Disable srgb texture compression for Intel 
RGB texture compression works fine but it looks like srgb TC isnt
properly supported.
A later TODO would be to convert rgb to srgb in cpu and use compression
again.
 2014-04-05 03:13:45 +02:00
vlj
a57e81a37c Use custom FBO instead of Irrlicht's ones. 
This allows STK to use multisampled FBO.
 2014-04-05 02:42:05 +02:00
Vincent Lejeune
ca214230e3 MLAA: Load the right shader for step 2 
No wonder why it didnt work as expected before...
 2014-04-04 19:42:05 +02:00
hiker
85bd942de7 Removed unnecessary variable. 2014-04-04 21:00:22 +11:00
hiker
21f145b951 Moved requestGetAddonVote from CurrentUser into VoteDialog. 
Some cosmetic only changes to VoteDialog to follow style guide.
 2014-04-04 16:46:28 +11:00
hiker
34d79a8cd2 Fixed warning about modal dialog shown while previous dialog is open. 2014-04-04 16:44:55 +11:00
hiker
c663839d98 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-04 15:39:48 +11:00
hiker
59cbfbab6b Fixed compiler warning. 2014-04-04 13:51:27 +11:00
hiker
6bf328e199 Try to fix clang compilation (note that std::swap does not work 
on std::vector<bool>).
 2014-04-04 13:50:35 +11:00
hiker
de694cc5fe Merge branch 'master' of github.com:supertuxkart/stk-code 2014-04-04 08:36:24 +11:00
hiker
dcba93aa7e Moved canceling of friend requests into UserInfoDialog. 2014-04-04 08:15:48 +11:00
vlj
6a3556b4ba Shaders'outputs use premultiplied alphas 2014-04-03 14:46:35 +02:00
hiker
e8e4b7ad5f Fixed unnecessary double precision computation. 2014-04-03 17:13:54 +11:00
hiker
af94314462 Merge branch 'crash-impulsion' of https://github.com/gupascal/stk-code into gupascal-crash-impulsion 2014-04-03 17:00:51 +11:00
hiker
d9267a937a Moved 'removeFriendRequest' into UserInfoDialog. 2014-04-03 16:58:38 +11:00
Vincent Lejeune
afa2e2e98d Use a A8R8G8B8 fbo to apply mlaa. 2014-04-03 00:55:30 +02:00
Vincent Lejeune
33b44c8c97 Port MLAA to new pipeline. 2014-04-03 00:14:58 +02:00
hiker
712d4cf84e Updated documentation for Christmas mode. 2014-04-03 08:20:43 +11:00
Vincent Lejeune
f41b737913 Merge grass_pass*.vert 2014-04-01 23:16:30 +02:00
Vincent Lejeune
23e5ec709d Add a fake subsurface scattering for grass. 2014-04-01 23:13:16 +02:00
vlj
0fb6515bca Instancing: Support for alpha ref shadow. 2014-03-31 22:06:37 +02:00
vlj
52018bbdea Instancing: Support shadow. 2014-03-31 21:52:42 +02:00
Vincent Lejeune
008e5e747a GPUParticles: some factorisation. 2014-03-31 20:49:14 +02:00
Vincent Lejeune
7ebeaa45e8 Some cleaning. 2014-03-31 20:04:34 +02:00
Vincent Lejeune
427ca42f49 Enable texture compression. 2014-03-31 19:44:11 +02:00
Vincent Lejeune
551e6cc9c8 Add support for alpha ref instancied materials. 2014-03-31 19:16:26 +02:00
Vincent Lejeune
8c3c380ded Actually enable scale. 2014-03-31 18:25:12 +02:00
Vincent Lejeune
bb311618e3 Instancing: Add support for scale transformation. 2014-03-31 18:10:45 +02:00
Vincent Lejeune
e1e791ff73 reenable diffuse env map 2014-03-31 17:33:30 +02:00
Vincent Lejeune
35f91e73ca Merge branch 'properlinearpipeline' 
* properlinearpipeline:
  Disable auto exposure for now.
  Using formula from an article suggested by samuncle
  Improve bright attenuation although not perfect
  Plug in brightness adaptation
  Add some code to average log luminance.
  Write a shader to convert CIE to RGB.
  Factorize luminance computation.
  Improve ao and bloom.
  Remove some unused code
  Fix negative value that introduces a bug on nvidia
  Expand HDR use.
  Convert texture from srgb and use srgb fbo
 2014-03-31 17:26:08 +02:00
vlj
58615c0207 Plug in brightness adaptation 2014-03-31 17:25:03 +02:00
vlj
6e8b45a6d8 Add some code to average log luminance. 2014-03-31 17:25:02 +02:00
Vincent Lejeune
881d0b9954 Factorize luminance computation. 2014-03-31 17:24:53 +02:00
vlj
8fc383206f Improve ao and bloom. 2014-03-30 23:47:19 +02:00
vlj
77b289fed6 Remove some unused code 2014-03-30 23:38:18 +02:00
vlj
6d3901f6a2 Clean skybox handling 2014-03-30 21:51:46 +02:00
Vincent Lejeune
1481a110a5 Use utils function for renderbloom/blend 2014-03-30 20:49:14 +02:00
vlj
bfdba01f2b Expand HDR use. 2014-03-30 19:15:25 +02:00
vlj
10e2218b8c Convert texture from srgb and use srgb fbo 2014-03-30 18:19:59 +02:00
Marianne Gagnon
9a5e3d9c9c Try to handle case where addons XML file cannot be loaded 2014-03-30 11:48:38 -04:00
Marianne Gagnon
7cd93708cf Merge remote-tracking branch 'konstin/spaces' : Remove trailing spaces, use spaces and not tabs for indentation 2014-03-30 11:25:16 -04:00
konstin
4d3e835021 re-adding -help 2014-03-30 16:19:09 +01:00
Marianne Gagnon
d08e81ab56 Improve behavior when using instancing with physics objects 2014-03-29 18:39:15 -04:00
konstin
7cc83e1475 running whitespaces.py update 1 2014-03-29 11:33:43 +01:00
konstin
663fffdebb Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces" 
This reverts commit 65e2dcf2f0.
 2014-03-29 11:32:04 +01:00
vlj
91c4e9de94 Fix orientations. 2014-03-29 02:19:08 +01:00
Marianne Gagnon
b7c07536f0 Merge branch 'Instancing' 2014-03-28 21:10:52 -04:00
Marianne Gagnon
d90c3753df Pass absolute rotation, not relative rotation 2014-03-28 21:05:21 -04:00
vlj
1bac60c48a Attempt to fix orientations. 2014-03-29 02:04:20 +01:00
vlj
f4eeb68fd4 Merge branch 'Instancing' 2014-03-29 01:22:57 +01:00
vlj
ca1a1e37d9 Fix normals for normal object. 2014-03-29 01:22:08 +01:00
Marianne Gagnon
fb90388e10 Apply patch by Marc Coll to improve upon his work on GP progress display 2014-03-28 19:16:56 -04:00
Marianne Gagnon
9406d69a72 Cleanup instancing nodes when cleaning track 2014-03-28 18:46:52 -04:00
konstin
fc2d55d6a5 Fixing #1263 and little bit refactoring 2014-03-28 22:10:43 +01:00
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +01:00
vlj
35c8a14938 Forgot to clean some VAOs. 2014-03-28 01:55:10 +01:00
vlj
008b070aab Properly clean GL buffers in instancing node. 2014-03-28 01:43:59 +01:00
vlj
c70b9ba0f8 Explicitly build the inverse matrix 
Some drivers does not support inverse function although they advertise
glsl 140 support, and it's faster  to do it manually as we know the
structure of the matrix.
 2014-03-27 19:12:55 +01:00
vlj
b384716cc4 getWind() changes. 2014-03-27 01:25:04 +01:00
Marianne Gagnon
348a20288f Apply patch by Marc Coll to have better progress reports during long GPs, thanks! 2014-03-26 20:14:29 -04:00
Vincent Lejeune
14500d65ab Reverse order of templates in glwrapp.hpp 2014-03-26 21:18:36 +01:00
Vincent Lejeune
0f451c8f9d List files when shader link fails. 2014-03-26 20:49:58 +01:00
vlj
8b652ababb Merge object_pass*.vert 2014-03-26 19:04:46 +01:00
vlj
ae5c7b8c3d Implement UI single color overload 2014-03-26 19:04:45 +01:00
Guillaume P
c04ee0f345 When a kart has crashed, make the impulsive force a little more realistic. (depending on the kart velocity). 2014-03-25 16:59:20 +01:00
vlj
71881ac64d Add orientation to grass material 2014-03-25 16:49:03 +01:00
hiker
24dc70427f Fixed compiler warnings. 2014-03-25 20:54:20 +11:00
Vincent Lejeune
9fef40318e Fixes for grass instancied material. 2014-03-25 00:09:32 +01:00
Vincent Lejeune
72556fddc3 Don't use glDebugMessageCallbackARB if null 2014-03-24 21:47:24 +01:00
vlj
a866b3f416 Add Grass material support for instancing. 2014-03-24 16:40:40 +01:00
Sachith Hasaranga Seneviratne
7232e6c11e Scripts can now squash karts by id and for a defined period of time 2014-03-24 11:32:46 +05:30
Sachith Hasaranga Seneviratne
6385937668 Revert "Trigger now has access to kart that triggered it" 
This reverts commit 88de3ebfb7.
 2014-03-24 11:12:51 +05:30
Sachith Hasaranga Seneviratne
f9cdb05751 Revert "Revert "Removed unnecessary comment"" 
This reverts commit e967e9a1f9.
 2014-03-24 11:12:04 +05:30
Sachith Hasaranga Seneviratne
e967e9a1f9 Revert "Removed unnecessary comment" 
This reverts commit 954e963d1a.
 2014-03-24 11:10:43 +05:30
Sachith Hasaranga Seneviratne
88de3ebfb7 Trigger now has access to kart that triggered it 2014-03-24 09:05:28 +05:30
Marianne Gagnon
d798398478 Merge branch 'Instancing' of https://github.com/supertuxkart/stk-code into Instancing 2014-03-23 18:55:51 -04:00
Marianne Gagnon
bb28e26eff Cleanup for instancing 2014-03-23 18:55:45 -04:00
vlj
3423cbf60b Some fixes. 2014-03-23 20:05:51 +01:00
Vincent Lejeune
76cf04f548 Clean code to make it extendable later 2014-03-23 19:50:33 +01:00
Vincent Lejeune
5c8ef365a5 Merge instanced_object_pass vertex shaders. 2014-03-23 19:28:07 +01:00
Vincent Lejeune
5dd2d28134 Merge branch 'master' into Instancing 2014-03-23 19:20:23 +01:00
Marianne Gagnon
ae92b4007b Add initial basic support for loading instancing nodes 2014-03-22 20:55:30 -04:00
Marianne Gagnon
ce1cbd44da Use new single-color overload in font where possible 2014-03-22 19:38:48 -04:00
vlj
a21d162d5a Add an overload for draw2DImage with a single color 2014-03-23 00:29:47 +01:00
vlj
6fc2248d7a GPUParticles: some factorisation 2014-03-23 00:19:57 +01:00
vlj
9752689d15 Do not render billboard outside of transparent pass 2014-03-22 23:18:07 +01:00
vlj
c0b2b23692 Factorise cubevbo/vao in shader.cpp 2014-03-22 23:09:33 +01:00
vlj
fd82494ee8 Add file path when a compiler error arise. 2014-03-22 22:32:01 +01:00
Vincent Lejeune
2cbf8dafc7 SkyShader: attrib position is not always 0. 2014-03-22 20:05:56 +01:00
Vincent Lejeune
29749d5dbd Merge commit 'f3e2da881a4d394c4ca902548e788f5b4c0bdd81' 
* commit 'f3e2da881a4d394c4ca902548e788f5b4c0bdd81':
  Do not build shadow shader without gs support.
  Add a function to query supported glsl ver
  Some drivers dont support const array
 2014-03-22 18:54:51 +01:00
Vincent Lejeune
f3e2da881a Do not build shadow shader without gs support. 2014-03-22 18:36:21 +01:00
Vincent Lejeune
ae3cf30070 Add a function to query supported glsl ver 2014-03-22 18:36:20 +01:00
Unitraxx
c647fa5081 Merge pull request #1252 from mcsab/master 
Reset-per-lap achievement support
 2014-03-22 01:12:28 +01:00
Csaba Molnar
ca19a428b2 merge, comment fix, never-consistence fix 2014-03-22 01:02:52 +01:00
Csaba Molnar
3a5812dd6c Merge branch 'master' of https://github.com/supertuxkart/stk-code 
Conflicts:
	data/achievements.xml
 2014-03-22 00:52:33 +01:00
Vincent Lejeune
1f1e79477d Add missing utils/log.hpp in glwrap.hpp 2014-03-22 00:24:00 +01:00
Vincent Lejeune
340eaa9352 Factorize getLightFactor 2014-03-21 18:36:47 +01:00
Vincent Lejeune
01b88fde9d Factorize DecodeNormal from misc shaders. 2014-03-21 18:17:21 +01:00
Vincent Lejeune
77e5f413c7 Factorize EncodeNormal from Pass1 shaders. 2014-03-21 18:10:54 +01:00
Vincent Lejeune
f0e96bb7f2 Use variadic function to load shader 2014-03-21 18:09:10 +01:00
Vincent Lejeune
9728226ee3 Forgot to dereference a value. 2014-03-21 15:58:21 +01:00
Guillaume P
0faa3b2eac Don't fire a cake if the target kart is driving too slow. 2014-03-21 14:36:31 +01:00
Guillaume P
c857bbaec0 Merge remote-tracking branch 'remotes/upstrem/master' into skiddingAI 2014-03-21 14:05:42 +01:00
Sachith Hasaranga Seneviratne
954e963d1a Removed unnecessary comment 2014-03-21 15:40:08 +05:30
Sachith Hasaranga Seneviratne
4dd0d4c0bb Added better Message 2014-03-21 15:36:59 +05:30
Sachith Hasaranga Seneviratne
c1b8927b31 Cleaned up a bit 2014-03-21 15:31:28 +05:30
Marianne Gagnon
89e070c7f3 Revert dubious change from GP patch 2014-03-20 21:30:10 -04:00
Marianne Gagnon
2f2547420d Apply Marc Coll's Grand Prix editor, thanks! There will be refinements to come for sure, but this is a very nice start 2014-03-20 21:13:05 -04:00
vlj
68935decaa Reenable Debug Output on windows. 2014-03-21 01:44:14 +01:00
vlj
a35b7d1e2d Do not reload Caustic/displace texture each frame 2014-03-21 01:43:45 +01:00
auriamg
dee2a0300e Merge pull request #1259 from cosmincav/master 
Added achievement: unstoppable
 2014-03-20 20:08:43 -04:00
vlj
f06ad3c785 Reenable transparent + fog material. 2014-03-20 18:25:44 +01:00
vlj
b3f59437b1 Fix rubber band effect for plunger. 2014-03-20 18:06:59 +01:00
cosmin.crecana
8616ce546a achievement_unstoppable 2014-03-20 15:30:11 +02:00
Sachith Hasaranga Seneviratne
4334d9a022 Added haybail.as 2014-03-20 15:05:33 +05:30
vlj
a3eee305ca Remove the max distance for lights 2014-03-19 23:07:40 +01:00
vlj
822081deb4 Only reupload buffer for skidding mark 2014-03-19 23:00:45 +01:00
Vincent Lejeune
4128371b7f Do not switch program if it's not used. 2014-03-19 19:02:29 +01:00
Vincent Lejeune
782e280bfc Factorize PointLightShader vao and vbo. 2014-03-19 18:42:48 +01:00
Vincent Lejeune
1e8bc6bc41 Try to avoid updating skidmark each frames. 2014-03-19 01:54:07 +01:00
Vincent Lejeune
9a6d15a865 Attempt to fix skidding mark's color 2014-03-19 01:25:54 +01:00
Vincent Lejeune
433903be5d Reenable skidmark, although their color is wrong 2014-03-19 01:07:32 +01:00
Marianne Gagnon
9042a4e0f2 Fix bogus merge, sorry 2014-03-18 19:26:36 -04:00
Marianne Gagnon
4948f5acb2 Merge branch 'master' of https://github.com/sudip1401/stk-code 
Conflicts:
	data/achievements.xml
	src/achievements/achievement_info.hpp
 2014-03-18 19:16:43 -04:00
Vincent Lejeune
dd5997d277 Start working on instancing library node 2014-03-18 23:47:53 +01:00
Vincent Lejeune
4af050e1c0 Bring back minimap. 2014-03-18 23:47:40 +01:00
Csaba Molnar
83ae6909b5 Tab fix 2014-03-18 23:47:40 +01:00
Csaba Molnar
571b3a8e34 Wrong include corrected (\ -> /). 
Drift counting fixed.
 2014-03-18 23:47:39 +01:00
Csaba Molnar
806da15a12 Skidding achievement 2014-03-18 23:47:38 +01:00
hiker
506b64b587 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-18 21:18:30 +11:00
hiker
2173ae8280 Try to work around the currently reported build problem by travis. 2014-03-18 21:17:40 +11:00
sudip1401
0bca25504a Poweruplover achievement 2014-03-18 13:18:50 +05:30
hiker
03b1994041 Merge branch 'master' of https://github.com/konstin/stk-code into konstin-master 2014-03-18 16:22:59 +11:00
hiker
0f4fb50fd6 Merge branch 'master' of https://github.com/KroArtem/stk-code into KroArtem-master 2014-03-18 16:15:14 +11:00
hiker
cd7e9ff8a9 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-18 10:47:53 +11:00
hiker
3d5fbaa92f Merge branch 'master' of https://github.com/gupascal/stk-code into gupascal-master 
Fixed some merging issues.
Conflicts:
	data/achievements.xml
	src/achievements/achievement_info.hpp
 2014-03-18 10:44:11 +11:00
Marianne Gagnon
3d6fd8e792 Add patch to mention firing back in tutorial 2014-03-17 18:52:36 -04:00
Csaba Molnar
249635f01a onLapEnd() fix 2014-03-17 22:30:17 +01:00
Csaba Molnar
60f1d8ae20 Achievement reset-after-lap beta 2014-03-17 22:07:55 +01:00
sudip1401
72920ab0ab Poweruplover achievement 2014-03-18 02:20:51 +05:30
hiker
e9367dd1c9 Fixed potential crash if RelationInfo should not exist, which I saw 
once while a decline was in progress), started some minor refactoring.
 2014-03-18 07:48:52 +11:00
sudip1401
89d7663112 Poweruplover achievement 2014-03-18 02:04:01 +05:30
KroArtem
4dec9c3fc5 having fun reverting changes 2014-03-17 23:56:49 +04:00
konstin
de50ea46e8 Allow karts to specifie a different sound effect for their engine; closes #1234 2014-03-17 17:01:34 +01:00
Sachith Hasaranga Seneviratne
9ac9cfbdca Added additional script support for removing track objects tested with farm track with the haybail.as script 2014-03-17 18:12:03 +05:30
Guillaume P
45ab7e6907 Clean up some minor coding style issues 2014-03-17 08:21:49 +01:00
Guillaume P
3f35a48dda Now IA don't fire a cake if the kart is driving too slow. Also correct some comments. 2014-03-17 08:14:35 +01:00
Guillaume P
b4fe033331 Revert "Now IA don't fire a cake if the kart is driving too slow. Also correct some comments." 
This reverts commit 9030291340.
 2014-03-17 08:10:21 +01:00
Sachith Hasaranga Seneviratne
35be1f142a track objects can be enabled/disabled/their status can be checked on, TODO: move this to scripting 2014-03-17 09:26:24 +05:30
KroArtem
66c5d4a645 removed unused functions 2014-03-16 15:28:46 +04:00
Sachith Hasaranga Seneviratne
c8e0d56ce9 Added Build target for AngelScript, Updated Readme,txt 2014-03-16 16:50:14 +05:30
Sachith Hasaranga Seneviratne
7e4cf23ee3 Removed unnecessary projectfiles 2014-03-16 16:36:18 +05:30
Sachith Hasaranga Seneviratne
5b9e214b83 Added additional instructions to readme.txt 2014-03-16 13:01:19 +05:30
Sachith Hasaranga Seneviratne
f1a4df7127 Added stuff to track object presentation 2014-03-16 12:26:35 +05:30
pgabor
f84f49dfc8 Adding a Wiimote with other one alredy placed - Bug: #1209 fixed 2014-03-15 21:15:04 +01:00
KroArtem
d4e90f83f2 revert unique_ptr back to auto_ptr 2014-03-15 23:30:15 +04:00
Vincent Lejeune
ce12ebe9ce Bring back minimap. 2014-03-15 20:05:04 +01:00
auriamg
847ceca671 Merge pull request #1243 from mcsab/master 
Skidding achievement
 2014-03-15 15:01:41 -04:00
Csaba Molnar
c175f2450e Tab fix 2014-03-15 19:58:25 +01:00
Marianne Gagnon
037688b020 Fix terminal warning flood, and improve error detection. Thanks to vlj for help 2014-03-15 14:39:27 -04:00
Csaba Molnar
bc3850ebdb Wrong include corrected (\ -> /). 
Drift counting fixed.
 2014-03-15 19:18:03 +01:00
Vincent Lejeune
1b4863d7aa Add asserts before binding vao and fix 0 glow vao 2014-03-15 18:59:22 +01:00
Marianne Gagnon
0425cf2ef4 Implement color variation in particle system 2014-03-15 13:35:51 -04:00
Guillaume P
5af377da07 Fix a build issue for Travis CI. 2014-03-15 15:58:17 +01:00
KroArtem
a3a851b300 Merge remote-tracking branch 'upstream/master' 2014-03-15 18:30:17 +04:00
Guillaume P
8a34be1ab3 Add a new Gold Driver achievement. 2014-03-15 15:12:28 +01:00
Guillaume P
9030291340 Now IA don't fire a cake if the kart is driving too slow. Also correct some comments. 2014-03-15 10:52:01 +01:00
Sachith Hasaranga Seneviratne
acbfb96bbf Added script files 2014-03-15 10:55:03 +05:30
hiker
de820054b6 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-15 11:55:28 +11:00
hiker
3f738b60d5 Fixed crash in UserInfoDialog if an invalid response is received (friend id 
is not contained in the response --> profile not found --> crash. Now
the friend id is stored in the request itself, and not needed in the response
from the server). Moved RejectFriendRequest into UserInfoDialog.
 2014-03-15 11:54:04 +11:00
Csaba Molnar
385f108b16 Skidding achievement 2014-03-15 00:38:16 +01:00
Marianne Gagnon
3fb98fe85f Work around crash in render code. Vlj, please review this, this is likely not the proper fix 2014-03-14 19:35:35 -04:00
hiker
aa169d0191 Moved AcceptFriendRequest into UserInfoDialog. 2014-03-15 10:27:13 +11:00
hiker
f76536ca31 Moved FriendRequest into corresponding GUI object. 2014-03-15 10:13:44 +11:00
hiker
e63ad2754d Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-15 09:48:14 +11:00
hiker
e77287d3ce Moved signup request from CurrentUser to register screen. 2014-03-15 09:34:23 +11:00
KroArtem
ccd6019f48 Merge remote-tracking branch 'upstream/master' 2014-03-15 01:15:48 +04:00
Vincent Lejeune
cb344520ef Merge branch 'BatchedDrawCalls' 2014-03-14 16:57:18 +01:00
Vincent Lejeune
0c5d5ce96e IBL: Fix sampling ignoring cubemap rotation 2014-03-14 16:51:07 +01:00
Vincent Lejeune
740c251808 Use Instancing for lights. 2014-03-14 16:51:06 +01:00
Vincent Lejeune
6cad7339e3 Factorize texture binding. 2014-03-14 16:51:05 +01:00
Vincent Lejeune
cf2035ca0a Batch draw calls 2014-03-14 16:51:05 +01:00
hiker
c0a70830c2 Moved ServerCreationRequest from CurrentUser into the server creation screen. 2014-03-14 22:18:02 +11:00
hiker
6afc12c866 Moved recovery request into recovery dialog. Fixed recovery dialog to 
work now (except the URL sent from the server is still wrong).
 2014-03-14 16:44:58 +11:00
Rakesh Ranjan Nayak
9b50c9f8bd merged code with upstream master 2014-03-13 22:47:06 +05:30
Rakesh Ranjan Nayak
59e0e3c9be added an achievement banana lover 2014-03-13 22:33:20 +05:30
Rakesh Ranjan Nayak
8f55faeed3 added achievement banana lover 2014-03-13 22:28:52 +05:30
hiker
7e1a59fe99 Mark fulfilled achievements in blue. 2014-03-13 17:18:28 +11:00
hiker
cecb725228 Display correct results for achieved achievements. 2014-03-13 17:12:51 +11:00
hiker
a5f9d26f88 Fixed display of achievements when not logged in. 2014-03-13 08:31:06 +11:00
Guillaume P
955b27bf75 Add a Marathoner achievement. 2014-03-12 14:15:16 +01:00
hiker
4eb4ce1511 Bugfix: onRaceEnd was not called for achievements (resulting in 
achievements not being reset at end of a race).
 2014-03-12 22:40:43 +11:00
hiker
be9d7292f2 Replaced template function to simplify setting online request data with 
function (since template doesn't compile on linux without -std=gnu++0x or so).
 2014-03-11 17:13:37 +11:00
hiker
642797bdde Cosmetic changes to follow our coding style. Also fixed incorrect 
'waiting for friends' message while waiting for achievements.
 2014-03-11 17:03:07 +11:00
Guillaume P
16cff9097b Fix a compilation issue with VS10. 2014-03-09 10:10:34 +01:00
auriamg
112c46fa14 Merge pull request #1236 from divvy81/downstream 
Change of color player kart when any player quits
 2014-03-08 19:11:14 -05:00
Marianne Gagnon
56a8fe8fbe Some cleanup in particles. Make 'scale affector' behavior uniform between GPU particles and fallback irrlicht particles 2014-03-08 19:02:42 -05:00
Dk
b4d922512e 1195 Multiplayer Kart selection screen commit 22 2014-03-08 21:08:06 +05:30
hiker
796d43ebb2 For now avoid the use of the template, since it doesn't work on linux. 2014-03-08 12:24:44 +11:00
hiker
56b53cc3c0 Another try to fix linux compilation. 2014-03-08 11:49:18 +11:00
hiker
51f3a6d555 Added static template function to CurrentUser to create html requests, 
which will prefill the HTML request with the details of the current user.
So far used only in online_profile.
 2014-03-08 10:29:40 +11:00
hiker
809cb27d89 Fixed crash when clicking on empty achievement list. 2014-03-07 16:35:13 +11:00
hiker
f86646abb9 Fixed crash (when clicking on empty friend list). 2014-03-07 16:33:07 +11:00
hiker
3c1a7b1c7b Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-07 16:05:17 +11:00
hiker
c8749a3400 Fixed unnecessary include. 2014-03-07 16:04:59 +11:00
hiker
1ccac0db7c Fix #1232 (GP causes crash). 2014-03-07 16:04:10 +11:00
Marianne Gagnon
10caa7a2ec Post-merge tidying up 2014-03-06 19:19:39 -05:00
auriamg
780201b1ad Merge pull request #1226 from konstin/master 
Solving Issue 1180 - Load addon GPs from local folder
 2014-03-06 19:12:29 -05:00
hiker
58c325e6c3 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-03-07 11:02:53 +11:00
hiker
7cb7651c07 Renamed Profile to OnlineProfile to better distinguish the various profiles we use. 2014-03-07 11:02:07 +11:00
Vincent Lejeune
cbd7453f7b Do not crash if old shaders dont compile 2014-03-07 00:03:26 +01:00
hiker
d19b5a2732 Fxed support for searching for data and assets based on the executable location. 2014-03-07 07:53:35 +11:00
konstin
f7953f4f12 Adding debug messages for 1180 2014-03-06 20:30:52 +01:00
Dk
52e910a438 1195 Multiplayer kart selection commit 21 2014-03-06 23:39:33 +05:30
Dk
7c8a32a10e 1195 MUltiplayer kart selection cmmit 21 2014-03-06 23:31:34 +05:30
konstin
9ddd5a2d5c reducing the pull request to it's content 2014-03-06 11:58:09 +01:00