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

10346 Commits

Author SHA1 Message Date
Vincent Lejeune
f644543bc1 Move all gfx related config to a separate file 2014-12-27 03:14:16 +01:00
auriamg
2d0c929a70 Merge pull request #1847 from gunchleoc/master 
Some string fixes.
 2014-12-26 19:43:21 -05:00
GunChleoc
38936fe79f Removed ngettext, because tinygettext can't handle it. 2014-12-24 14:54:09 +01:00
Marianne Gagnon
351e69e79d Fix build 2014-12-23 20:07:34 -05:00
Marianne Gagnon
526e565c4d Fix memory leak found by vlj 2014-12-23 19:57:29 -05:00
Vincent Lejeune
e421a05663 Remove unecessary files. 2014-12-23 20:35:54 +01:00
Deve
b02812662a Fixed crash in creating user screen, which occured after rename player. 
It's a bit quick and lazy fix. Probably other variables should be cleared too.
 2014-12-23 18:32:05 +01:00
GunChleoc
5a7f7781af Some string fixes. 2014-12-23 13:24:50 +00:00
Flakebi
fbba008a1a Restore ancient behaviour 2014-12-22 23:12:20 +01:00
hiker
8e142daa00 Fix crash when track is not found. 2014-12-22 08:20:19 +11:00
hiker
89317ce399 Removed unnecessary c_str(). 2014-12-22 08:19:54 +11:00
hiker
f4c9724fa9 Detect mesa version. 2014-12-22 07:59:51 +11:00
Deve
4f910713f5 Make some strings translatable 2014-12-20 14:03:11 +01:00
Vincent Lejeune
84ee2c7018 Disable texture compression on Intel Mesa too 2014-12-20 00:32:56 +01:00
Flakebi
57958aba36 Merge branch 'upstream/master' into fixes 2014-12-19 23:02:41 +01:00
ZDarian
3995947c1d two redundant lines of code that may have caused a tiny memory leak 2014-12-19 03:11:18 -07:00
hiker
deb8672446 Allow command line options --kart and --track to select locked tracks. 
This will allow reviewers to post screenshot of new tracks.
 2014-12-19 16:08:35 +11:00
hiker
99f49fbd42 Fixed crash in debug mode when command line option -N is used. 2014-12-19 16:03:24 +11:00
Vincent Lejeune
c4e5a720f7 Do not undefine builtin macros. 2014-12-18 22:09:14 +01:00
Vincent Lejeune
bccde0ce34 Revert "No need to signal the shader the AMD_vertex_shader_layer is enabled" 
This reverts commit 2e0bec5757.
 2014-12-18 15:57:25 +01:00
Vincent Lejeune
6139f43108 Do not allow fog start to be null 2014-12-18 01:30:53 +01:00
hiker
e3879abb5b Work around #1780 (font corruption). 2014-12-17 11:08:28 +11:00
Marianne Gagnon
0af3f3de83 Misc tweaks, mainly to include new island tracks in challenges and GPs, and other minor fixes 2014-12-15 21:34:22 -05:00
hiker
edd11e3fd2 Changed version number from 'svn' to 'git'. 2014-12-16 11:46:38 +11:00
hiker
62f8e3be2d Merge branch 'master' of github.com:supertuxkart/stk-code 2014-12-16 09:31:51 +11:00
Vincent Lejeune
7aa7e2d148 Factorise sun color/position 2014-12-15 23:09:19 +01:00
hiker
0e569d1c7f Give the first player tux as icon (instead of sara). Fixes #1771 for now. 2014-12-15 16:49:12 +11:00
hiker
7a9d724bd9 Missing patch in previous commit. 2014-12-15 14:04:55 +11:00
hiker
e4e0dbd5b7 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-12-15 11:37:56 +11:00
hiker
eba7d709c1 Added support for wip-tracks and wip-karts directories, which are only 
used when artist debug mode is enabled.
 2014-12-15 11:10:54 +11:00
