ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,010 Commits 9 Branches 28 Tags 433 MiB
6041c48fbe
Commit Graph

2430 Commits

Author SHA1 Message Date
Arthur-D
ef2cf3b17d Sorry for the previous messy merge - no files were changed remotely so should be safe. Due to my mishap I need to commit the files I wanted to again. Those are new bg images for achievement and friend notifications. Feedback welcome. 2014-10-26 15:34:51 +01:00
hiker
f7893afbef Adjusted button position, thanks to auria. 2014-10-24 11:16:08 +11:00
hiker
8bc6aa91bb Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-24 10:34:59 +11:00
hiker
1920703f09 Converted label to button, just for tests. 2014-10-24 10:34:10 +11:00
Vincent Lejeune
794ab54b7a Clamp lodval 2014-10-24 00:41:34 +02:00
hiker
b4f95d672a Started to indicate the name of the logged in user ... still work in 
progress (black writing on dark grey).
 2014-10-23 22:26:11 +11:00
Vincent Lejeune
9ca4d7e3e6 Improve ibl specular reflexion using mipmap chain 2014-10-22 14:49:06 +02:00
hiker
c012e98f9b Allow disabling of hw stats collection. 2014-10-22 08:20:26 +11:00
Flakebi
57afd1d585 Merge remote-tracking branch 'origin/master' into perPlayerDifficulties, this time the right branch... 
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/graphics/glwrap.cpp
	src/graphics/weather.cpp
	src/states_screens/user_screen.cpp
 2014-10-20 22:36:54 +02:00
Marianne Gagnon
c95e90b925 Tweak checkbox position on login screen 2014-10-17 19:24:21 -04:00
Vincent Lejeune
2f45266c6f Fix position of speedmeter 
Only need to get the texture
 2014-10-17 18:51:41 +02:00
Vincent Lejeune
ce7f017adf Some fixes 2014-10-17 18:43:39 +02:00
Deve
3499975b03 Move track name to center. 
It allows a bit longer track names and looks better.
 2014-10-16 19:33:54 +02:00
hiker
50c21cc11e Added secret achievement (i.e. progress not shown in list). 2014-10-09 23:32:17 +11:00
auriamg
3061123e3e Merge pull request #1606 from Flakebi/fix 
Fix some more bugs
 2014-10-08 18:18:37 -04:00
Vincent Lejeune
ea3cc141ff Fix grass in azdo mode 2014-10-08 01:01:28 +02:00
hiker
4ff00018b4 Fixed alignment of password field. 2014-10-08 08:25:00 +11:00
Flakebi
0193c4c7a5 Fix #1170 Add "Don't Assign" option when configuring inputs 2014-10-07 00:06:15 +02:00
Vincent Lejeune
9de7d11ee4 Fix bloom effect on mesa 2014-10-07 00:00:16 +02:00
Vincent Lejeune
20ea7ca271 GI use sun color value 2014-10-06 22:51:41 +02:00
vlj
b10f1a3ef2 Tweak envmap 2014-10-06 02:29:18 +02:00
vlj
c7b98c4e6c Emulate envmap specular reflexion 2014-10-06 02:19:21 +02:00
hiker
cb40f68229 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-06 09:07:34 +11:00
hiker
6f5b7aa4ae Tried a different layout for the checkboxes (sorry, but I didn't like the 
previous approach at all). Only disadvantage now (I can think of) is that
the width of the lables is now hard coded to 40% of the screen.
 2014-10-06 07:48:15 +11:00
Vincent Lejeune
44792a1490 Fix splatting 2014-10-05 22:46:02 +02:00
Vincent Lejeune
9394f275cd Merge branch 'specmap' 2014-10-05 21:56:10 +02:00
Vincent Lejeune
019db1a11d Revert "Revert "Prepare shader for specmap value"" 
This reverts commit 780482edba.
 2014-10-05 21:56:04 +02:00
