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

16418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Benau
a0898962a9 Remove hard-coded value for colorization factor 2016-07-04 00:26:25 +08:00
Benau
ffbe06a98c Update with the same type from blender export script 2016-07-03 11:25:50 +08:00
Benau
6b60d866ba Make render info works with instanced rendering 
The unordered_map in the past skipped some mesh buffer even its
render_info pointer is different, now the map takes it into account
 2016-07-02 11:48:36 +08:00
Benau
ae790e9c62 Fix transparency of ghost karts 2016-07-02 08:59:38 +08:00
Benau
48d94097d6 Add min saturation setting to material class 2016-07-01 23:55:56 +08:00
Benau
f23ec7e7b8 Add more helper function to render info class 2016-07-01 00:39:25 +08:00
Benau
bfd66ebbac Put color change code in a better location 2016-06-30 16:08:59 +08:00
Benau
4c4b4782e0 Fix wrong type 2016-06-30 14:16:12 +08:00
Benau
cda6bd7603 Allow changing kart color on-the-fly in soccer setup screen 2016-06-30 14:12:12 +08:00
Benau
4a2bac1cd5 Merge remote-tracking branch 'origin/master' into render_kart_driver_differently 2016-06-30 11:02:40 +08:00
Benau
a55ab7f707 Fix colorization of wheels and speed weight objects 2016-06-30 11:01:56 +08:00
Benau
5bb2a5cf7e Allow changing kart color on-the-fly 2016-06-30 09:30:52 +08:00
hiker
4feb3350a2 Fix linux release build. 2016-06-30 09:42:50 +10:00
hiker
65af731e66 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-06-30 09:22:15 +10:00
hiker
392dd6a5ff Added new installer picture. 2016-06-30 09:21:59 +10:00
hiker
48dbc6c80a Fixed various bugs in kart characteristics: a negative value for 
a float now works, also longer computations like 1+2*3 (see unit
testing).
 2016-06-30 09:20:24 +10:00
hiker
9efb4da2ec Added unit testing for kart characteristics (failing atm due to 
bugs in characteristics).
 2016-06-30 09:17:30 +10:00
Deve
9ceab23c5f Apply ssao fix from master 2016-06-30 00:50:33 +02:00
Deve
c07472cf38 Simplify #ifdef's a bit 2016-06-30 00:29:15 +02:00
Deve
742fb309df Totally disable code that needes gles 3.1. 2016-06-29 23:58:45 +02:00
hiker
3d2c2b63c0 Fixed unit testing for network string. 2016-06-30 07:47:35 +10:00
Deve
3ae175e05a Fixed skybox rendering. 
The GL_SRGB_ALPHA_EXT and GL_SRGB8_ALPHA8 formats are available in OpenGL ES, but they produce black texture for some reason. The basic GL_RGBA format works fine though.
 2016-06-29 22:24:17 +02:00
Deve
961428f04c Increase _IRR_MATERIAL_MAX_TEXTURES_ to 8 2016-06-29 22:18:24 +02:00
qwertychouskie
31b4c86b8f Update links for new site (#2529) 
* Update links for new site

* more tweaks to readme.md
 2016-06-28 19:02:03 -04:00
qwertychouskie
e8462334ee Update more links (#2530) 2016-06-28 18:27:15 -04:00
Deve
0fb119068b Fixes in more shaders 2016-06-28 21:55:51 +02:00
hiker
59a64625fa Use references instead of copying the string. 2016-06-28 17:43:25 +10:00
hiker
c3f1b53535 Added samuncle's new installer image. 2016-06-28 17:39:43 +10:00
hiker
f6a37b5e99 Simplified Stars constructor, removed unnecessary #include from kart.cpp. 2016-06-28 17:29:32 +10: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
David CARLIER
a99d02f366 couple of resource leaks fixes (#2526) 2016-06-27 19:47:56 -04:00
hiker
3c66a02337 Minor code simplification. 2016-06-28 08:01:26 +10:00
Deve
51d3b71ec6 Already working advanced lighting! 2016-06-27 23:24:39 +02:00
Deve
bf54626815 Added missing file 2016-06-27 23:06:48 +02:00
Deve
f73befbe0b Fixed particles 2016-06-27 23:05:25 +02:00
deve
964baad705 Some fixes 2016-06-27 13:39:20 +02:00
deve
d5e30ee41e Port also other shaders to use #stk_include 2016-06-27 13:11:27 +02:00
hiker
8b52831083 Merge branch 'fix-2522' 2016-06-27 18:13:11 +10:00
Benau
892bc490f7 Make shaders run as efficient as possible 2016-06-27 13:49:27 +08:00
Benau
5424d49ce7 Remove an ugly cast 2016-06-27 09:19:40 +08:00
hiker
4faa84a1a7 Merge branch 'master' into fix-2522 2016-06-27 07:49:28 +10: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
Deve
f679078e75 Port some basic shaders to use #stk_include. 
Already working race with disabled advanced lighting :)
 2016-06-26 16:39:34 +02:00
Deve
b27f771318 Fixed compiler warning and remove debug output 2016-06-26 16:38:19 +02:00
Deve
e46905b106 Added #stk_include directive for our shaders. 
OpenGL ES doesn't allow to link multiple shaders into one program. We can just join it on our side and compile it as one file instead.
 2016-06-26 16:05:05 +02:00
Deve
9ce190f704 Fixed missing dot in file name 2016-06-26 10:19:34 +02:00
Benau
8bae12e080 Fix potential warning 2016-06-26 15:52:47 +08:00