ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,155 Commits 9 Branches 28 Tags 433 MiB
6061a77884
Commit Graph

9487 Commits

Author SHA1 Message Date
hiker
b3c2909053 Fix compiler warning. 2014-09-21 10:44:15 +10:00
Vincent Lejeune
7af5e5c50c Fix text billboard crash 2014-09-20 21:17:44 +02:00
Vincent Lejeune
f30ea823e5 Factorise non instanced 2nd pass too. 2014-09-20 19:43:15 +02: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
7406ceb876 Additionnal factorisation 2014-09-20 18:09:48 +02:00
Vincent Lejeune
54347458fd Factorise material rendering code 2014-09-20 17:44:28 +02:00
vlj
88ebb46614 More cleanup 2014-09-20 16:44:09 +02:00
vlj
562d496df3 Clean some code. 2014-09-20 16:40:18 +02:00
hiker
b4208fe52d Try to report number of processors for apples (untested). 2014-09-20 23:39:33 +10:00
hiker
b14abb8b53 Fix linux build. 2014-09-20 14:35:32 +10:00
hiker
f25794327b Report #cores for linux (untested) and windows. 2014-09-20 14:09:37 +10:00
Vincent Lejeune
8c4bbf7527 Log texture name 2014-09-20 02:20:25 +02:00
Marianne Gagnon
46b490c0de Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-09-19 20:18:09 -04:00
Marianne Gagnon
53f9c5efdc Fix tangent generation in track objects 2014-09-19 20:17:49 -04:00
Vincent Lejeune
df18331cfc Complete fix for detail 2014-09-20 02:16:28 +02:00
Vincent Lejeune
f6d2ff92f1 Merge remote-tracking branch 'origin/glossmap' 2014-09-20 01:57:55 +02:00
Vincent Lejeune
1983fb8fc2 Really fix detailmap 2014-09-20 01:53:15 +02:00
Vincent Lejeune
4e6d29e1ef Fix detail map 2014-09-20 01:38:13 +02:00
Vincent Lejeune
ad6728ce51 Apparently fix minimap 2014-09-20 01:31:11 +02:00
Vincent Lejeune
317d7c870d Try to fix detail map default tex 2014-09-20 01:18:40 +02:00
Marc Coll Carrillo
bbbe0ddf8d Fix issues with the new "reverse grand prix" feature and user defined GPs 2014-09-19 23:25:03 +02:00
Vincent Lejeune
f526d194dc Remove useless field in single texture instance 2014-09-19 23:12:13 +02:00
Vincent Lejeune
cab71ff9fe Fix crash in kart selection screen. 2014-09-19 23:09:23 +02:00
Vincent Lejeune
8bce7fe142 Add a guard if a texture is missing. 2014-09-19 23:09:23 +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
Deve
a21b300e8a Fixed speed value at the kart selection start 2014-09-19 21:40:31 +02:00
Vincent Lejeune
5e64be41c6 Remove useless field in single texture instance 2014-09-19 19:58:28 +02:00
Marianne Gagnon
000b427f58 Fix ref counting crash 2014-09-19 19:54:16 +02:00
Vincent Lejeune
4b2b56035f Use default mat for untextured mat too 2014-09-19 19:54:16 +02:00
Marianne Gagnon
478110f4bf Remove outdated comment 2014-09-19 19:54:15 +02:00
Marianne Gagnon
933e27052d Create a "default material" object and use it for materials that don't appear in materials.xml, instead of an hardcoded special case 2014-09-19 19:54:15 +02:00
Vincent Lejeune
3349b9907d Improve naming convention of textures 2014-09-19 19:54:14 +02:00
Vincent Lejeune
39c56dcb78 Slightly improve getUnicolorTexture 2014-09-19 19:54:14 +02:00
Vincent Lejeune
24cd727899 Add glossytex to textures 2014-09-19 19:54:00 +02:00
vlj
9a114b2f6f Gather glsl material handling code 2014-09-19 19:22:04 +02:00
Vincent Lejeune
bb63cf9e86 Clean material handling code. 2014-09-19 19:22:03 +02:00
Vincent Lejeune
1f05a66b79 Split material into single/dual tex 2014-09-19 19:12:46 +02:00
Vincent Lejeune
f86663f9c2 Add Instance type to some templates 2014-09-19 18:49:14 +02:00
vlj
8dff9b5b98 Factorize part of scenemanager 2014-09-19 18:43:18 +02:00
vlj
1bd487fb60 Factorize Instance Vertex Attrib Setter 2014-09-19 18:43:17 +02:00
hiker
8a25683e2c Disable submitting the data for now. 2014-09-19 16:28:30 +10:00
hiker
63c7d02c7e Made line endings consistent. 2014-09-19 16:25:18 +10:00
hiker
c05896729e Made the user_id (which is apparently necessary on the server to calculate 
number of configurations correctly) a random number, that is saved in the
config file.
 2014-09-19 16:23:26 +10:00
