ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,562 Commits 9 Branches 28 Tags 433 MiB
33e3b43346
Commit Graph

8977 Commits

Author SHA1 Message Date
hiker
a81f21a27a Applied konstin's bugfix for an editor crash. 2014-07-31 09:28:42 +10:00
Vincent Lejeune
f1c29ad26f Port instancing shaders to singleton. 2014-07-30 00:34:00 +02:00
Vincent Lejeune
b935e9316a Update doxygen comment. 2014-07-30 00:10:00 +02:00
Vincent Lejeune
a35c33e4f6 Remove ambient 
It's already added in the diffuse env pass
 2014-07-29 23:56:48 +02:00
Marianne Gagnon
db26ef3076 More work on billboard text 2014-07-28 19:49:14 -04:00
Marianne Gagnon
f803b01d10 Initial work on billboard text 2014-07-28 19:17:59 -04:00
Marianne Gagnon
3db9b867a6 In artist debug mode, fast-track race start even more, tired of waiting after thunderbird to test 2014-07-28 19:16:32 -04:00
Marianne Gagnon
c2cd32d4de Fix c++2011 logic from previous commit. STK now builds again on my mac, finally! 2014-07-28 19:01:53 -04:00
Vincent Lejeune
ff5e457869 Fix include in wiimote_manager.hpp 2014-07-29 00:50:40 +02:00
Vincent Lejeune
fca54c8f74 Remove some other emplace_back. 2014-07-29 00:48:14 +02:00
Vincent Lejeune
f31013b4af Fix include in stkbillboard 2014-07-29 00:40:37 +02:00
Vincent Lejeune
bd7babe11f Rename cpp2011.h 2014-07-29 00:35:43 +02:00
Marianne Gagnon
6d100a23d8 Force billboard to render in transparent phase, won't work otherwise 2014-07-28 18:29:10 -04:00
Vincent Lejeune
13f22ab1cd If there is a sphericalHarmonicsTexture, kill ambient. 2014-07-29 00:19:50 +02:00
Vincent Lejeune
b9e56303c1 Try to replace emplace_back() call. 
Only on some part of the code, need confirmation it works before
propagating.
 2014-07-28 23:41:01 +02:00
hiker
dbe722316a If an addon icon can not be shown, delete the image file (which will 
trigger a re-download on the next start).
 2014-07-28 21:07:39 +10:00
hiker
f6fcb9d8da Changed return type of getIconBasename() to be a reference. 2014-07-28 21:07:03 +10:00
hiker
d3dbc42174 Fix #1429 (physical objects do not reset when restarting a race). 2014-07-28 16:53:08 +10:00
hiker
425675bdac Moved check_structure detection from center of kart to the front 
of the kart (which will work better for a photo finish). Hopefully
no other side effect.
 2014-07-28 09:52:44 +10:00
Vincent Lejeune
f87b404561 Add some doxygen on shader creation/usage 2014-07-26 23:54:57 +02:00
konstin
7a2e4e6336 corrections 2014-07-26 12:00:24 +02:00
konstin
5167397441 Merge branch 'master' of https://github.com/supertuxkart/stk-code into laps 2014-07-25 14:18:54 +02:00
konstin
4e73ace0df allow the track info dialog to override the default lap number for a track 2014-07-25 14:06:04 +02:00
deve
f3746c068c Some minor fixes for MinGW compiler 2014-07-25 13:00:01 +02:00
hiker
fbf5bf4166 Changed default number of laps to be 3 (and not the number of laps 
used last time), which seems to be a better default. Some minor
cosmetic changes.
 2014-07-24 17:43:11 +10:00
