ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,715 Commits 9 Branches 28 Tags 433 MiB
069b560350
Commit Graph

7452 Commits

Author SHA1 Message Date
Vincent Lejeune
c77ffb1882 STKBillboard: Create new SceneNode wrapper. 2014-01-27 17:33:08 +01:00
Marianne Gagnon
9c29ae0b26 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-01-26 19:21:50 -05:00
Marianne Gagnon
601726db70 Fix harmless GCC warning 2014-01-26 19:21:07 -05:00
Vincent Lejeune
8a04c48cec Reset skybox texture when loading track. 2014-01-27 01:14:20 +01:00
Vincent Lejeune
684d265924 SSAO: Disable alpha test and simplify code 2014-01-27 00:53:52 +01:00
Vincent Lejeune
63882318a7 SSAO: Fix typo and use 16 samples 2014-01-27 00:47:35 +01:00
Vincent Lejeune
31991ecd7e SSAO: Improve randomness using NEAREST filtering 2014-01-27 00:09:36 +01:00
Vincent Lejeune
bf22a1122b GPUParticles: Force alpha additive for flip particles 2014-01-26 23:34:21 +01:00
Vincent Lejeune
a6c9f11374 SSAO: Use sampling points proposed by Auria. 2014-01-26 23:17:32 +01:00
Vincent Lejeune
270c2e2c52 Lightprepass: Handle skybox ourselves 2014-01-26 23:00:17 +01:00
hiker
41a9b14859 Fixed missing collisions in mansionl (caused by negative default mass 
for objects). Added assert to bullet to catch this kind of problem early.
 2014-01-26 23:36:44 +11:00
Marianne Gagnon
30011be115 My tweaks to SSAO, to improve randomness and final blending 2014-01-25 22:03:47 -05:00
hiker
083c2d42bd Properly fixed position of physical bodies when they are animated 
(thanks to auria).
 2014-01-26 13:35:35 +11:00
Marianne Gagnon
3d054ea91b Bunch of small code cleanup 2014-01-25 21:05:07 -05:00
auriamg
4355c6450e Merge pull request #12 from KroArtem/master 
fix some cppcheck warnings
 2014-01-25 17:23:24 -08:00
Vincent Lejeune
8b5df4143f Fix attempt for black objects. 2014-01-26 01:56:08 +01:00
Vincent Lejeune
88561aa838 STKMesh: Implement (single) texture detail support for objectpass shaded objects. 2014-01-26 01:33:13 +01:00
Vincent Lejeune
2e994502e3 Properly handle unlit object. 2014-01-26 01:09:25 +01:00
KroArtem
fe9cd74934 fix some cppcheck warnings 2014-01-25 23:21:12 +04:00
Vincent Lejeune
06ba2fcb6a STKMesh: Use transparent shader for onttextureblend 2014-01-25 23:09:00 +01:00
Vincent Lejeune
f287cc611d STKMesh: Factorize transparents for reusability 2014-01-25 23:07:07 +01:00
Vincent Lejeune
2e6f95712c Use named passes 2014-01-25 23:02:24 +01:00
Vincent Lejeune
e6c419e695 SSAO: Improve the initial sampling values. 2014-01-25 22:59:09 +01:00
Vincent Lejeune
724aed6609 STKMesh may want to draw rimlimit materials 2014-01-25 22:57:51 +01:00
Marianne Gagnon
825ee2fdfe Fix compilation 2014-01-24 21:02:21 -05:00
Marianne Gagnon
77f36e3e2f Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-01-24 19:13:59 -05:00
Marianne Gagnon
07eba6dfd7 Minor profiler updates 2014-01-24 19:13:53 -05:00
Vincent Lejeune
00b6705624 Revert "Factorize GL state changes to get better performances." 
This reverts commit 17be149e02.
 2014-01-25 01:05:10 +01:00
Vincent Lejeune
17be149e02 Factorize GL state changes to get better performances. 2014-01-25 00:58:35 +01:00
Marianne Gagnon
8295a1e226 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-01-24 18:49:56 -05:00
Marianne Gagnon
190cc9fa9a Clarify a couple error messages 2014-01-24 18:48:40 -05:00
hiker
8389f4afb6 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-25 10:41:00 +11:00
Marianne Gagnon
878d0dcf05 Improve profiler a bit 2014-01-24 18:38:47 -05:00
Vincent Lejeune
c7b2f82e8f Revert "Move final blit in renderGLSL instead of pp" 
This reverts commit 16d87cf820.
 2014-01-25 00:22:44 +01:00