hiker
2600b17132 Removed unused code and objects. 2014-09-19 14:31:25 +10:00
hiker
e18c20db65 Fixed various compiler warnings. 2014-09-19 11:02:20 +10:00
hiker
64702d8ada Don't submit requests for now (server is still expecting compressed 
data, and can't handle he requests we send atm).
 2014-09-19 09:41:44 +10:00
hiker
48e5e7c4e6 Added a version number to the hardware report, and report the hw config 
only once per installation. Print error messages in case submitting the
request.
 2014-09-19 09:40:11 +10:00
hiker
cba1c8c471 Report memory on windows and osx (not tested). 2014-09-19 08:16:20 +10:00
hiker
00f7829ad4 Fixed (c) statement. 2014-09-19 08:15:59 +10:00
hiker
48938f2880 Started to add GL limits to the statistics. Work in progress. 2014-09-18 22:09:56 +10:00
hiker
08b2beb339 Report available RAM on linux. 2014-09-18 15:55:25 +10:00
hiker
2e42898f4a Fixed incorrect value for opengl version. 2014-09-18 12:55:30 +10:00
hiker
e7096bc3b0 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-18 11:43:59 +10:00
hiker
c147dacbc2 Queue up sfx instead of starting them immediately. Preparation for 
threading the sfx manager.
 2014-09-18 11:43:26 +10:00
konstin
47deab4614 commenting out an unused function which only throws deprecation warnings 2014-09-18 02:19:26 +02:00
hiker
64fc2dd968 Added comments. 2014-09-18 07:55:24 +10:00
hiker
8c3beef69b Removed unnecessary static variable. 2014-09-18 07:48:31 +10:00
Vincent Lejeune
9ba19c7290 Move m_sync 2014-09-17 18:49:15 +02:00
hiker
66da6d9435 Removed old/unused declaration. 2014-09-17 22:08:43 +10:00
hiker
86b351fbf4 Turn sfx_manager into a singleton. 2014-09-17 21:38:21 +10:00
hiker
04dd7869cb Added gfx_drv_ver and gfx_vard to hardware report. 2014-09-17 16:58:50 +10:00
hiker
fca103b6a0 File missing in previous commit. 2014-09-17 16:16:38 +10:00
hiker
9035fde10b Avoid crashes on server side by supplying (unnecessary) values like 
os_win=0 on linux etc. Added more opengl data to keep the server
happier ... though not yet entirely happy ;)
 2014-09-17 16:08:41 +10:00
hiker
8efc7110c8 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-17 13:41:54 +10:00
hiker
c7650ba769 Fixed parameter names and missing / in URL (which is required). 2014-09-17 13:21:03 +10:00
Marianne Gagnon
105f7b49a3 Add profier marker for updatePhysics 2014-09-16 20:19:07 -04:00
Vincent Lejeune
13402543ce Use glClientWaitSync with a 0 timeout 
It turns out to be much more responsive this way.
 2014-09-17 01:01:45 +02:00