hiker
f48f20da94 Fix memory leak. 2014-12-15 10:58:23 +11:00
Vincent Lejeune
22b26dc985 Remove extra uniforms in IBL shader 2014-12-15 00:42:59 +01:00
Vincent Lejeune
03694d9c7c Factorise SH coefficient in an UBO 2014-12-15 00:18:03 +01:00
Vincent Lejeune
3f8fdc7976 Move FS template declaration in shaders.hpp 2014-12-14 21:58:42 +01:00
Vincent Lejeune
4b2abef56c Remove redondant uniform in IBL 2014-12-14 21:55:15 +01:00
Vincent Lejeune
1732b1cfef Clean up sunlight shader + factorize diffusebrdf 2014-12-14 21:39:18 +01:00
hiker
8ea8c41597 Fixed memory leaks. 2014-12-14 12:51:53 +11:00
hiker
e1c07b3e2c Fixed memory leak. 2014-12-14 12:30:21 +11:00
hiker
6ffb30d63a Fixed memory leak. 2014-12-14 12:04:48 +11:00
hiker
6cf4d381ee Merge branch 'master' of github.com:supertuxkart/stk-code 2014-12-14 11:41:47 +11:00
hiker
0ca09019a2 Fixed minor memory leak. 2014-12-14 11:41:07 +11:00
Deve
7114657c02 Merge pull request #1781 from thamlett/master 
Fix some typos
 2014-12-13 18:07:18 +01:00
Deve
1a4f6e51ee Fixed problem in dynamic ribbon widgets which contain animations, labels and more than one row. 
Thanks to marcoll.
 2014-12-13 12:49:07 +01:00
Marianne Gagnon
91f6fbbb43 Fix typo in previous fix, reported by Math07 2014-12-12 19:41:15 -05:00
hiker
ba990318d1 Merge remote-tracking branch 'origin/master' into new_server 2014-12-13 10:49:45 +11:00
Deve
42d2591bf8 Use default track if remembered track doesn't exist. 
It avoids issues in #1776 and probably other problems with addons tracks.
 2014-12-12 19:54:30 +01:00
Deve
dff1a330ea Fixed crash in kart selection screen 2014-12-12 19:36:53 +01:00
Marianne Gagnon
59d6a2f258 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-12-11 20:18:29 -05:00
Marianne Gagnon
3226189d82 Force disable shadows and GI when OpenGL is not recent enough. Fixes #1722 2014-12-11 20:18:00 -05:00
Vincent Lejeune
2cf2630362 Forgot UBO support check in shadow 2014-12-12 02:13:33 +01:00
Vincent Lejeune
834683f414 Add codecheck before rendering GI/Shadow 2014-12-12 02:12:14 +01:00
Vincent Lejeune
13360de345 Add a check for GS support 2014-12-12 02:04:33 +01:00
Marianne Gagnon
0aacea1c0b Apply math07's patch for taking padding into account in height="fit", fixes #1762 2014-12-11 19:33:44 -05:00
Vincent Lejeune
5f47fee897 Cleanup skybox preparation code 2014-12-11 20:42:18 +01:00
Marianne Gagnon
334cca21ad Merge branch 'Math07_master' 2014-12-10 21:06:09 -05:00
Vincent Lejeune
1c05d9ef68 Port colored lines too 2014-12-11 01:44:58 +01:00
Vincent Lejeune
db6600a687 Frustrum shader is updated to new system 2014-12-11 01:19:17 +01:00
Vincent Lejeune
c638be6412 Do not use motion blur if no boost amount 2014-12-10 19:06:58 +01:00
Vincent Lejeune
ed82106fe6 Try to fix #1772 
Avoid doing glViewport call in IBL.cpp since the result is not used
without dynamic light.
 2014-12-10 17:35:09 +01:00
hiker
c0c4357331 Switch from IP address to addons.supertuxkart.net (including new 
certificate).
 2014-12-10 23:53:47 +11:00
hiker
3c6204732e Switch to fast music immediatley on lastp lap, and not only 
when 30 seconds are left.
 2014-12-10 17:02:39 +11:00
hiker
e05af1cd0b Added support for "<" relations in graphical restrictions, fixed 
compiler warnings.
 2014-12-10 14:18:26 +11:00