Vincent Lejeune
16d87cf820 Move final blit in renderGLSL instead of pp 2014-01-24 21:37:34 +01:00
Vincent Lejeune
a8ce8c9344 STKAnimatedMesh: Fix setMesh. 
We don't clean our vram however.
 2014-01-24 21:12:55 +01:00
Vincent Lejeune
324c1c1e95 STKMesh: Properly handle setMesh 2014-01-24 21:07:49 +01:00
Vincent Lejeune
c9ecaffb2b STKAnimatedMesh: First pass id is 0, not 1 2014-01-24 20:34:23 +01:00
Vincent Lejeune
8bd6d7945c STKAnimatedMesh: Support for rimlit karts 2014-01-24 20:29:54 +01:00
hiker
fb8347e135 When the physics are updated from the graphics, subtract the 
graphical offset again to make sure physics and graphics are in sync.
 2014-01-24 23:46:52 +11:00
hiker
93cb4b2090 The position and rotation of an IPO animated physical object from a library 
must be transformed by the transform of its (graphical) parent (only library
nodes have a graphical parents) to be correct.
 2014-01-24 23:44:46 +11:00
hiker
9651a9f224 Minor code cleanup, renamed a variable and function. 2014-01-24 22:25:55 +11:00
Vincent Lejeune
a257c1a35c STKAnimatedMesh: 
Avoid copying mesh in the second pass.
 2014-01-24 00:19:10 +01:00
Vincent Lejeune
b362185593 STKAnimatedMesh: Plug the Light prepass system 
Now animated object are rendered like static object with our pipelines.
rimlimit shader needs to be ported though.
 2014-01-23 23:26:43 +01:00
Vincent Lejeune
24fa173c60 STKMesh: Staticify draw function for reusability. 2014-01-23 22:12:03 +01:00
Vincent Lejeune
176e46e5a9 STKAnimatedMesh: Uses custom render. 
But not direct gl draw call yet.
 2014-01-23 21:35:56 +01:00
Vincent Lejeune
b738b1eab3 Revert fog move after transparent pass. 2014-01-23 20:17:17 +01:00
Vincent Lejeune
12f961ee97 Fix lightviz always actived 2014-01-23 20:15:29 +01:00
Vincent Lejeune
f60af23ecd LightPrepass: Disable light on non stkmeshes 2014-01-23 20:05:35 +01:00
Vincent Lejeune
4ebb0ee8d8 OGL32CTX: Fix minimap/kart selection orientation 2014-01-23 20:05:07 +01:00
Vincent Lejeune
9a5bf69ca8 STKMesh: Add an animated variant 
Not customised atm.
 2014-01-23 19:14:13 +01:00
hiker
2bfdfc0373 Fixed crash when trying to vote. 2014-01-23 13:25:50 +11:00
hiker
6066dba9d0 Fixed compiler error. 2014-01-23 13:24:08 +11:00
Marianne Gagnon
70fed45ec1 Fix skin crash 2014-01-22 20:15:35 -05:00
Marianne Gagnon
069f15937a Improve profiler a little 2014-01-22 19:40:40 -05:00
Marianne Gagnon
1d2473e585 Colorize profiler bars so we can see something 2014-01-22 19:21:45 -05:00
Marianne Gagnon
583092bbf8 Don't return pointer to temporary object 2014-01-22 19:03:55 -05:00
hiker
1e721906e7 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-23 09:55:52 +11:00
hiker
57ff391cc3 Re-enable voting for addons. 2014-01-23 09:55:32 +11:00
hiker
d4b95e81b4 Moved hash function from StringUtils into player, there is no 
other use of that function.
 2014-01-23 09:54:48 +11:00
Vincent Lejeune
66894dfeaf LightPrepass: Reenable light debug view 2014-01-22 23:11:49 +01:00
Vincent Lejeune
fc9144786b Use texture swizzle when SSAO is disabled 2014-01-22 22:52:46 +01:00
Vincent Lejeune
d13032ca9b STKMesh: Support for untextured object 
The color are not the correct one though...
 2014-01-22 18:47:22 +01:00
hiker
6b27179b96 Added missing initialisation, some cosmetic changes. 2014-01-22 17:26:03 +11:00
hiker
c72544b49d Added missing calls to Screen::init(). 2014-01-22 16:54:57 +11:00
hiker
476d7db741 Disable online/login widget while login/logout are in progress (to 
avoid race conditions, i.e. a new login arriving at server before
previous logout was processed).
 2014-01-22 16:43:59 +11:00
