ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,477 Commits 9 Branches 28 Tags 433 MiB
3eb94e023d
Commit Graph

77 Commits

Author SHA1 Message Date
Deve
886382bb54 Merge remote-tracking branch 'origin/master' into gles 2016-07-11 23:43:10 +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
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
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
Marianne Gagnon
33defa44b7 Merge most modifications by egirsova to build 64-bits on OS X 2016-03-21 20:16:59 -04:00
deve
0dbc3575a7 Fixed mingw compilation 2015-12-14 10:11:40 +01:00
Nado
97de0cbc34 Fixing clang only warnings 2015-11-17 11:42:28 +01:00
Deve
e7e7e9e7d3 Make sure that we compile irrlicht only as static library. 
Compiling as shared library can cause errors during linking because of GLContextDebugBit variable, which is defined in STK sources.
 2015-10-17 16:02:35 +02:00
deve
df656fbf64 Allow to compile project using cygwin. 
Note that you need to have all dependencies in cygwin directory (can be easily installed).
Atm. wiimote and joystick events are disabled.
 2015-03-25 09:16:15 +01:00
Vincent Lejeune
6a50b4b9ac Revert "WIP wayland" 
This reverts commit d33efd8800.
 2015-01-29 18:05:01 +01:00
Vincent Lejeune
d33efd8800 WIP wayland 2015-01-29 18:00:33 +01:00
hiker
f724369a8e Merge branch 'freebsd-fixes' of https://github.com/leper/stk-code into leper-freebsd-fixes 2015-01-20 14:56:25 +11:00
deve
a0fc3c98e8 Fixed cmake warnings 2015-01-19 09:19:33 +01:00
Vincent Lejeune
573ad4bb1c Fix make install on linux 2015-01-19 02:22:40 +01:00
Vincent Lejeune
0577099551 Move zlib/libpng/jpeglib outside of irrlicht tree and use system lib on linux 2015-01-18 02:02:10 +01:00
Vincent Lejeune
a5230f68da Remove wad support 2015-01-16 19:07:21 +01:00
Vincent Lejeune
184b52966e Remove npk and pak support 2015-01-16 19:02:03 +01:00
Vincent Lejeune
cadc4b3209 Remove 2 deprecated interfaces 2015-01-16 01:59:41 +01:00
Vincent Lejeune
1fb99990b4 Remove light volume related code 2015-01-16 01:57:35 +01:00
Vincent Lejeune
c1d85e8674 Remove shadow volume code 
We use shadowmap
 2015-01-16 01:51:56 +01:00
Vincent Lejeune
4151edfd99 Remove RGB support 2015-01-16 01:23:59 +01:00
Vincent Lejeune
510c10153c Remove WAL/LMP support 2015-01-16 01:20:40 +01:00
Vincent Lejeune
9d99fb65e5 Remove DDS support and its scary legal notice 2015-01-16 01:07:48 +01:00
Vincent Lejeune
222f335300 Remove TGA support 2015-01-16 01:02:48 +01:00
Vincent Lejeune
084350ce40 Remove PCX support 2015-01-16 00:54:46 +01:00
Vincent Lejeune
8f51be8766 Remove PSD support 2015-01-16 00:44:32 +01:00
Vincent Lejeune
0856204b80 Remove PPM support 2015-01-16 00:38:53 +01:00
Vincent Lejeune
cf3e79484c Remove Scene Loader files 2015-01-11 00:24:26 +01:00
Vincent Lejeune
78ff00fc36 Revert "Remove irrlicht parallax map" 
This reverts commit c17a093d83.
 2015-01-11 00:18:29 +01:00
Vincent Lejeune
f1e6212b56 Remove IDepthBuffer 2015-01-11 00:02:37 +01:00
Vincent Lejeune
f68ac808d6 Remove software depth buffer 2015-01-10 23:58:28 +01:00
Vincent Lejeune
c17a093d83 Remove irrlicht parallax map 2015-01-10 23:54:01 +01:00
Vincent Lejeune
b7f124de62 Remove irrlicht normal map renderer 2015-01-10 23:49:08 +01:00
Vincent Lejeune
e994712c01 Remove cgmaterial files 2015-01-10 23:44:25 +01:00
Vincent Lejeune
6bd852c95f Remove Quake 3 level load 2015-01-10 21:22:23 +01:00
Vincent Lejeune
a08a9b1af4 Remove remaining MD2 support 2015-01-10 21:10:07 +01:00
Vincent Lejeune
53c8df6733 Remove remaining MD3 support 2015-01-10 21:03:44 +01:00
Vincent Lejeune
91bcacfd19 Remove CG 2015-01-10 20:44:19 +01:00
Vincent Lejeune
d271ccd2ef Partly remove MD2 support 2015-01-10 20:14:41 +01:00
Vincent Lejeune
e157bc8601 Partly remove MD3 support 2015-01-10 20:11:10 +01:00
Vincent Lejeune
9a0eacdfdb Remove WinCE support 2015-01-10 20:08:32 +01:00
Vincent Lejeune
952128928a Remove OBJ support 2015-01-10 20:02:17 +01:00
Vincent Lejeune
2c82f8d4b0 Remove BSP support 2015-01-10 19:50:48 +01:00
Vincent Lejeune
65f6f0259e Remove STL (stereolitography...) support 2015-01-10 19:39:53 +01:00
Vincent Lejeune
4c2618211a Remove LMTS support 2015-01-10 19:32:57 +01:00
Vincent Lejeune
c4903cb8ec Remove My3D 2015-01-10 19:29:14 +01:00