hiker
f0ddaa50a5 Removed option to disable CURLOPT_SSL_VERIFYPEER, since it's not needed 
anymore.
 2014-12-10 12:55:32 +11:00
hiker
93b4aa15c2 Disable CURLOPT_SSL_VERIFYHOST on OSX, since it doesn't work (with 
osx's curl version at least).
 2014-12-10 12:23:35 +11:00
hiker
b592e5224b Updated the URL to work with new server configuration. 2014-12-10 11:35:43 +11:00
hiker
83f49ec319 Merge remote-tracking branch 'origin/master' into new_server 
Conflicts:
	src/online/http_request.cpp
 2014-12-10 11:25:16 +11:00
Vincent Lejeune
f241fc3b71 Use clamp mode for tex shadow 2014-12-09 19:09:31 +01:00
Vincent Lejeune
c91c04c862 Same for shadow blur pass 2014-12-09 18:54:27 +01:00
Vincent Lejeune
b24fd621a5 Precompute coefficient in gaussian blur pass 2014-12-09 18:43:48 +01:00
Vincent Lejeune
d84d103b03 Wrap azdo check into a function call 2014-12-09 18:21:07 +01:00
Vincent Lejeune
d8e6ebbb0e Use correct name for passthrough texture 2014-12-09 18:07:31 +01:00
hiker
05f2af79c9 Fixed #1770 (tabs disappear). 2014-12-09 16:50:16 +11:00
hiker
25e059dd3e Merge remote-tracking branch 'origin' into copy_kart_mesh 2014-12-09 08:50:23 +11:00
hiker
ca55212062 Fixed ref-counting. 2014-12-09 08:47:40 +11:00
Vincent Lejeune
36d20773d7 Unbind everything before deleting 2014-12-08 19:43:41 +01:00
Vincent Lejeune
2667791621 Tweak IBL 2014-12-08 19:36:23 +01:00
Vincent Lejeune
2b0680d92d Use texture buffer instead of uniform for samples 
Should fix nvidia glsl error
 2014-12-08 18:24:43 +01:00
hiker
b764339b20 Moved cloning of animated mesh into CSkinnedMesh (to get access to 
private members). Fixed animation bug, caused by copying already
animated vertex position from LocalBuffer to Weight (so they were
then later animated again). Might need a better solution to avoid
copying mesh twice (LocalBuffer = Weight, followed by Weight = LocalBuffer).
 2014-12-08 23:39:41 +11:00
hiker
f0d430c833 Fix #1761 (Players tab in Options autofocus issue). 2014-12-08 15:22:12 +11:00
Timothy Hamlett
e473b656d2 Fix some typos 2014-12-07 16:49:17 -06:00
Vincent Lejeune
a094bbae19 Factorize DiffuseIBL and SpecularIBL 2014-12-07 19:10:22 +01:00
Vincent Lejeune
2e0bec5757 No need to signal the shader the AMD_vertex_shader_layer is enabled 2014-12-07 18:48:45 +01:00
Marianne Gagnon
7686628401 Allow animated meshes in LOD, fixes #1747 2014-12-06 19:51:46 -05:00
Mathieu Laprise
701a8a2c7b Merge remote-tracking branch 'upstream/master' 2014-12-06 17:25:46 -05:00
Vincent Lejeune
1bd83f4140 Use omp for IBL gen + force some typecast 2014-12-06 23:20:46 +01:00
Vincent Lejeune
6d88a6547b Fix GI viz 2014-12-06 21:46:44 +01:00
Mathieu Laprise
107e434fe9 Missing button in grand prix editor name dialog #1765 2014-12-06 15:14:27 -05:00
Marianne Gagnon
68db893e84 Message dialog: set buttons text before layout occurs, so that buttons get the proper size. Fixes #1764 2014-12-05 21:11:56 -05:00
Vincent Lejeune
7367342755 Fix split_stream wrong blending op 
"immediate_draw" objects were assumed to be always blended but
splitstream is additive.
 2014-12-06 02:06:59 +01:00
