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
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
deve
57c14f2c07
Merge branch 'master' of https://github.com/supertuxkart/stk-code
2014-09-25 11:56:28 +02:00
deve
4fd3d977e4
Restore help printing when logs are printed only to stdout.log file.
2014-09-25 10:25:44 +02:00
hiker
cccf86e6a6
Bugfix: packet_log file would be overwritten at the end of a run.
2014-09-25 17:19:55 +10:00
hiker
679a6a7676
Fix #1567 (don't write packets_log.txt in cwd).
2014-09-25 17:15:05 +10:00
hiker
48d99086f1
Fix $1569 (allow adjusting of polling interval from server via news.xml
...
or polling response data).
2014-09-25 17:04:36 +10:00
Marianne Gagnon
df8c2cb2c3
Make missing texture non-fatal, hopefully that won't cause issues
2014-09-24 21:07:03 -04:00
hiker
3a14b38947
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-25 09:07:41 +10:00
hiker
7c66dd1865
Fix #1516 . Also fixed (probably unrelated) bug that first time STK
...
is started with internet permission, the addon server would not be
accessible. Note: any current configuration will not be read anymore
(if you need it, you can just move the files and directories from
.../supertuxkart into .../supertuxkart/0.8.2 (except addons, whic
stays in .../supertuxkart/addons!!).
2014-09-25 09:05:46 +10:00
Vincent Lejeune
3be8fdf82c
Declare extension usage for vertex shader layer
2014-09-24 23:43:43 +02:00
Deve
856ee103cf
Merge remote-tracking branch 'origin/master'
2014-09-24 18:12:20 +02:00
Deve
c6cb84a1be
Find best fit resolution only in fullscreen mode.
2014-09-24 18:04:14 +02:00
hiker
203d987127
Fix compiler warnings.
2014-09-24 23:31:41 +10:00
Deve
b524f72bb5
Revert "Small correction in dynamic ribbon to avoid some weird behaviour in the GP editor"
...
This reverts commit 6b42f1b7b7
2014-09-24 06:39:46 +02:00
hiker
8db34bed3c
Merge branch 'master' of github.com:supertuxkart/stk-code
2014-09-24 10:58:55 +10:00
hiker
044972be2a
Activate HW reporting.
2014-09-24 10:58:34 +10:00
Marianne Gagnon
6695238284
Fix loading normal maps (new XML syntax)
2014-09-23 20:11:03 -04:00
Marianne Gagnon
8a0fb9c187
Disable old hack that causes more trouble than it's worth
2014-09-23 19:57:09 -04:00
