Commit Graph

13020 Commits

Author SHA1 Message Date
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
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