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

16323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benau
08f2437754 Merge branch 'support_loop_start_music' 2016-07-11 09:09:06 +08:00
Deve
a67a378c41 Merge pull request #2563 from LoadingPleaseWait/wiimote-string 
Add missing space in string for wiimote manager
 2016-07-08 22:43:23 +02:00
LoadingPleaseWait
bdd21142bb Add missing space in string for wiimote manager 2016-07-08 15:33:10 -05:00
Benau
98b9aef121 Add support for loop start of music 2016-07-08 13:54:37 +08:00
hiker
b2a62c222c Merge branch 'camera-refactor' 2016-07-08 06:47:32 +10:00
hiker
c3e1a67f39 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2016-07-08 06:24:19 +10:00
hiker
c43930dc46 Bugfix: characteristics could not be overwritten in kart.xml files. 
First part of #2560.
 2016-07-08 06:22:28 +10:00
qwertychouskie
fbcd0ef495 Update TODO.md (#2531) 
* Update TODO.md

* Update link
 2016-07-05 19:09:22 -04: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
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
hiker
3d2c2b63c0 Fixed unit testing for network string. 2016-06-30 07:47:35 +10: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
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
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
Benau
8bae12e080 Fix potential warning 2016-06-26 15:52:47 +08:00
Benau
8497ad0204 Use a deeper hue 2016-06-26 11:23:17 +08:00
Benau
f1dd7ce06e Remove the arrows in soccer mode if using glsl 2016-06-26 07:53:59 +08:00
Benau
b467d0819d Add a missed shader 2016-06-26 07:16:07 +08:00
Benau
416050a923 Use a more simple way to render red/blue karts 2016-06-26 07:14:11 +08:00
Benau
7e806fe86f Merge remote-tracking branch 'origin/master' into render_kart_driver_differently 2016-06-25 16:31:08 +08:00
Benau
2f217fd55b Allow render red or blue karts in soccer mode using shader 2016-06-25 16:29:54 +08:00