hiker
9267e2d304 Merge branch 'lapnumber' of https://github.com/konstin/stk-code into konstin-lapnumber 2014-07-24 16:48:03 +10:00
Marianne Gagnon
9478adbd8c Merge branch 'TupleTest' 2014-07-23 21:17:08 -04:00
Marianne Gagnon
7f56bf6946 Invalid defaut value for sortable was used in list widget 2014-07-23 18:43:12 -04:00
Flakebi
277aab1a0e Fix compiling issues without debug mode in my log code 2014-07-23 21:40:46 +02:00
hiker
9fa93d74d5 Fixed linux compilation. 2014-07-23 22:11:37 +10:00
Marianne Gagnon
06e4cbb9be Fix input config screen, since the list widget was improved it didn't display quite right 2014-07-22 20:09:38 -04:00
Flakebi
55090a0566 Unify log output 2014-07-22 12:54:11 +02:00
Flakebi
53fd34f7b8 Fix issues with in-game screens 2014-07-22 12:54:11 +02:00
Flakebi
a9a46a2dd6 Some little fixes 2014-07-22 12:54:10 +02:00
Marianne Gagnon
fff498b9fe Improve graphics settings dialog to try to avoid mutually incompatible options 2014-07-21 19:58:45 -04:00
Marianne Gagnon
b2fab2ae6d Fix glitch where the irrlicht dialog close button would be slightly visible in the corner of a STK dialog, and a crash would ensue if you clicked it 2014-07-21 19:55:02 -04:00
Marianne Gagnon
14080e602a Code in previous commit was incorrect, no idea why it even compiled for me 2014-07-20 18:18:35 -04:00
Marianne Gagnon
476d6eda02 almost there 2014-07-20 18:10:48 -04:00
Marianne Gagnon
01ed87ec1b continue 2014-07-18 20:30:35 -04:00
Marianne Gagnon
7e8fb6bc16 Fix duplicated paramter name 2014-07-18 20:11:40 -04:00
Marianne Gagnon
071270cb5e more work 2014-07-18 20:02:10 -04:00
Marianne Gagnon
40851516ac continuing work 2014-07-18 19:22:20 -04:00
Deve
bb4381a0a7 Merge pull request #1414 from konstin/fontsize 
fix #1410 + better text alingment in GP info dialog
 2014-07-18 21:02:35 +02:00
konstin
7a8743fb65 better text alingment in GP info dialog 2014-07-18 16:03:23 +02:00
konstin
0a93b7a2d3 fix #1410 2014-07-18 15:58:34 +02:00
Marianne Gagnon
6aa95f58b9 Merge branch 'master' into origin/TupleTest 2014-07-17 20:01:27 -04:00
Marianne Gagnon
00ae12677a Fix GUI crashes when exiting STK by clicking the X button in the window titlebar 2014-07-17 19:24:35 -04:00
konstin
e7a9c6fcc6 Merge branch 'master' of https://github.com/supertuxkart/stk-code into lapnumber 2014-07-17 20:32:54 +02:00
Marianne Gagnon
e6fd365685 Re-fix clang fixes so that it works on other compilers too 2014-07-16 20:02:52 -04:00
Marianne Gagnon
8483613a4e clang fixes 2014-07-16 19:51:24 -04:00
vlj
c4238d2089 Use emplace_back instead of push_back(std::make_tuple()) 2014-07-17 01:44:57 +02:00
vlj
14e3ccd059 Duplicate singleton code for abstract/non abstract cases 2014-07-17 01:30:45 +02:00
vlj
366439bdd0 Reenable transparents. 2014-07-17 01:07:59 +02:00
vlj
6e4cca81d1 Fix material identification. 2014-07-17 01:06:17 +02:00
vlj
25c5fb326f Do not use srgb texture for splatting. 2014-07-17 00:56:11 +02:00
vlj
6710f61863 Do not convert normal map to srgb. 2014-07-17 00:46:17 +02:00
vlj
be55a1a1c6 Reenable normal map material. 2014-07-17 00:36:10 +02:00
Marianne Gagnon
44bce402e3 clang fixes 2014-07-16 18:34:59 -04:00
vlj
f5a5988967 Fix instanced and reenable displace. 2014-07-17 00:24:09 +02:00
vlj
e6bade24ad Fix RSM 2014-07-17 00:10:34 +02:00
vlj
55ab93a4e6 More work. 2014-07-16 23:44:16 +02:00
vlj
1d0fb9ca68 Simplify material 2014-07-16 23:15:07 +02:00
vlj
27020c0c92 Move draw template function to render_geometry.cpp 2014-07-16 21:38:38 +02:00
vlj
1aa43814b0 Partially unroll template for grass shadow. 2014-07-16 19:41:28 +02:00
konstin
b0f3a48d80 close #1397 2014-07-16 16:02:36 +02:00
konstin
ea56f66d83 Revert "unify separators" 
This reverts commit ad641eff67.
 2014-07-16 15:46:52 +02:00