Vincent Lejeune
0db951f374 Try to emulate enery conservation 2014-10-05 21:53:06 +02:00
Vincent Lejeune
300a09746f Additionnal fixes 2014-10-05 21:45:56 +02:00
Vincent Lejeune
a8161288a9 Convert remaining shaders 2014-10-05 20:47:13 +02:00
Vincent Lejeune
9f2b66d195 Use specmap on others mats 2014-10-05 20:37:49 +02:00
hiker
2730c3c026 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-10-05 21:37:42 +11:00
hiker
df62c8921e Added limited lazy-load flag to avoid loading of all font textures 
(most of which might not be needed). Fixes #1592.
 2014-10-05 21:35:14 +11:00
Flakebi
dc78c35b50 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	data/gui/user_screen.stkgui
	data/gui/user_screen_tab.stkgui
	src/karts/kart.cpp
 2014-10-05 12:10:39 +02:00
Vincent Lejeune
780482edba Revert "Prepare shader for specmap value" 
This reverts commit 88954a5d88.
 2014-10-05 02:30:15 +02:00
Vincent Lejeune
0121ae8db6 Use specmap value 2014-10-05 02:30:01 +02:00
Vincent Lejeune
88954a5d88 Prepare shader for specmap value 2014-10-05 02:12:04 +02:00
Marianne Gagnon
83b25768cc tweak players screen, checkbox placement was weird 2014-10-04 19:44:04 -04:00
hiker
f63e7d93b8 Fixed #1598 (error message about font texture not found). 2014-10-04 23:32:54 +10:00
samuncle
97772ba1ae set the downard impulse to 5 + a more easy to use backward camera 2014-10-02 13:53:59 +02:00
vlj
30dda3e343 Fix sky warp 2014-10-02 02:53:31 +02:00
hiker
de9a1f51a7 Removed empty 'online overview' page, show the achievements page instead. 2014-10-02 07:59:24 +10:00
vlj
2236e8dd1c Fix extra respawning particles 2014-10-01 01:19:49 +02:00
Flakebi
47da30dd24 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-30 19:22:18 +02:00
samuncle
af037d6267 tweak particle.xml 2014-09-29 12:30:43 +02:00
hiker
a593c81a64 Some improvement for #1505, but still wip. 2014-09-26 16:33:47 +10:00
hiker
2d7b8228e9 Fix #1565: Added better instructions for account creation screen (and also made the 
instructions actually visible).
 2014-09-26 08:57:52 +10:00
Flakebi
2cf9707294 Merge branch 'upstream/master' into perPlayerDifficulties 
Conflicts:
	src/states_screens/kart_selection.cpp
I hope I got everything
 2014-09-24 17:58:12 +02:00
