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

8773 Commits

Author SHA1 Message Date
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
Marianne Gagnon
41c47e59be Slightly improve behavior of moving objects in library. A problem still remains 2014-07-04 19:50:46 -04:00
Daniel Butum
680cd3370a Merge remote-tracking branch 'upstream/master' 2014-07-04 18:19:45 +03:00
vlj
b3489678e7 Prevent null SunCamViewMatrix from crashing stk. 2014-07-04 15:08:43 +02:00
Daniel Butum
361d4dfade Optimize loop (thanks to cand) 2014-07-04 13:09:46 +03:00
Daniel Butum
27f2a18f37 Fix clang compilation (thanks to solstice) 2014-07-04 11:22:09 +03:00
hiker
b69c92198e Merge branch 'master' of github.com:supertuxkart/stk-code 2014-07-04 08:51:07 +10:00
hiker
26fd76b904 Fixed warnings and unnecessary divisions. 2014-07-04 08:45:12 +10:00
hiker
736c7264b9 Merge branch 'properties' of https://github.com/solistice/stk-code into properties 2014-07-04 08:34:48 +10:00
Bart Cools
c274a3beef Inserted fix for wrong use of parameters. The kart bars are now set correctly, but the use of "magical numbers" in the bars should be avoided somehow 2014-07-03 23:42:34 +02:00
Daniel Butum
e2418aea13 Fix c++11 feature 2014-07-04 00:34:37 +03:00
Daniel Butum
efac42f746 Fix move on unitialised values in displayFPS 2014-07-03 17:22:00 +03:00
hiker
80d09825bb Fix (potential) problem with exponential spring response (which is 
not used atm).
 2014-07-03 16:53:12 +10:00
hiker
be3882845c Merge branch 'properties' of https://github.com/solistice/stk-code into properties. 
Fixed conflict.
Conflicts:
	src/guiengine/widgets/model_view_widget.cpp
 2014-07-03 14:17:45 +10:00
vlj
ad913bc961 Fix crash without advanced pipeline. 2014-07-02 22:37:52 +02:00
vlj
d5c91dcfe4 Remove Untextured material. 2014-07-02 22:37:51 +02:00
vlj
80cab0ed28 Use a default texture for default material when there is none 2014-07-02 22:37:50 +02:00
vlj
475d738d4b Merge remote-tracking branch 'origin/NewRTTMinimap' 2014-07-02 00:24:03 +02:00
Bart Cools
4a13eebc00 Merge branch 'master' into properties 2014-07-01 13:55:10 +02:00
Bart Cools
41a5b5275b properties group node is not really necessary 2014-07-01 13:32:26 +02:00
Bart Cools
8862be1efc Final fix for properties, every missing field / overwrite should now be handled 2014-07-01 10:59:42 +02:00
Bart Cools
a73462759b Moved the default kart-type to <general-kart-defaults> to better catch missing values in the kart-type nodes. Also moved the documentation again to properly fit the fields. 2014-07-01 10:37:00 +02:00
hiker
2b6e1b8432 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-07-01 09:51:56 +10:00
Deve
ff6af6b072 Change power of bouncy edges in soccer field as temporary solution for #1367. 
Ideally power of bounce should depend on soccer ball weight.
 2014-06-30 18:20:31 +02:00
hiker
621539849a Removed unused code. 2014-06-30 16:45:00 +10:00
vlj
61aaccca33 Clean vao_shadow_pass on instanced. 2014-06-29 22:30:18 +02:00
vlj
5cce35041b Some cleanup 2014-06-29 22:28:50 +02:00
vlj
b861c3fb73 Use fixed attribute location for instanced objects. 2014-06-29 22:19:10 +02:00
vlj
bc7e2cd517 Some cleanups 2014-06-29 16:26:12 +02:00
hiker
be76aae256 Interpolate the normal for the gravity to allow smoother changes of 
gravity - though it does not improve the bumpiness on twisted road section.
 2014-06-29 22:53:35 +10:00
