Deve
5601309ae8
Fixed windows compilation
2016-07-12 00:04:37 +02:00
Deve
886382bb54
Merge remote-tracking branch 'origin/master' into gles
2016-07-11 23:43:10 +02:00
Deve
0f7976e5f8
Merge branch 'master' into gles
2016-07-11 23:23:02 +02:00
Deve
b25a4e874f
Remove android related code. It will be handled in different branch.
2016-07-11 22:54:59 +02:00
Deve
f2d21d2353
Remove GLESv1 renderer because it's not used
2016-07-09 02:59:40 +02:00
Deve
17a0e4fbd8
Fixed an issue with grass shader.
...
It looks that EMT_TRANSPARENT_ALPHA_CHANNEL_REF wasn't handled at all in irrlicht OpenGL renderer.
2016-07-09 02:50:40 +02:00
Deve
66e76be76d
Don't use hardcoded path for irrlicht shaders
2016-07-06 06:37:22 +02:00
deve
93dde11562
Use proper depth texture
2016-07-05 11:48:43 +02:00
Benau
b6153b6002
Thanks devee for this fix
2016-07-05 17:47:55 +08:00
Benau
04ccadd745
Fix non-linux build
2016-07-05 16:24:59 +08:00
Deve
4132177132
Fully integrate gles renderer with our irrlicht version.
2016-07-05 00:25:03 +02:00
Ezequiel Garcia
02361a37e8
Minor fixes for issues found while cross-building v2 ( #2556 )
...
* irrlicht: Fix harmless typo when setting CMAKE_CXX_FLAGS
The CMAKE_CXX_FLAGS set should be based on previously set
CMAKE_CXX_FLAGS (instead of C flags). This is currently
harmless because CMAKE_CXX_FLAGS is not previously set.
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
* irrlicht: Get rid of unprefixed cflags
Cross-building requires proper include paths. This commit
removes the unprefixed -I/usr/X11R6/include in irrlicht cflags,
replacing it with a proper CMake module.
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
* irrlicht: Fix boolean return type for jpeglib's callback
Building on certain toolchains can fail due to returning an integer
instead of TRUE. In any case, only {TRUE,FALSE} should be used
as 'boolean' jpeglib type. Fix this by returning TRUE.
CImageLoaderJPG.cpp: In static member function 'static boolean
irr::video::CImageLoaderJPG::fill_input_buffer(j_decompress_ptr)':
CImageLoaderJPG.cpp:69:9: error: invalid conversion from 'int' to 'boolean'
[-fpermissive]
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
2016-07-03 21:07:53 -04:00
Deve
961428f04c
Increase _IRR_MATERIAL_MAX_TEXTURES_ to 8
2016-06-29 22:18:24 +02:00
Benau
984553fd33
Merge remote-tracking branch 'origin/master' into render_kart_driver_differently
2016-06-28 14:56:21 +08:00
Benau
22e5c0909c
Allow setting color without copying the mesh
2016-06-28 14:55:48 +08:00
hiker
431ed63da2
Improved fix for 2522 by using isStaticOrKinematicObject() function
...
(instead of accessing the rigid body). This separates collision
and dynamic handling of bullet again.
2016-06-27 07:48:30 +10:00
Benau
2f217fd55b
Allow render red or blue karts in soccer mode using shader
2016-06-25 16:29:54 +08:00
Deve
d13716a917
Initial linux version.
...
Currently works only with irrlicht-based renderer because shaders are not ported yet.
2016-06-24 02:47:13 +02:00
Odd0002
416edef95d
Fix debug build on GCC 5.3.0
2016-06-23 23:10:36 +02:00
hiker
0eb4ca2abd
Fix #2522 in case of a sphere, and apply this fix only in case of a
...
static body to reduce potential incorrect side effects.
2016-06-21 09:53:51 +10:00
hiker
7a95f10cc0
Try to fix #2522 for a puck.
2016-06-21 09:32:14 +10:00
hiker
0a883f3832
First try to fix #2522 (soccer ball pushed in air). Needs to be tested,
...
and puck still needs to be done.
2016-06-20 15:10:58 +10:00
Benau
d520c4477d
Design a way to render kart and driver differently
2016-06-12 16:19:34 +08:00
Deve
56c6062a81
One more tweak.....
2016-06-04 00:10:56 +02:00
Deve
d60d9120b4
Define constants in glew cmake file before 'add_library' function.
...
It was working for me as it was before, but based on this comment: 10488bc79a (commitcomment-17724549)
it looks that some cmake versions may ignore definitions that are defined below add_library.
2016-06-03 06:48:46 +02:00
Deve
10488bc79a
Don't link libGLU library.
...
This should allow to run linux static package even if libglu1-mesa package is not installed. And the utilities from GLU library are not used in STK anyway.
2016-05-12 23:38:56 +02:00
Deve
58846002eb
Fixed bullet compilation for gcc 6.0.
...
Just converted all negative values and kept unsigned char* type to avoid too many modifications in the code.
2016-04-15 23:46:14 +02:00
Benau
224bd277b3
Better function name
2016-04-03 13:59:10 +08:00
Benau
79db5e2365
Fix comment
2016-04-02 16:02:51 +08:00
Benau
5ac25db7f8
Initial work to support transparent kart in ghost replay
2016-04-02 12:55:20 +08:00
Odd0002
47bac3b33d
Fix debug build on GCC 5.3.0
2016-03-26 22:36:22 -05:00
Marianne Gagnon
33defa44b7
Merge most modifications by egirsova to build 64-bits on OS X
2016-03-21 20:16:59 -04:00
Lucas Baudin
b8ef827510
[irrlicht/android] don't poll events or it creates a race lock when polling accelerometer events elsewhere
2016-02-27 00:23:08 +01:00
Lucas Baudin
e9657beaa6
[android] detect size
2016-02-26 18:01:51 +01:00
Lucas Baudin
f484e7ef6b
[android] More debug print for the android irrlicht device
2016-02-25 23:13:33 +01:00
Lucas Baudin
f91426d748
[android] Use CIrrDeviceAndroid before the console device…
2016-02-25 20:38:50 +01:00
Lucas Baudin
e39efc128c
[android] backport the Irrlicht.cpp createDevice changes, fix the compile error, and use OGLES2 on android
2016-02-25 20:15:24 +01:00
Lucas Baudin
f89a4b1a75
Merge back the IEvent changes
2016-02-25 15:55:52 +01:00
Lucas Baudin
02808cdfd0
GLES2 for android devices by default
2016-02-25 12:06:54 +01:00
Lucas Baudin
d4d3817d63
Disable sound and curl, add freetype
2016-02-24 22:24:33 +01:00
Lucas Baudin
48069a7bcc
More backport from the ogl-es irrlicht branch
2016-02-24 20:34:46 +01:00
Lucas Baudin
a470cd74d6
add android port from irrlicht (based on commit 875d0cfac88c26994b82d68737b085ec1b84c5f8)
2016-02-24 12:34:08 +01:00
Odd0002
0289e93bcc
Silence AngelScript warning as in 6af30b68f0
2016-02-18 09:50:49 -06:00
Odd0002
e69e96af19
Fixed cmake based on https://github.com/supertuxkart/stk-code/issues/2325 and the related commit
2016-02-17 23:48:59 -06:00
Odd0002
fdd6f36b46
Update angelscript to 2.30.2
2016-02-17 22:07:55 -06:00
Deve
bd9f435190
Fixed 64-bit windows compilation.
...
Broken in 53164e5cbe
or somewhere around it.
2016-01-03 00:10:30 +01:00
David Carlier
2841c0e165
better alternative OSes handling + tiny C++ fix
2015-12-19 07:05:45 +00:00
deve
e77dbf3d9f
Totally remove wiiuse hack for mingw.
...
It breaks versions with proper header file due to redeclaration error.
You should simply use current 4.9 version or 5.0 and newer for wiimote support.
2015-12-14 10:18:08 +01:00
deve
0dbc3575a7
Fixed mingw compilation
2015-12-14 10:11:40 +01:00
Benau
9d1c9fac5a
Merge remote-tracking branch 'origin/master' into i18n
2015-12-14 03:00:07 +08:00