vlj
58e1b73752 Fix bloom computation 2014-09-24 01:19:37 +02:00
hiker
06523a62c3 Fixed typo, renamed file to have proper extension. 2014-09-23 22:58:08 +10:00
hiker
13cbde2e09 Added new supertuxkart.appdata file from hughsie (#1545). 2014-09-23 15:51:06 +10:00
hiker
4cea6bd7fe Fixed #709 (Missing R with caron in title font). Thanks! 2014-09-22 15:53:40 +10:00
hiker
249c34cd0d Fixed achievement warning. 2014-09-22 07:54:34 +10:00
Vincent Lejeune
5643e38886 Some factorisation for non instanced path 2014-09-20 19:28:06 +02:00
Vincent Lejeune
b3e124b93e Some fixes 2014-09-20 18:48:22 +02:00
Vincent Lejeune
f6d2ff92f1 Merge remote-tracking branch 'origin/glossmap' 2014-09-20 01:57:55 +02:00
Vincent Lejeune
b034049a28 Support for 3 tex mats 2014-09-19 23:09:22 +02:00
Deve
12977c3764 Merge pull request #1530 from marcoll/master 
Some improvements to the GP editor

Merged because it fixes some issues. Previously I wasn't able to create new GP without a crash.
 2014-09-19 21:54:38 +02:00
Vincent Lejeune
24cd727899 Add glossytex to textures 2014-09-19 19:54:00 +02:00
Flakebi
9bcc76127f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-17 13:20:09 +02:00
Vincent Lejeune
1d2c77d86a Use ProjectionViewMatrix in glow_object.vert 2014-09-17 02:12:28 +02:00
Vincent Lejeune
b769e46a00 Use texture instead of image in SSAO. 2014-09-16 15:18:29 +02:00
Vincent Lejeune
4c6df4821d Revert "Do not allow specvalue to be below 0." 
This reverts commit 6b4430caaa.
 2014-09-16 00:37:49 +02:00
Vincent Lejeune
fbb71bca7e Revert "Fix negative value inside tonemap" 
This reverts commit 16dc973faa.
 2014-09-16 00:37:37 +02:00
Vincent Lejeune
b5598fda57 Revert "Force non negative value in bloom" 
This reverts commit cb922ed4db.
 2014-09-16 00:37:23 +02:00
vlj
cb922ed4db Force non negative value in bloom 2014-09-15 22:11:53 +02:00
Vincent Lejeune
16dc973faa Fix negative value inside tonemap 
It should be checked before but since it's not always reproducible.
 2014-09-15 01:10:12 +02:00
Vincent Lejeune
6b4430caaa Do not allow specvalue to be below 0. 
Just in case it shouldnt be possible anyway.
 2014-09-15 01:06:15 +02:00
Vincent Lejeune
7c54ac4d81 Fix second texcoord in instanced_object_pass.vert 2014-09-14 23:07:10 +02:00
Marc Coll Carrillo
5cf3ad220f Some improvements to the GP editor: 
- GP are now classified into groups, just like tracks: standard, user defined, and add-ons
    - allow empty GPs to be loaded by the GP manager, so that they can appear
      on the GP editor (but not on the track selection screen)
    - enable/disable buttons depending on the available options
    - provide some feedback after pushing the "save" button
    - some minor bug corrections and improvements
 2014-09-13 10:40:27 +02:00
Vincent Lejeune
dea23d7a69 Properly reapply HD3000 particle fix 2014-09-10 18:57:40 +02:00
Vincent Lejeune
e77b5dddeb Revert "Forgot to fix a particle shader for hd3000" 
This reverts commit 48fcea8ee8.
 2014-09-10 18:57:03 +02:00
Vincent Lejeune
48fcea8ee8 Forgot to fix a particle shader for hd3000 2014-09-10 18:09:38 +02:00
Vincent Lejeune
8fd97615f3 Fix particle for hd3000 2014-09-10 01:42:51 +02:00
Flakebi
9c911a2891 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-09 12:07:34 +02:00
hiker
1a7b384633 Fixed typo. 2014-09-09 13:14:56 +10:00
Flakebi
f7b22cd97c Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-07 20:17:12 +02:00
Vincent Lejeune
94cd8d5c51 Avoid some useless computation in some vert shaders 2014-09-05 23:41:12 +02:00
Flakebi
5858c05e74 Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-05 22:46:17 +02:00
Vincent Lejeune
1e172dbf33 Fix glowobject frag shader 2014-09-05 22:17:57 +02:00
hiker
1c23309161 Merge branch 'master' into gui_screen 2014-09-05 09:18:17 +10:00
hiker
8fd6877e92 Fixed #1486. Made most menus more consistent (e.g. same position 
and height for heading).
 2014-09-05 08:46:06 +10:00
hiker
8ffe09de29 Combined GPInfoScreen and RandomGPInfoScreen into one class, requiring 
only one stkgui file.
 2014-09-04 16:49:15 +10:00
hiker
7c3164a9c1 Added 'reload' random GP support, fixed 'back' icon on screen. 2014-09-04 09:38:25 +10:00
vlj
3083df450f Gather object in instanced calls 2014-09-02 23:23:23 +02:00
Flakebi
a84c5d596c Fix focus crash in kart selection screen 2014-09-02 03:43:08 +02:00
hiker
7dbfc151bf Added random GP functionality into gp_info screen. Changed GPData 
in GPInfoScreen from a pointer to be an object, while this adds
some coping of this object, it removes potential memory leaks.
 2014-09-02 09:32:12 +10:00
