hiker
|
768d843cfe
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-09-30 09:49:25 +10:00 |
|
hiker
|
2cab457cbc
|
Removed unnecessary call to getAsset().
|
2014-09-30 09:47:57 +10:00 |
|
Marianne Gagnon
|
c3d8df65e1
|
Merge branch 'marcoll_master'
|
2014-09-29 19:21:56 -04:00 |
|
Marianne Gagnon
|
a9936434f0
|
VS compilation fix
|
2014-09-29 19:21:45 -04:00 |
|
Marianne Gagnon
|
24480ea0c1
|
First attempt at caching tangents meshes
|
2014-09-29 19:12:37 -04:00 |
|
Marianne Gagnon
|
c26a2413b2
|
Properly cleanup mesh cache, fixes crash on second play
|
2014-09-29 18:42:10 -04:00 |
|
Deve
|
d0e30c15a5
|
Reset counter when game is restarted
|
2014-09-29 21:56:32 +02:00 |
|
Deve
|
1c97476369
|
Display wrong way message after a delay.
|
2014-09-29 20:21:05 +02:00 |
|
Deve
|
b3c6cbf5d8
|
Fixed linux compilation
|
2014-09-29 18:19:22 +02:00 |
|
hiker
|
7c429b2a2d
|
Merge branch 'master' of github.com:supertuxkart/stk-code
|
2014-09-29 22:45:21 +10:00 |
|
deve
|
9a520c4dd6
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code
|
2014-09-29 14:44:28 +02:00 |
|
hiker
|
6cdce11fb7
|
Fix #1576 (crash when viewing other online user's friends).
|
2014-09-29 22:42:51 +10:00 |
|
deve
|
0943f0ed76
|
Add debug flags for mingw
|
2014-09-29 13:35:17 +02:00 |
|
samuncle
|
af037d6267
|
tweak particle.xml
|
2014-09-29 12:30:43 +02:00 |
|
hiker
|
8a52949e74
|
Merge remote-tracking branch 'origin/master' into soft-physics-landing
|
2014-09-29 19:29:20 +10:00 |
|
deve
|
226eeb2718
|
Add inet_ntop function for mingw compiler
|
2014-09-29 09:19:38 +02:00 |
|
hiker
|
388937a487
|
Fixed info message.
|
2014-09-29 12:09:19 +10:00 |
|
hiker
|
79873e2d45
|
Added (some) support for driving on walls, added documentation.
|
2014-09-29 11:54:46 +10:00 |
|
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 |
|
hiker
|
a86b4e489c
|
First version of 'smooth landing' in physics.
|
2014-09-28 23:18:52 +10:00 |
|
Marc Coll Carrillo
|
2651c082a4
|
Issue #1505
Dynamically change font size in a DynamicRibbonWidget to make labels fit,
and also cut the text when it's just too long
|
2014-09-28 10:18:47 +02:00 |
|
Marc Coll Carrillo
|
eaf6ee9556
|
Merge remote-tracking branch 'upstream/master'
|
2014-09-28 09:27:09 +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 |
|