hiker
2821913b47 Go back to main menu when login out. 2014-01-22 16:34:45 +11:00
Vincent Lejeune
23e5a6c304 Fix kart selection upside down bug 2014-01-22 03:26:04 +01:00
Vincent Lejeune
0926c7be51 Fix Water 2014-01-22 03:16:01 +01:00
Vincent Lejeune
3410b3df6f OGL32CTX: Fix mipmap in gui 2014-01-22 02:11:28 +01:00
Vincent Lejeune
c9ad17cae1 OGL32CTX: Fix draw of karts and minimap 
But it is rendered upside down...
 2014-01-22 01:45:21 +01:00
hiker
a6108181e8 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-22 10:01:41 +11:00
Vincent Lejeune
4cbbf91e4e Light: Sunlight uses the new shaders. 2014-01-21 23:45:53 +01:00
gl3nn
4438db3bbf Fixes #11 2014-01-21 23:11:22 +01:00
Vincent Lejeune
5f942a9d8b OGL32CTX: Replace a couple of draw2DImage/draw2DRectangle 2014-01-21 23:01:58 +01:00
hiker
0d51477f5b Disabled online menu by default (use --online to get access to it). 2014-01-22 08:52:22 +11:00
hiker
5918f43ce6 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-22 08:06:28 +11:00
Vincent Lejeune
5c2b39794c Render fog on top of transparent and fix bubbles 2014-01-21 21:49:19 +01:00
hiker
5474b5528f Removed unnecessary parameter from onUpdate calls. 2014-01-22 07:43:17 +11:00
Vincent Lejeune
cebcfabf05 GPUParticle: Simulation uses vao now. 2014-01-21 21:21:03 +01:00
Vincent Lejeune
9da56ddefc STKMesh, GPUParticles: Some factorization. 2014-01-21 20:58:24 +01:00
Vincent Lejeune
63a611b9ea GPUParticles: Use VAO 2014-01-21 20:34:20 +01:00
Vincent Lejeune
43e4db99b1 GPUParticles: Factorize shader loading in shader.h/cpp 2014-01-21 19:36:55 +01:00
Vincent Lejeune
0d57f4db0d Hack to make displacing object non animated and thus STKMeshes. 2014-01-21 18:42:19 +01:00
Vincent Lejeune
f95c6f0277 STKMesh:Displace support 2014-01-21 18:42:18 +01:00
Vincent Lejeune
7faed75a84 STKMesh: Add support for Displacing 2014-01-21 18:42:18 +01:00
Vincent Lejeune
478a9ab5d3 STKMesh: Some simplifications. 2014-01-21 18:42:18 +01:00
hiker
f0365fc7a0 Removed old login dialog. Fixed tabs in login screen that 
were not properly focused.
 2014-01-21 17:14:23 +11:00
hiker
50ef878e39 Enabled at least VERIFYPEER. 2014-01-21 11:24:07 +11:00
hiker
b9b2f9626e Support running stk from the cmake bin directory. 2014-01-21 08:59:55 +11:00
hiker
f346bc444e Fixed linux compilation. 2014-01-21 08:59:00 +11:00
hiker
6c02f99bca Merge branch 'master' of github.com:supertuxkart/stk-code 2014-01-21 08:13:55 +11:00
hiker
0cefc1d79c Fixed crash in first-time-start of STK when glsl reported to 
be available, but doesn't work.
 2014-01-21 08:13:03 +11:00
hiker
f33d547c54 Moved verbose option to be done even if a file is downloaded. 2014-01-21 08:12:08 +11:00
Vincent Lejeune
a67f5bf511 STKMesh: Use forward rendering for transparent 
Transparent objects may be double sided (like bubble),
it doesn't make sense to use a deferred renderer.
 2014-01-20 21:42:38 +01:00
Vincent Lejeune
f3a9b24880 STKMesh: Start support for transparent object. 
Highly experimental, only applies on the blob shadow under karts.
 2014-01-20 20:43:39 +01:00
Vincent Lejeune
aeba31c4cf Profiler: Fix the rendering and use finer grain. 2014-01-20 20:06:04 +01:00
hiker
260f4f148d Reworked the login and register dialog to be a screen - still 
work in progress (and guest login does not work yet).
 2014-01-20 21:39:59 +11:00
Vincent Lejeune
0817ec4ee0 STKMesh:Another round of factorization. 2014-01-19 21:35:09 +01:00
Vincent Lejeune
e26f8d4bc8 Some welcomed factorization. 2014-01-19 21:17:51 +01:00