Flakebi
e2089fcea6 Switch per player difficulty to player config 2014-09-02 01:18:58 +02:00
Flakebi
44add00944 Rename icons to more generic names 2014-09-01 22:21:17 +02:00
Flakebi
8c40f279cd Add break_time_increase to perPlayerDifficulty 2014-09-01 11:31:39 +02:00
Flakebi
dc4a30202f Merge remote-tracking branch 'upstream/master' into perPlayerDifficulties 2014-09-01 11:31:26 +02:00
Vincent Lejeune
99b110cc99 Use uvec2 instead of sampler2D 2014-08-29 01:30:19 +02:00
hiker
4ba8e85169 Give the race setup screen a background box and added a text for difficulty. 2014-08-29 07:42:42 +10:00
vlj
5878cb35ec Implement runtime detection of srgb bindless fix 2014-08-28 22:02:12 +02:00
hiker
db3db6f8b5 First version of the GP info screen (instead of dialog). 2014-08-27 22:08:50 +10:00
vlj
53c52470ee Use one call for each shadow cascade instead of a big one. 2014-08-26 21:56:16 +02:00
Vincent Lejeune
bf5410b793 Add unlit instanced shader 2014-08-26 20:34:59 +02:00
Vincent Lejeune
cad1efbff1 Add instanced detail shader 2014-08-26 20:34:37 +02:00
Vincent Lejeune
0960f090dc Add instanced spheremap shader 2014-08-26 20:34:26 +02:00
hiker
e309008736 Use header font for title, removed second 'back' button. 2014-08-25 23:16:59 +10:00
hiker
76767141f7 Removed old track info dialog, fixed crashes in track info screen 
(caused when making some spinners etc. visible).
 2014-08-25 22:20:42 +10:00
hiker
4b507a4eda Made more space for credits that span more than one line. 
Siwtch left and right side of the top screen.
 2014-08-25 11:12:00 +10:00
hiker
c9936ffb97 Forgot to actually add the new files :( 2014-08-25 10:47:36 +10:00
hiker
0de942b5f3 Alpha version of a track info screen (instead of a dialog). 2014-08-25 10:40:37 +10:00
Deve
0fa38161b5 Install icons in $PREFIX/share/icons/hicolor path. 
Don't use static paths in .desktop file. Actually I don't know about any application which uses it :P
 2014-08-24 21:58:34 +02:00
Vincent Lejeune
7bff68870c Read sampler from attributes. 2014-08-24 21:50:59 +02:00
Vincent Lejeune
6ac3d69471 Play with bindless textures 2014-08-22 23:48:28 +02: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
Vincent Lejeune
547018f0ab Port PointLight shader 2014-08-22 00:30:14 +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
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
Marianne Gagnon
83a1acc961 Merge branch 'save_gp' 2014-08-16 15:42:46 -04:00
hiker
8c525ab2d4 Make the physics settings configurable, but default to use the old 
settings for now.
 2014-08-16 10:20:24 +10:00
vlj
f77695c098 Add Tangent/Bitangent in instanced object shader. 2014-08-15 17:15:19 +02:00
Vlj
7fbe529e6f Forget to add Tangent/BiTangent with pre 330 2014-08-15 02:14:30 +02:00
Vlj
d3ec1a27ce Completly unroll the loop 2014-08-15 00:02:43 +02:00
Vlj
4829b8ddd8 Manually unroll rh shader 2014-08-14 23:58:11 +02:00
Vincent Lejeune
f9c692052e Try a fix for nvidia and GI 2014-08-14 21:26:16 +02:00
Vincent Lejeune
8117260bf6 Factorise attribute location of simulation program. 2014-08-13 22:26:52 +02:00
samuncle
a91bcfa746 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-08-13 21:32:12 +02:00
samuncle
d1f46fdb7f Bring back the rain 2014-08-13 21:30:27 +02:00
Vincent Lejeune
dc02eec7b6 Port particle rendering shaders too. 2014-08-13 21:04:03 +02:00
Vincent Lejeune
22137eee88 Port UI shaders. 2014-08-13 20:25:56 +02:00
Vincent Lejeune
70b0fce50c Add support for instanced normal map mesh. 2014-08-13 19:20:40 +02:00
hiker
98bb7e3959 Merge branch 'bumpy' 2014-08-13 11:16:03 +10:00
Vincent Lejeune
292aa0cbc4 Factorize FullScreen shaders invocations. 2014-08-13 02:01:29 +02:00
hiker
11f3c1fc11 Added the recovery dialog back in :) 2014-08-11 22:39:08 +10:00
hiker
3f5ab358df Merge branch 'leyyin' 2014-08-11 14:22:30 +10:00
Marianne Gagnon
2c1feb5f06 Improve debug values popup 2014-08-10 19:09:44 -04:00
hiker
940a296366 Merge remote branch 'origin/master' into leyyin 2014-08-11 09:05:34 +10:00
hiker
42453325c4 Increased impule to keep kart parallel a bit more, changed the bevel shape 
to be slighlty longer.
 2014-08-11 09:02:45 +10:00