konstin
ec73fcb2b7 minor stuff 2014-07-16 15:40:27 +02:00
konstin
0ec2cd6dc1 Merge branch 'master' of https://github.com/supertuxkart/stk-code into asdf 2014-07-16 15:16:11 +02:00
hiker
ed349914fb Fix linux compilation. 2014-07-16 21:24:32 +10:00
hiker
a39efe7b3f Fixed incorrect fix for linux compilation done by me: 
Shader::getInstance<Shader>()->Program
does not compile on some gnu compiler, proper way is:
  Shader::template getInstance<Shader>()->Program
Thanks to auria!
 2014-07-16 16:38:41 +10:00
hiker
d0784f3fcd Fix #1407 (huge rank number in FTL HUD). 2014-07-16 16:28:32 +10:00
Marianne Gagnon
797dcf845e Test converting code to home-brew Tuple so that STK compiles again on my mac, where clang does not include tuple 2014-07-15 19:48:34 -04:00
hiker
a03d1df8dc Fix linux compilation. 2014-07-16 09:35:59 +10:00
hiker
ec1b0ab9fc Merge branch 'konstin-m_random_gp' 2014-07-16 08:19:24 +10:00
vlj
b79cebba40 Use singleton template again. 2014-07-16 00:16:57 +02:00
hiker
a8b2ad4f0a Merge remote-tracking branch 'origin/master' into konstin-m_random_gp 2014-07-16 08:12:16 +10:00
hiker
649848cac2 Mostly cosmetic changes (renamed variables, added comments). Changed 
'random' constructor of GrandPrixData into a function so that there
is no need to create a new GPData objects and then copy it.
 2014-07-16 08:11:09 +10:00
konstin
ad641eff67 unify separators 2014-07-15 17:15:42 +02:00
konstin
0df72779a9 Use default laps for track info dialog 2014-07-15 17:10:37 +02:00
konstin
a7c6eb3853 close #1263 2014-07-15 15:57:33 +02:00
konstin
b8202b580d Merge branch 'master' of https://github.com/supertuxkart/stk-code into laps 2014-07-15 15:46:23 +02:00
konstin
02f2488502 add default_number_of_laps 2014-07-15 15:46:17 +02:00
hiker
3684d22ef8 Try to fix linux compilation. 2014-07-15 16:09:57 +10:00
Marianne Gagnon
a3dbb53540 Minor code tweaks for the new feature unlocked scene 2014-07-14 21:39:11 -04:00
hiker
f24e53538c Merge branch 'master' into konstin-m_random_gp 
Conflicts:
	src/states_screens/dialogs/gp_info_dialog.cpp
 2014-07-15 11:07:44 +10:00
vlj
82b5097391 Turn pass1 shaders to singleton template. 2014-07-15 02:43:27 +02:00
vlj
5e0fb8dcf7 Use the singleton template 2014-07-15 02:15:12 +02:00
hiker
a9d3ef0b78 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-07-15 09:13:00 +10:00
hiker
ccb8d0e973 Fix crash: a reference to a string in a widget was used after the 
widget was deleted.
 2014-07-15 09:10:54 +10:00
vlj
c06879a8b4 Fix animated transparent texture. 2014-07-15 00:03:33 +02:00
vlj
9230cab9dd Add shadow for instanced grass. 2014-07-15 00:02:17 +02:00
vlj
146e99b13d Port instanced shadow shaders to singleton. 2014-07-14 23:49:00 +02:00
vlj
ffe77e4aa4 Port instanced pass2 shaders to singleton 2014-07-14 23:41:47 +02:00
vlj
098eb7f595 Port remaining pass 1 Instanced shaders to singleton 2014-07-14 23:25:52 +02:00
vlj
732aefc2dc Turn instanced pass1 shader to singleton. 2014-07-14 23:14:20 +02:00
vlj
5838af5f3e Remove useless function. 2014-07-14 23:13:33 +02:00
Vincent Lejeune
e310ad5628 Move skybox/lights code out of render.cpp 2014-07-14 19:44:11 +02:00
Vincent Lejeune
62bf54b8f3 Simplify displace handling 
Should be faster now
 2014-07-14 18:54:40 +02:00