hiker
008aa7f22f Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-17 08:47:24 +10:00
hiker
1e1f921d08 Fix turning behaviour (karts would turn a lot more than with 
previous stk versions, which resulted in hard controlling karts
(esp. at higher speed).
 2014-09-17 08:44:28 +10:00
Vincent Lejeune
a2a6553d93 Fix srgb mismatch 2014-09-17 00:11:34 +02:00
vlj
534bcedecb Fix for multiplayer with non basic mode. 2014-09-16 23:22:02 +02:00
Vincent Lejeune
19420fb5f2 Some fix for basic glsl mode 2014-09-16 19:46:21 +02:00
Vincent Lejeune
e2b6538d2d Avoid clearing buffer if not strictly necessary 2014-09-16 19:42:10 +02:00
Vincent Lejeune
b9c547278f Do not enter renderLights if dynamic light is disabled 2014-09-16 19:24:47 +02:00
Vincent Lejeune
d6d4b1948c Use glewExperimental on OSX too 2014-09-16 17:19:24 +02:00
Vincent Lejeune
20f10e0235 Revert "Remove glewexperimental flag" 
This reverts commit 7516dc920a.
 2014-09-16 17:17:51 +02:00
Vincent Lejeune
7516dc920a Remove glewexperimental flag 2014-09-16 16:06:58 +02:00
Vincent Lejeune
1f383245d6 Merge branch 'master-fix' 2014-09-16 15:34:39 +02:00
Vincent Lejeune
58fc801322 Slightly extend coverage of ssao cs 2014-09-16 15:18:29 +02:00
Vincent Lejeune
b769e46a00 Use texture instead of image in SSAO. 2014-09-16 15:18:29 +02:00
hiker
e4fd6ed32b Merge remote-tracking branch 'origin/master' 2014-09-16 22:27:55 +10:00
hiker
9cdbaebd29 Started to add hardware stats reporting functionality. 2014-09-16 22:27:41 +10:00
hiker
e8aa181348 Merge remote-tracking branch 'origin/master' into include-glew 2014-09-16 11:05:35 +10:00
Vincent Lejeune
546cbabf3e Use ifdef WIN32 for test purpose 2014-09-16 01:14:45 +02:00
Vincent Lejeune
45b15c1d65 Add some memory barrier when using compute shaders 2014-09-16 00:34:23 +02:00
hiker
8029bc5880 Build a static version of glew. 2014-09-15 21:49:06 +10:00
Marianne Gagnon
835b329c46 kart selection screen : don't reload RTT scene if the selected kart hasn't changed 2014-09-14 19:16:06 -04:00
Marianne Gagnon
3536e13c49 Tweak fade-in/fade-out times in cutscenes and remove hardcoded values 2014-09-14 19:06:19 -04:00
Vincent Lejeune
0d982e55f0 Do not use kart position if there is no kart 2014-09-15 00:42:48 +02:00
Vincent Lejeune
866cd2b979 Set texture matrix in updateNoGL and not in updateGL 2014-09-15 00:16:50 +02:00
Vincent Lejeune
476f95a6c9 Fix snb on linux 2014-09-14 23:41:42 +02:00
Vincent Lejeune
cd68be24f5 Delete sync object 2014-09-14 17:35:16 +02:00
Deve
0eb09af027 Filtering actions is not needed now 2014-09-14 17:08:40 +02:00
Deve
8ea38fe622 Block event for one-element ribbon widget in the same way as multi-element widget. 
This fixes problem with pressing left and right arrow in track and GP info screen.
 2014-09-14 17:06:21 +02:00
vlj
26b69ecace Use __linux__ macro 2014-09-13 23:35:15 +02:00
vlj
108215dfdd Add a dtor to animated mesh 2014-09-13 15:57:39 +02:00
vlj
6d685a843d Drop support for GL 3.1 on windows 
Fixed pipeline will be used instead
 2014-09-13 15:45: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
1d913ad5b4 Do not set glewExperimental outside of linux 2014-09-13 02:02:05 +02:00
Vincent Lejeune
349a64ae8d Revert "Use a parallel loop for IA" 
This reverts commit 8e333afa99.
 2014-09-13 01:32:40 +02:00
Vincent Lejeune
674f0a5f05 Reenable billboards 2014-09-13 01:21:09 +02:00
Vincent Lejeune
d480c52f8c Revert "Try to put IA in its own thread" 
This reverts commit 2a60a84155.
 2014-09-12 23:22:54 +02:00
Vincent Lejeune
2a60a84155 Try to put IA in its own thread 2014-09-12 23:04:40 +02:00
Vincent Lejeune
78e512880c Remove unneeded functions 2014-09-12 19:29:01 +02:00
Vincent Lejeune
8e333afa99 Use a parallel loop for IA 
It sighltly helps decreasing stuttering in some area of chocolate.
 2014-09-12 19:10:22 +02:00
hiker
c4b6307ec9 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-13 01:24:17 +10:00
hiker
991f60d06d Select 'start' as default in gp info screen. 2014-09-13 00:58:30 +10:00
vlj
0b0fabc7bb Try to merge all MeshFor_Pass 2014-09-12 02:58:13 +02:00
vlj
503ecbb6f1 Some fixes to ligthshaft 2014-09-12 02:27:48 +02:00
Vincent Lejeune
6f65874ab2 Try to disable openMP at runtime 2014-09-12 01:12:55 +02:00
Vincent Lejeune
53fe339fb3 Enable simple culling for non indirect codepath 2014-09-12 01:07:02 +02:00
hiker
bf135095d8 Updated documentation, removed commented out code. 2014-09-12 08:37:03 +10:00
Vincent Lejeune
d79a5aaf01 Fix plunger update in basic glsl mode 2014-09-11 19:44:30 +02:00
Vincent Lejeune
cc4f638ed6 Looks like a wrong rebase 2014-09-11 19:41:16 +02:00
Vincent Lejeune
e6881efbc3 Use a (commented out) faster culling algorithm 2014-09-11 19:34:10 +02:00
hiker
6958539a71 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-11 21:48:44 +10:00
hiker
68e45db8d3 Start to support driving (and rescuing) on physical track objects. 2014-09-11 21:48:03 +10:00
Vincent Lejeune
e19ab67571 Inverse updateAbsolutePosition and Visibility test in scenemanager 2014-09-11 01:08:06 +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
2e860207d2 Move texture management function in a separate file. 2014-09-10 17:05:08 +02:00
Marianne Gagnon
2672d9b923 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-09-09 20:47:35 -04:00
Marianne Gagnon
cc3924081a Fix LOD 2014-09-09 20:47:22 -04:00
Vincent Lejeune
112ae43d03 Remove unneeded if (version/glcap) in shader ctor 2014-09-10 01:49:37 +02:00
hiker
8e12e68425 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-10 09:45:12 +10:00
Vincent Lejeune
8fd97615f3 Fix particle for hd3000 2014-09-10 01:42:51 +02:00
hiker
ae726b0902 Show "?" if a track has no screenshot (instead of the screenshot of 
the previous track).
 2014-09-10 09:39:20 +10:00
Vincent Lejeune
6e6b8e63b6 Inverted logic for compute shaders 2014-09-10 01:37:36 +02:00
Vincent Lejeune
c374beeb10 Disable all extension on OSX 
OSX does support GL 4.1 + a couple of 4.2 extensions. Since not all 4.2
extensions are present, disable extensions support instead of supporting
several combinaisons of extensions.
 2014-09-10 00:20:32 +02:00
vlj
9adda0bfeb Try to fix OSX 2014-09-09 21:58:53 +02:00
vlj
e8288c139d Add some documentation to add new material. 2014-09-09 17:48:22 +02:00
vlj
cc141fc992 Factorize matrix block uniform assignment 2014-09-09 17:27:10 +02:00
vlj
fbe2896460 Use non debug gl ctx in non debug build 2014-09-09 16:57:46 +02:00
vlj
a45152b915 Clean some #define 2014-09-09 16:39:28 +02:00
hiker
81da7cc2f7 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-09 13:18:17 +10:00
Vincent Lejeune
a83ef4ae2e Preload power up textures 2014-09-09 01:08:38 +02:00
Vincent Lejeune
e8db943dc2 Make computeCameraMatrix faster 2014-09-09 00:52:21 +02:00
vlj
ef89e168f8 Improve fps translation code. 2014-09-08 20:15:11 +02:00
vlj
eaf9d796e8 Fix missing material in basic glsl 2014-09-08 19:27:41 +02:00
vlj
752741307e Fix transparent in basic glsl pipeline 2014-09-08 19:14:21 +02:00
vlj
5f0b6095ba Fix basic glsl pipeline 2014-09-08 19:03:04 +02:00
vlj
9a19f6541b VAOManager: double buffer size when required. 2014-09-08 16:49:48 +02:00
vlj
24a626877a Use immutable storage for ibo 2014-09-08 16:33:10 +02:00
hiker
52a9993ba3 Minor cosmetic changes. 2014-09-08 21:26:49 +10:00
Vincent Lejeune
68cbe48969 Optimise VAOManager::getBase() 2014-09-08 03:01:50 +02:00
Vincent Lejeune
fee5858959 Do not make handle not resident when deleting GLMesh 
There is no way to delete an Handle except by deleting underlying
texture so it's fine.
 2014-09-08 02:26:48 +02:00
Vincent Lejeune
f3ec623093 Add a profiler marker for buffer upload 2014-09-08 01:33:21 +02:00