vlj
14cfa57f2a Change "faceness" of lap line. 2014-06-28 16:05:21 +02:00
Bart Cools
109f783fa4 Finally implemented the correct way to parse the data 2014-06-27 23:26:02 +02:00
Deve
45abf1c45a Fixed compilation error 2014-06-27 21:19:36 +02:00
vlj
bde17a28d5 Fix for GL 3.1 context 2014-06-27 20:58:52 +02:00
hiker
9e44c5980a Fixed --track command line option. 2014-06-27 15:39:33 +10:00
Marianne Gagnon
21cb22f13a Workaround crash. Vlj, please look at this, this is probably not an idea fix! 2014-06-26 21:43:47 -04:00
Marianne Gagnon
394fb9be9b Merge branch 'master' into NewRTTMinimap 2014-06-26 20:23:02 -04:00
Bart Cools
000fa2cf73 Fixed skill bars to return correct values. Also minor fix in kart properties 2014-06-26 13:43:53 +02:00
Bart Cools
c3e862f40c fix for different kart properties, now based on kart type set in kart.xml 2014-06-26 12:53:17 +02:00
Bart Cools
0fa746c805 Changes to stk_config to make 3 groups of karts, which will default to the medium, and can be set in the kart.xml 2014-06-26 12:09:22 +02:00
hiker
5eb447d3e6 Adjust graphical offset by rotation to fix graphical position not exactly 
the same as physicsl position when kart drives on wall.
 2014-06-26 16:55:33 +10:00
hiker
76cf9ed141 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-26 16:52:15 +10:00
vlj
79838bffe3 Add 50% transparency to minimap. 2014-06-26 00:46:55 +02:00
Deve
d0091d9977 Fixed accidentaly noticed typo in comment 2014-06-25 22:22:54 +02:00
vlj
9bc2203adf Remove break at wrong position 2014-06-25 01:43:51 +02:00
hiker
6905812425 Fixed typo in warning message. 2014-06-25 09:31:10 +10:00
vlj
a93b96d0b1 Use UBO matrixes in displace. 2014-06-25 01:22:03 +02:00
vlj
45e5fba979 Simplify vao management for non instanced nodes. 2014-06-25 01:13:23 +02:00
vlj
8e6fba3185 Some fixes 2014-06-24 23:57:29 +02:00
vlj
948c5e8aa2 Use explicit attribute location. 
Should help implementing basevertex later, and simplify vao creation a
lot.
 2014-06-24 23:17:41 +02:00
vlj
edc38c9933 Use object_pass.vert for transparent objects. 2014-06-24 22:20:01 +02:00
vlj
69e342490e Fix ssao blur without compute. 2014-06-24 19:13:18 +02:00
konstin
a8343b2885 Merge branch 'master' of https://github.com/supertuxkart/stk-code into a 2014-06-24 16:42:18 +02:00
Marianne Gagnon
9ed57bdd46 Set ambient light when rendering minimap 2014-06-23 20:09:54 -04:00
Marianne Gagnon
1be98dc5db Support animated textures in non-static objects too 2014-06-23 20:02:31 -04:00
Marianne Gagnon
4c3cce42ee new minimap RTT fixes, getting there! 2014-06-23 19:45:48 -04:00
Marianne Gagnon
e9acaa8e4d Do not hardcode minimap size 2014-06-23 19:34:29 -04:00
konstin
01623da5e9 remove +1 2014-06-23 16:13:54 +02:00
Vincent Lejeune
4d6aa9d942 Override clear color inside makeMiniMap 
Track clear color was used, resulting in wrong alpha channel value.
 2014-06-23 14:54:16 +02:00
Vincent Lejeune
1a8b35c796 Set blendfunc when calling draw2DImageFromRTT. 2014-06-23 14:46:02 +02:00
hiker
01a3a446bb Adjust the text width computation to take the left/right border of 
the achievement background into account.
 2014-06-23 17:24:07 +10:00
hiker
299816ac6f Fixed sort order of achievements- and friend-messages. 2014-06-23 16:40:30 +10:00
hiker
3e77f4be0a Fix windows compiler warnings. 2014-06-23 16:17:38 +10:00
Marianne Gagnon
d5e1bb6631 Make progress on new minimap RTT : it was actually 2 issues. First the new code calls camera->setAspectRatio which resets the matrix; second, we rendered the minimap from the back, and backface culling is now active 2014-06-22 21:28:25 -04:00
Marianne Gagnon
ca2ee5d226 New minimap rtt branch : now something is visible 2014-06-22 20:06:58 -04:00
hiker
6ed86fe09c Fixed linux compilation. 2014-06-23 09:28:01 +10:00
hiker
6231e618d8 Added new message system to show achievements in race (and not as a 
dialog later). Work in progress ... it doesn't look particulary nice yet ;)
 2014-06-23 09:13:44 +10:00
