Marianne Gagnon
|
139f20b39d
|
Merge remote-tracking branch 'sachith/ScriptEngine'
Conflicts:
CMakeLists.txt
sources.cmake
src/io/file_manager.cpp
src/io/file_manager.hpp
src/modes/world.hpp
src/tracks/track.hpp
src/tracks/track_object_presentation.cpp
|
2014-10-27 18:43:09 -04:00 |
|
hiker
|
d8cb6e1069
|
Moved #include to the top.
|
2014-10-25 10:32:28 +11:00 |
|
hiker
|
759182bb68
|
Used SDL's joystick name detection on windows.
|
2014-10-25 10:18:27 +11:00 |
|
Marianne Gagnon
|
c1d6c054c8
|
Route a few more controls rendering through the skin, to make them use OpenGL 3
|
2014-10-04 19:38:44 -04:00 |
|
Marianne Gagnon
|
11bf9d15c7
|
Disable source of OpenGL warnings flood in code we don't use
|
2014-10-01 20:23:22 -04:00 |
|
hiker
|
86b23f2d23
|
Merge remote-tracking branch 'origin/master' into soft-physics-landing
|
2014-10-01 11:58:40 +10:00 |
|
Marianne Gagnon
|
7387a51381
|
Disable features of irrlicht's contextual menu that we don't need and cause floods of warnings
|
2014-09-30 19:33:25 -04:00 |
|
hiker
|
11916dd187
|
Different implementation of soft-landing.
|
2014-09-30 23:13:48 +10:00 |
|
hiker
|
8ca7730570
|
Removed unnecessary source file in glew.
|
2014-09-30 15:01:38 +10:00 |
|
vlj
|
b89f066d14
|
Merge branch 'minlicht'
|
2014-09-29 03:25:04 +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
|
abeda85f77
|
Reenable GL 3.1 support on windows
|
2014-09-29 01:31:59 +02: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 |
|
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
|
9cc98f57e3
|
Reapply patch from http://sourceforge.net/p/glew/patches/40/
This reverts commit dd70f09fce.
|
2014-09-27 18:49:33 +02: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
|
64a84f7e58
|
Fix another bunch of deprecated function calls
|
2014-09-26 22:39:53 +02: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
|
e8aa181348
|
Merge remote-tracking branch 'origin/master' into include-glew
|
2014-09-16 11:05:35 +10:00 |
|
Vincent Lejeune
|
bd4602fb5d
|
Fix context creation on linux when driver support gl 4.3
|
2014-09-15 23:39:48 +02:00 |
|
hiker
|
8029bc5880
|
Build a static version of glew.
|
2014-09-15 21:49:06 +10:00 |
|
hiker
|
69473b1811
|
Try to include glew in stk.
|
2014-09-15 16:33:46 +10: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 |
|
Sachith Hasaranga Seneviratne
|
10e2634f22
|
Merged master
|
2014-09-13 08:45:41 +05:30 |
|
deve
|
e6ab299f37
|
Fixed mingw compilation
|
2014-09-12 09:01:35 +02:00 |
|
Sachith Hasaranga Seneviratne
|
b6a9e5be9c
|
Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine
|
2014-09-10 17:15:01 +05:30 |
|
vlj
|
fbe2896460
|
Use non debug gl ctx in non debug build
|
2014-09-09 16:57:46 +02:00 |
|
Sachith Hasaranga Seneviratne
|
118db58a02
|
Merged Master
|
2014-09-07 11:28:15 +05:30 |
|
Vincent Lejeune
|
4822b8a75e
|
Fix travis
|
2014-09-07 00:44:56 +02:00 |
|
Vincent Lejeune
|
b9a595e666
|
Revert "Revert "Use pointer arithmetic to enforce matrix 16 bytes alignment""
This reverts commit e83bd11891.
|
2014-09-07 00:44:49 +02:00 |
|
Vincent Lejeune
|
e83bd11891
|
Revert "Use pointer arithmetic to enforce matrix 16 bytes alignment"
This reverts commit 0eeeb60685.
|
2014-09-07 00:20:35 +02:00 |
|
Vincent Lejeune
|
cbb59fa640
|
Revert "Fix travis"
This reverts commit bdb867bce2.
|
2014-09-07 00:20:31 +02:00 |
|
Vincent Lejeune
|
bdb867bce2
|
Fix travis
|
2014-09-07 00:17:43 +02:00 |
|
Vincent Lejeune
|
0eeeb60685
|
Use pointer arithmetic to enforce matrix 16 bytes alignment
|
2014-09-07 00:08:47 +02:00 |
|
vlj
|
56459f39ab
|
Use a matrix multiplication
|
2014-09-05 23:53:38 +02:00 |
|