hiker
a8189eccfc Increase impulse to keep the kart parallel (to avoid the kart being 
90 degrees on its side and not being able to get straight again).
 2014-08-11 08:10:04 +10:00
hiker
4d1d4492b1 Removed support for non-bevelled shapes (has not been used in years). 
Fixed position of physical (raycast) wheels to be in (or on the edge)
of the collision body, not outside. Removed support for defining
kart-specific physical kart position (was never used).
 2014-08-10 21:54:18 +10:00
Vincent Lejeune
020e939e2b Normalize normals in normal view. 2014-08-09 21:24:50 +02:00
Vincent Lejeune
c546b25ae9 Fix perspective in normal view. 2014-08-09 21:19:26 +02:00
Vincent Lejeune
c07aed260a Visualize vertex normals in normal view. 2014-08-09 21:09:31 +02:00
Vincent Lejeune
bcc2196ccf Fix SSAO on splatting material. 2014-08-09 20:05:49 +02:00
vlj
768d51d0c3 Add sliders to change ssao parameters. 2014-08-09 19:22:30 +02:00
vlj
496269e73b Make SSAO param changeable. 2014-08-09 18:51:52 +02:00
konstin
c59f243550 Merge branch 'master' of https://github.com/supertuxkart/stk-code into save_gp 2014-08-09 17:06:16 +02:00
hiker
f39e22e442 Merge branch 'master' of https://github.com/leyyin/stk-code into leyyin 2014-08-08 11:10:56 +10:00
Vincent Lejeune
8db09a55cd Add Splatting RSM shader type. 2014-08-08 01:07:55 +02:00
vlj
60f76ee612 Fix RSM 2014-08-07 22:45:25 +02:00
vlj
6c3aeceb51 Fix GI 
It was using wrong swizzle for depth texture.
 2014-08-07 22:32:42 +02:00
Vincent Lejeune
95fb3ea580 Add support moving texture in rsm. 2014-08-07 20:44:33 +02:00
Vincent Lejeune
e932638aef Port sunlight* shaders to singleton. 2014-08-07 20:07:03 +02:00
hiker
20242dae5e Merge remote-tracking branch 'origin/master' into bumpy 2014-08-07 10:13:07 +10:00
Vincent Lejeune
87bf242164 Fix shadows for unlit with alpha ref. 2014-08-07 02:12:13 +02:00
Vincent Lejeune
858b789419 Support vertex color for alpha ref material. 2014-08-07 02:11:55 +02:00
hiker
e68d09c2e4 Merge remote-tracking branch 'origin/master' into bumpy 2014-08-07 10:00:16 +10:00