Marianne Gagnon
8a2128fe7e Cleanup additive material detection 2014-12-05 19:55:24 -05:00
Marianne Gagnon
f05618b3b9 Add possibility to specify non-translated texts in GUI XML files, and use it for debug strings that should not be translated 2014-12-05 19:17:52 -05:00
Vincent Lejeune
8f3b8cf448 Implement specular IBL properly 2014-12-05 16:42:49 +01:00
Vincent Lejeune
c2d7356d05 Refactor IBL gen code 2014-12-05 16:42:49 +01:00
hiker
48593534a5 Added certificate for our vps. 2014-12-05 13:57:27 +11:00
Vincent Lejeune
fd2da4085b Rename some shader to improve their meaning 2014-12-05 00:20:16 +01:00
hiker
60cde7e63d Added option to disable peer verification in curl. This might help 
on some platforms (osx) with authentication problems.
 2014-12-04 16:43:57 +11:00
hiker
abb486b640 Fixed server version to be 2. 2014-12-04 16:27:29 +11:00
hiker
cc17d8e0b2 Set our vps as new online server. 2014-12-04 16:23:21 +11:00
hiker
d1fc8d53f4 Added error checking when setting the certificate to connect to our server. 2014-12-04 11:39:56 +11:00
Marianne Gagnon
f8f3dc6c4a Merge branch 'SlipstreamCleanup' 2014-12-02 20:36:43 -05:00
Marianne Gagnon
1032506adf Make it (IMHO) clearer how to enable the splistream debug define. Now I see things! 2014-12-02 20:36:27 -05:00
hiker
5cb3e90dfc Fixed displaying online friend achievements. 2014-12-03 12:24:30 +11:00
Marianne Gagnon
77c2e8a5fb Continue slipstream cleanup, still doesn't work 2014-12-02 20:21:11 -05:00
Marianne Gagnon
5444336410 Cleanup slipstream code to use the new material manager properly. This is unfortunately non fonctional (nothing visible on screen) and I have absolutely no clue why. Still this cleanup is necessary... 2014-12-02 20:12:11 -05:00
hiker
4d3bbd2c78 Fixed translation support. 2014-12-03 11:40:04 +11:00
hiker
59540abb59 Removed hard coded <B> for backwards (though that message is not 
even shown atm).
 2014-12-03 11:39:39 +11:00
hiker
8e8d7cfc19 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-12-03 10:41:22 +11:00
hiker
34f3755976 Added comments for translators. 2014-12-03 10:40:19 +11:00
Marianne Gagnon
d38b7ca080 Fix a few strings 2014-12-02 18:38:54 -05:00
hiker
9dc6425242 Merge branch 'master' of https://github.com/thamlett/stk-code into thamlett-master 2014-12-03 08:05:34 +11:00
hiker
26eb5263b3 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-12-02 17:13:09 +11:00
hiker
3ba2470619 Added support to detect version numbers on nvidia. 2014-12-02 17:11:29 +11:00
Timothy Hamlett
42d6f0480c Actually fix #1754 
Thanks to Hiker for the help!
 2014-12-01 21:48:12 -06:00
Vincent Lejeune
7e2add8c53 Clean lensflare related file 
A new method is used now.
 2014-12-01 21:07:29 +01:00
Vincent Lejeune
4db0f8ebf6 Do not reorient shadow cam 
It didnt really improve shadows resolution
 2014-12-01 21:00:28 +01:00
Timothy Hamlett
263d072c98 Fix some coding conventions 
Thanks to hiker for the info
 2014-12-01 12:49:15 -06:00
Deve
24e850db79 Delete xx 
I simply try to delete it directly on github ;)
 2014-12-01 08:10:12 +01:00