Vincent Lejeune
d52d1c0409 oops 2014-07-14 18:52:41 +02:00
Vincent Lejeune
160d8c1634 Fix linux build 2014-07-14 18:51:01 +02:00
Vincent Lejeune
d035b86bc4 Turn displace shaders into singleton. 2014-07-14 18:42:19 +02:00
hiker
ab57903f9f Try to convert m_gp from a GPData pointer to a GP object, compiles, but 
crashes.
 2014-07-14 23:08:46 +10:00
hiker
f24a000f78 Merge branch 'm_random_gp' of https://github.com/konstin/stk-code into konstin-m_random_gp 2014-07-14 14:54:59 +10:00
vlj
db4457655b Fix for real torch in chocolate. 2014-07-14 03:00:46 +02:00
vlj
b186bc7f18 Try to fix chocolate torch displaced effect. 2014-07-14 02:25:04 +02:00
vlj
f1ddf87a5f Plugin displacement material. 2014-07-14 02:25:03 +02:00
Marianne Gagnon
f00c55850a Remove old way of doing displacing, turn into a flag in STKMesh. Does not compile, vlj will do the rest 2014-07-14 02:25:03 +02:00
Marianne Gagnon
b456205b56 Another attempt at fixing kart selection screen, hopefully the right one 2014-07-13 19:48:13 -04:00
Marianne Gagnon
2be5c99d47 fix assertion failure on kart selection screen caused by manipulating variables directly instead of using the appropriate methods 2014-07-13 19:08:07 -04:00
vlj
d0f6e54bba Add a isDisplacement bool 2014-07-14 00:35:23 +02:00
Marianne Gagnon
415a502ef1 As requested by vlj, move singleton from networking to utils 2014-07-13 18:03:26 -04:00
Vincent Lejeune
4e1fd9b4af Move geometry rendering code to another file. 2014-07-13 21:49:25 +02:00
Vincent Lejeune
54b1ce39e4 Add Grass shadows. 
For non instancing object.
 2014-07-13 21:33:44 +02:00
Vincent Lejeune
b2fc9eb682 Turn shadow shaders into singletons. 2014-07-13 21:08:49 +02:00
konstin
872413ba91 clean code 2014-07-13 19:45:10 +02:00
Vincent Lejeune
7b9fc60f9c Factorise grass material 2014-07-13 18:56:17 +02:00
Vincent Lejeune
adba84969e Remove unneeded templates 2014-07-13 17:58:51 +02:00
Vincent Lejeune
67ab653aa0 Wrap setUniformsHelper inside a struct 2014-07-13 17:58:39 +02:00
vlj
d5bc6819fe Factorize splatting shader. 2014-07-13 11:33:44 +02:00
vlj
c71a2c131f Factorize transparent shaders. 2014-07-13 11:25:31 +02:00
vlj
8ec57b7683 Factorize unlit shader. 2014-07-13 02:39:33 +02:00
vlj
fbcc430e0e Fix linux build. 2014-07-13 02:33:17 +02:00
vlj
fd7427a1cf Factorize detail and spheremap 2014-07-13 02:30:37 +02:00
vlj
12af5eee9a Factorize some pass2 shaders init code 2014-07-13 02:18:20 +02:00
vlj
a249ee8835 Add userconfig param 2014-07-13 01:34:20 +02:00
vlj
cc24407f09 Try another (dirty) fix. 2014-07-13 01:30:00 +02:00
vlj
6d643d973c try to fix shader.hpp. 2014-07-13 01:23:49 +02:00
vlj
ff2ebfe731 Try to fix linux compilation. 2014-07-13 01:13:09 +02:00
vlj
22be386247 Turn Pass 1 shader to singleton, and factorize the setUniforms. 2014-07-13 01:10:28 +02:00
vlj
ef1bca5424 Try to factorize shader using variadic templates. 2014-07-13 00:11:35 +02:00
Vincent Lejeune
de5499401c Factorize splatting material. 2014-07-12 21:15:43 +02:00
Vincent Lejeune
97971a11b9 Fix RSM 2014-07-12 21:06:34 +02:00
Vincent Lejeune
ff92825531 Fix shadows. 2014-07-12 20:58:00 +02:00
Vincent Lejeune
df2595f594 Some shader factorization 2014-07-12 20:31:54 +02:00
Vincent Lejeune
51a9a215b6 Use a default texture for rubber band 2014-07-12 20:24:28 +02:00
Marianne Gagnon
abe8275969 Merge branch 'renderFactorisation' 2014-07-11 20:51:12 -04:00
Marianne Gagnon
6f0e3c0c08 Remove useless RTT and simplify rendering of icons on the minimap 2014-07-11 20:50:42 -04:00
vlj
e62301c9f6 Merge branch 'renderFactorisation' 2014-07-12 01:20:19 +02:00
vlj
2e1da31278 Wrong condition used. 2014-07-12 01:19:12 +02:00
vlj
8612e49072 Early exit renderSkybox without skybox textures 2014-07-12 00:57:37 +02:00
Marianne Gagnon
9abdc84989 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-07-11 18:55:30 -04:00
Marianne Gagnon
45f9cc20d9 Add asserts to catch issue early 2014-07-11 18:54:35 -04:00
vlj
e44f68afa2 Factorize all first pass materials. 2014-07-12 00:21:30 +02:00
Vincent Lejeune
5acc53685c Use const ref in recursive variadic template unroll_arg<>::exec 2014-07-11 20:39:20 +02:00
Vincent Lejeune
3a4cc63602 Factorize transparent materials too 2014-07-11 20:10:21 +02:00
Vincent Lejeune
ebc0d956d4 Fix linux compilation 2014-07-11 19:32:43 +02:00
Vincent Lejeune
04e9daeefd Factorize detail mat too 2014-07-11 01:27:20 +02:00
Vincent Lejeune
f723a764fc Factorize Unlit material 2014-07-11 00:39:20 +02:00
Vincent Lejeune
555b2c433c Factorize spheremap too. 2014-07-10 22:32:12 +02:00
Vincent Lejeune
7f8331a5b5 Use variadic recursion to expand tuples 
It's quite non trivial to do but it should save a lot of typing later.
 2014-07-10 22:19:20 +02:00