hiker
8004e9d42c Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-23 09:05:22 +10:00
vlj
be26ac7213 Fix crash with intel 2014-06-23 00:24:02 +02:00
hiker
afdfa15134 Merge remote-tracking branch 'origin/master' 2014-06-23 08:17:34 +10:00
vlj
a461a1f807 Remove tick for GI. 2014-06-23 00:12:39 +02:00
vlj
aaee62ca82 Reverse delete order of fbo. 
Should be safer.
 2014-06-22 18:08:26 +02:00
vlj
f76cd6e7a9 Implement bilateral with fragment codepath. 2014-06-22 18:04:46 +02:00
Vincent Lejeune
3219e564d0 Implemented bilateral for compute path. 2014-06-22 18:04:45 +02:00
vlj
d8edf64caf Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-06-22 02:32:43 +02:00
vlj
c377bdff58 Merge branch 'master' into NewRTTMinimap 2014-06-22 02:24:26 +02:00
vlj
7e8486d670 Merge remote-tracking branch 'origin/shadowdebug' 2014-06-22 02:21:15 +02:00
vlj
a7dbdc7a54 Use EAC_OFF 2014-06-22 02:17:50 +02:00
vlj
83cfe79404 Fix disappearing shadows 2014-06-22 02:12:17 +02:00
Marianne Gagnon
484f4b7e00 Merge branch 'master' into NewRTTMinimap 2014-06-21 18:56:11 -04:00
konstin
b13e6b9a96 Merge branch 'master' of https://github.com/supertuxkart/stk-code into a 2014-06-21 23:40:49 +02:00
Vincent Lejeune
6e85ac4eab Fix GI matrix generation. 2014-06-21 19:54:12 +02:00
Vincent Lejeune
88a5d08e91 Report opengl vendor and renderer. 2014-06-21 19:29:35 +02:00
Vincent Lejeune
1e959a0e10 Tigher fit of shadow map. 2014-06-21 18:09:22 +02:00
konstin
98f8ddb4e9 fix path to icon 2014-06-21 17:18:01 +02:00
konstin
59a14df340 fix track group spinner 2014-06-21 17:16:23 +02:00
konstin
f4ce845b6f Merge branch 'master' of https://github.com/supertuxkart/stk-code into a 2014-06-21 16:20:53 +02:00
konstin
7e9361bc8b avoid reading deallocated memory 2014-06-21 16:19:37 +02:00
hiker
49fad934cd Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-21 09:35:45 +10:00
Vincent Lejeune
71969acd22 Use a precomputed invmatrix in gi.frag 
(General) matrix inversion is costly, it's better if it's done a single
time on cpu. Improve performance.
 2014-06-20 23:10:31 +02:00
Vincent Lejeune
cb161a2774 Remove code never executed. 2014-06-20 22:56:56 +02:00
Vincent Lejeune
4c9d1888f8 Factorize transparent mesh rendering. 2014-06-20 22:52:19 +02:00
hiker
78864c5df0 Removed unused variables. 2014-06-20 15:44:59 +10:00
hiker
eaded3bf46 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-06-20 11:04:15 +10:00
hiker
82d8cbf875 Fixed display or kart name in top left corner (caused by calling 
add on the label widget twice).
 2014-06-20 11:00:43 +10:00
Bart Cools
a9de201874 apply new patches to before the dubious applied/reverted merge 2014-06-19 15:01:34 +02:00
Bart Cools
07b6579529 Fixed the GUI properties for multiplayer view, though the screen is way too full right now. Some changes (to GUI or screen) have to be done! 2014-06-19 15:01:34 +02:00
Bart Cools
cdb0e88895 Make creation of new skills more generic 2014-06-19 15:01:11 +02:00
Bart Cools
084a4a46f3 GUI Property now more modifiable (with SkillLevelWidget in vector and types in an enum) 2014-06-19 15:01:11 +02:00
hiker
45ac7d5e03 Fixed compiler warnings. 2014-06-19 15:01:11 +02:00
Bart Cools
43971c1e79 Fix for the changing ProgressBar.. The only thing now needed for properties GUI is making it fancy, and change the way it's placed with multiple players 2014-06-19 15:01:11 +02:00
Bart Cools
9b89868320 reflect changes in network kart selection 2014-06-19 15:01:11 +02:00
Bart Cools
e2abf6648f ProgressBar shows, made 3 SkillLevelWidgets, only updating the widgets when hovering over new kart isn't working yet 2014-06-19 15:01:11 +02:00
Bart Cools
e7852648fa Changes to the Skill Level Widget, only bar refuses to show 2014-06-19 15:01:11 +02:00
Bart Cools
d5d2ef991a Fix for sometimes disappearing skill bar 2014-06-19 14:58:11 +02:00