Timothy Hamlett
0a3d71aead Add Windows 8.1 to the hardware reports 2014-11-30 22:27:39 -06:00
Timothy Hamlett
b0dbacc386 Fix #1754 2014-11-30 22:26:36 -06:00
hiker
006a7f95c9 Cherrypicked pull request #1743 (cppcheck performance fixes). 2014-12-01 15:14:27 +11:00
hiker
c3f5294c27 Changed line endings. 2014-12-01 12:00:43 +11:00
hiker
06aa115155 Merge branch 'master' into copy_kart_mesh 2014-12-01 11:43:01 +11:00
hiker
9dd46b6755 Try to copy the animated kart mesh. 2014-12-01 11:41:14 +11:00
Marianne Gagnon
f31a458fb8 Disable compressed textures checkbox in options where unsupported 2014-11-30 18:44:43 -05:00
Vincent Lejeune
0aa6b9fcd1 Make sdsm optionnal 
scene manager is not ready yet
 2014-11-29 01:33:10 +01:00
Vincent Lejeune
7a92a4a8ef Disable texture compression on Intel 2014-11-29 01:27:54 +01:00
Flakebi
abc8394801 Fix two little glitches in intro and outro scenes 2014-11-27 15:20:12 +01:00
hiker
63250237a4 Fixed linux compilation. 2014-11-27 23:27:27 +11:00
hiker
14145b4e2c Merge branch 'master' of github.com:supertuxkart/stk-code 2014-11-27 23:06:12 +11:00
hiker
c1a84671c2 Merge branch 'master' of github.com:supertuxkart/stk-code 
Conflicts:
	src/karts/kart_model.cpp
 2014-11-27 22:52:08 +11:00
hiker
2ea0c0533a Merge branch 'master' of github.com:supertuxkart/stk-code 2014-11-27 22:40:46 +11:00
hiker
71994c692f Fixed replay mode. 2014-11-27 22:34:04 +11:00
hiker
020c129691 Specify the replay buffer size as time value (i.e. how many seconds), 
not how many frames.
 2014-11-27 16:15:53 +11:00
hiker
6e3c766749 Minor improvements to fix for #1713. 2014-11-27 15:36:56 +11:00
Vincent Lejeune
bf98d296eb Fix #1734 2014-11-27 01:31:28 +01:00
Marianne Gagnon
12c54cb92b Revert old workaround, fix the original issue in a cleaner way 2014-11-26 19:30:09 -05:00
hiker
ce1586532d Merge branch 'master' of github.com:supertuxkart/stk-code 2014-11-27 09:32:39 +11:00
hiker
4e00f691dc Added an assert to check if new was successful. 2014-11-27 09:17:08 +11:00
hiker
d4ea2e8786 Merge branch 'fixes' of https://github.com/Flakebi/stk-code into Flakebi-fixes 2014-11-26 23:56:33 +11:00
hiker
7c7fb68e82 Try fixing #1713 (crash pessing ESC on login screen). 2014-11-26 23:40:50 +11:00
hiker
45b19997de Fixed compiler warning (double to float). 2014-11-26 22:27:35 +11:00
deve
bf79df9e88 Fixed typo 2014-11-26 10:54:44 +01:00
Flakebi
e4777d0c63 Prevent the max speed of the fps camera to be less than 0 2014-11-26 09:02:34 +01:00
Flakebi
c4cdfc4a0e Merge branch 'upstream/master' into fixes 
Conflicts:
	src/input/input_manager.cpp
	src/states_screens/kart_selection.cpp
 2014-11-26 07:34:26 +01:00
deve
cac87cce34 Fixed mingw compilation. 
I don't know how it worked previously because MEMORYSTATUSEX was there rather longer time and it needs this definition.
 2014-11-26 06:46:03 +01:00
hiker
ea3a433147 Fix #1620 (Player's achievements can only be seen when logged in). 2014-11-25 17:12:47 +11:00
hiker
49474a5370 Fixed my "Better handle out-of-memory situations." ... to now actually work :P 2014-11-25 17:08:31 +11:00
hiker
6fbcd90226 Better handle out-of-memory situations. 2014-11-25 14:14:32 +11:00
hiker
aac261d873 Use proper format (instead of casting unsigned to int). 2014-11-25 14:02:34 +11:00
hiker
63e5acdf2b The (float) cast is not necessary, and makes it harder to read. 2014-11-25 14:00:43 +11:00