vlj
c2f7c14fdb Try to factorize using tuple 2014-07-10 18:49:17 +02:00
vlj
feda837de8 Factorize some rendering loops. 2014-07-10 18:11:35 +02:00
Marianne Gagnon
2d847cb6b9 Fix overworld minimap 2014-07-09 23:34:39 -04:00
Marianne Gagnon
297d8aaf86 Fix crash when disabling GLSL 2014-07-09 20:41:55 -04:00
auriamg
95c59b8d51 Merge pull request #1401 from konstin/master 
running whitespace.py
 2014-07-09 20:25:58 -04:00
vlj
87e07a83d5 Factorize and comment generateCubemapFromTextures 2014-07-10 01:29:38 +02:00
vlj
822c8725dd Remove rimlight material 2014-07-10 01:02:52 +02:00
Vincent Lejeune
0e4b9040d6 Factorize a function and add proper doxy comment. 2014-07-10 00:38:13 +02:00
konstin
4633d82c23 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-07-09 21:19:17 +02:00
vlj
1324fa7b36 Readd support for 2tcoord vtx in rsm. 2014-07-09 18:06:24 +02:00
vlj
114b3f8830 Remove unused methods 2014-07-09 18:02:25 +02:00
vlj
7a989901e8 Fix ssao viz on nvidia. 2014-07-09 18:00:16 +02:00
vlj
5ee410c139 Use a default texture for transparent if not provided. 2014-07-09 17:47:09 +02:00
hiker
60ac76a3e8 Merge pull request #1398 from konstin/fix1 
check if reverse is available; fix #1396
 2014-07-09 14:17:56 +10:00
