Commit Graph

13173 Commits

Author SHA1 Message Date
vlj
b89f066d14 Merge branch 'minlicht' 2014-09-29 03:25:04 +02:00
vlj
a88bb8eb6c Improve debug msg 2014-09-29 03:01:36 +02:00
vlj
69896fdc6a Fix material detection 2014-09-29 03:01:36 +02:00
vlj
273a2bf022 Set normal map and detail map in material.cpp 2014-09-29 03:01:35 +02:00
vlj
7b165574c0 Merge MAT_* with shadertype 2014-09-29 03:01:34 +02:00
vlj
ecb2f74711 Add default texture to m_sun_interposer 2014-09-29 02:56:32 +02:00
vlj
4705b8d1a1 Remove X/MS3D file loader 2014-09-29 02:52:06 +02:00
vlj
9a5ecc1b23 Remove ogre loader 2014-09-29 02:46:15 +02:00
vlj
3c4a22d659 Remove Half Life loader 2014-09-29 02:38:23 +02:00
vlj
b19a9bdf2f Remove 3DS Loader 2014-09-29 02:25:31 +02:00
vlj
554cb1dda0 Remove another CBurning file 2014-09-29 02:01:49 +02:00
vlj
398a556df2 Use glVertexAttribDivisorARB
If GL 3.1 is supported but not 3.3, use glVertexAttribDivisorARB instead
of glVertexAttribDivisor
2014-09-29 01:50:33 +02:00
vlj
e2da98bcfb Use glsl with GL >= 3.1 2014-09-29 01:44:24 +02:00
vlj
abeda85f77 Reenable GL 3.1 support on windows 2014-09-29 01:31:59 +02:00
Marianne Gagnon
fe569797a3 Partial fix for objects not being cleaned up when they should. There's more left 2014-09-27 20:37:20 -04:00
Marianne Gagnon
4f6bb4565f Revert earlier bugfix attempt, causes other issues 2014-09-27 20:10:47 -04:00
vlj
6061a77884 Use the newly introduced material 2014-09-28 02:03:23 +02:00
Marianne Gagnon
38b9c059d1 Tentative fix for a crash when playing a track the 2nd time 2014-09-27 19:48:48 -04:00
Marianne Gagnon
ef94c77a67 suppress false positive warning 2014-09-27 19:27:28 -04:00
Marianne Gagnon
8d99fa2cb1 Return default material when no special material for current texture 2014-09-27 19:24:39 -04:00
vlj
a303eadf3d Remove a deprecated function call 2014-09-28 01:13:38 +02:00
Marianne Gagnon
7b5ce0f9d7 Fix compilation, why this didn't work for me but works for others is a mystery 2014-09-27 19:07:29 -04:00
Marianne Gagnon
f5de76a988 Merge branch 'master' of https://github.com/supertuxkart/stk-code
Conflicts:
	src/graphics/stkmesh.hpp
2014-09-27 18:51:49 -04:00
Marianne Gagnon
906b7e8c51 Pass STK Material objet to MapMaterial functions 2014-09-27 18:51:10 -04:00
vlj
a9ab147ae5 Remove software renderer 2014-09-28 00:48:20 +02:00
vlj
b5372c295d Remove D3D related files 2014-09-27 19:46:49 +02:00
vlj
9e2061e88b Clean some code 2014-09-27 19:28:09 +02:00
vlj
f7bc014b16 Merge remote-tracking branch 'origin/glplaincore' 2014-09-27 19:12:26 +02:00
vlj
9cc98f57e3 Reapply patch from http://sourceforge.net/p/glew/patches/40/
This reverts commit dd70f09fce.
2014-09-27 18:49:33 +02:00
Deve
f2ac1dca55 Merge pull request #1577 from konstin/asan_fix
fix asan new-delete-missmatch
2014-09-27 17:18:18 +02:00
konstin
cfd18366db fix asan new-delete-missmatch 2014-09-27 17:12:58 +02:00
hiker
dfc3756f5d Fixed compiler warning. 2014-09-27 19:25:45 +10:00
vlj
669c8af73e Try to fix linux, round 2 2014-09-26 23:36:13 +02:00
vlj
ac2a40837f Try to fix linux 2014-09-26 23:28:29 +02:00
vlj
18b0c65dd6 Use core context for linux too. 2014-09-26 23:21:09 +02:00
vlj
1e5ad1060b Use core context except for legacy 2014-09-26 23:17:05 +02:00
vlj
8e67131351 Another fix 2014-09-26 23:15:56 +02:00
vlj
b79e969b11 Remove some others deprecated calls 2014-09-26 23:10:10 +02:00
vlj
3b393b8618 Set useCoreContext outside of ifdef windows 2014-09-26 23:03:44 +02:00
vlj
f41c1497cf Revert "Declare bool in CIrrDeviceLinux"
This reverts commit 35de5d3975.
2014-09-26 23:03:25 +02:00
vlj
35de5d3975 Declare bool in CIrrDeviceLinux 2014-09-26 23:01:45 +02:00
vlj
ced7eb4d36 Another couple of glDisable(GL_ALPHA_TEST) 2014-09-26 22:50:40 +02:00
vlj
f75e21a226 Remove glDisable(GL_ALPHA_TEST) 2014-09-26 22:46:01 +02:00
vlj
64a84f7e58 Fix another bunch of deprecated function calls 2014-09-26 22:39:53 +02:00
hiker
544f15d693 Removed outdated comment. 2014-09-26 23:48:10 +10:00
vlj
032447bf30 Additionnal work. 2014-09-26 15:42:03 +02:00
vlj
f320b36db3 Do not use some deprecated function with core ctx 2014-09-26 15:27:50 +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
Deve
babe9b0023 Fixed issue with sound which was starting in a loop 2014-09-25 19:57:35 +02:00