Marianne Gagnon
8c74ab5e14 Forgot to hide debug item 2014-07-08 22:07:49 -04:00
vlj
2c251ffaa4 Fix slip stream effect. 2014-07-09 03:59:21 +02:00
vlj
4c3db6ca59 Mix texture for displace. 2014-07-09 03:41:08 +02:00
vlj
25b5134881 Hack not to add displacement node to scene manager 2014-07-09 03:20:31 +02:00
vlj
9922047dd1 Do not ask GL vendor/renderer in no graphic mode. 2014-07-09 02:57:36 +02:00
Marianne Gagnon
faed904061 try to fix linux compilation 2014-07-08 20:39:31 -04:00
Marianne Gagnon
ed97fca7b3 Ease debugging GPWin/GPLose/FeatureUnlocked scenes 2014-07-08 20:37:39 -04:00
Marianne Gagnon
dd7c2b6b61 Pass proper isRace value to post-processing 2014-07-09 02:30:41 +02:00
Vincent Lejeune
ac55a70c83 Mimic previous motion blur behavior 
Depending on zypper + mask on center.
 2014-07-09 02:29:49 +02:00
Marianne Gagnon
7a0afd9321 Fix crash when changing kart from overworld 2014-07-08 20:10:54 -04:00
Vincent Lejeune
6d7178aff5 Fix for missing texture with non advanced pipeline 2014-07-09 00:26:28 +02:00
konstin
ce7da4b237 running whitespace.py 2014-07-08 20:59:34 +02:00
konstin
eb0120fb77 fix #1395 2014-07-08 18:37:02 +02:00
konstin
240f0ec6b7 remove m_random_gp 2014-07-08 18:34:54 +02:00
vlj
6276cafba2 Use global VAO for rendering 2014-07-08 18:31:46 +02:00
Vincent Lejeune
afd97345f7 Add a global VAO manager 2014-07-08 18:31:45 +02:00
Vincent Lejeune
0a7e1312b5 Support for glDrawElements{Instanced}?BaseVertex 2014-07-08 18:31:45 +02:00
Marianne Gagnon
f37afa88b8 Only assign tangents for mesh buffers that actually use normal maps 2014-07-08 18:31:44 +02:00
konstin
8cac64f39f check if reverse is available; fix #1396 2014-07-08 16:47:56 +02:00
hiker
a65959da42 Replaced upright constraint with simpler code that keeps the kart 
in mid air aligned to the gravity. This will also enable jumps in
section where the gravity is not in the default direction.
 2014-07-08 16:52:09 +10:00
hiker
7ec2bae8e7 Minor style changes. 2014-07-08 14:41:59 +10:00
hiker
32707b8f88 Changed m_grand_prix of RaceManager to be an object (and not a pointer to 
an object) anymore, which fixes a memory leak (and I also reverted my quick
fix from last night de7ceb0c2d to fix a crash,
which now not necessary anymore.
 2014-07-08 13:20:53 +10:00
Vincent Lejeune
887438a0d0 Reduce blur amount 2014-07-08 02:37:00 +02:00
Marianne Gagnon
e229effba0 Fix gnu and sara on kart selection screen 2014-07-07 19:43:49 -04:00
vlj
7bf6d4db8b Change location where srgb fbo is disabled. 2014-07-08 00:24:21 +02:00
Vincent Lejeune
23bebff5c2 Forgot to add shaders.cpp to last commit 2014-07-07 19:33:01 +02:00
Vincent Lejeune
746e910e46 Remove some Motion Blur unused vars 2014-07-07 19:25:41 +02:00
Vincent Lejeune
f23f7b05e5 Turn motion blur into camera space motion blur 2014-07-07 18:44:25 +02:00
hiker
de7ceb0c2d Quick fix to avoid crash at end of race, full fix to follow later ;) 2014-07-07 23:31:43 +10:00
hiker
5611f1544d Fixed VS compilation. 2014-07-07 16:54:25 +10:00
hiker
cab0b2d833 Fixed compiler warning. 2014-07-07 16:53:42 +10:00
hiker
c222bbcb1c Merge branch 'a' of https://github.com/konstin/stk-code into konstin-a 2014-07-07 16:15:34 +10:00
hiker
0ff48588d0 Merge pull request #1387 from leyyin/master 
Fix embarrassing clang compilation mistake (thanks to solistice and cand).
 2014-07-07 16:02:29 +10:00
Vincent Lejeune
d501125e9d Remove some unused variables. 2014-07-06 21:06:27 +02:00
Marianne Gagnon
1f5dd2fff3 Improve moving objects in library behavior. 2014-07-04 20:42:06 -04:00
Marianne Gagnon
3f8bff33f3 Improve a bit more movable objects in library 2014-07-04 19:59:22 -04:00