Commit Graph

340 Commits

Author SHA1 Message Date
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
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
Deve
6d757326d2 Make sure that we start game with disabled GL_FRAMEBUFFER_SRGB 2015-12-11 19:18:14 +01:00
Deve
b91bcaf554 Disabl sRGB framebuffer on irrlicht side to avoid modifying current user interface colors 2015-12-11 19:18:14 +01:00
Deve
0216fd9697 Request sRGB-capable visual during creating OpenGL context.
We need it for proper working. When it's not available, then function glEnable(GL_FRAMEBUFFER_SRGB) doesn't take any effect, and then displayed image is too dark.

It doesn't solve the issue that the screen is too dark for intel graphics cards on linux, because the driver ignores this request. But still, this is the proper way to do it and it may avoid similar issues in future.

Actually we should detect that the visual is not srgb-capable, and in this case maybe make some gamma correction or filter it on our side to get similar effect.
2015-12-11 19:18:14 +01:00
Benau
93b1b11b99 Merge remote-tracking branch 'origin/master' into i18n 2015-12-11 09:27:15 +08:00
deve
ea581e0909 Try to support more mingw versions for wiiuse build.
This function has been already added to the header in mingw-w64 5.1 and newer.
2015-12-04 10:47:56 +01:00
Nado
d66a70b250 Fixing some -Wunused-variable 2015-11-17 11:42:28 +01:00
Nado
97de0cbc34 Fixing clang only warnings 2015-11-17 11:42:28 +01:00
Benau
2096532d0e Make stk more-i18n friendly
Now supertuxkart can do:

Windows (fully test in win8 and win7 built with vs2015, mingw not tested):
Input characters using ime (CJK tested).
Fix crashes when try to paste unicode text into editbox in stk.

Linux:
Different keymap can be used in stk now, ie typing russian,hebrew (not bidi-aware) is now possible.
IME not supported.

Mac:
No work has been done, sorry mac fanboys/girls:( Though testing is welcome, esp when pasting words into stk.

Limitation:
No ime box is shown in fullscreen

(Windows)Only the used language in current setting of non-Unicode programs can be typed with its supported IME.
2015-10-27 02:34:46 +08: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
407f29641c Use ugly hack for compile bullet with 64-bit mingw until I will find better solution 2015-10-13 01:05:41 +02:00
Deve
e15cd49cae Make changing to fullscreen on linux safer.
Now we are waiting until window state is already changed to fullscreen. We are getting real window size at the end of creating window function and previously it was sometimes reporting size of the window in windowed mode, which could causing issues in gui. Previously this was workarounded by forcing minimal window size to be at least in screen resolution, but window managers don't like to have non-resizeable fullscreen windows. Now this workaround is not needed anymore.
2015-10-03 16:43:22 +02:00
Deve
f351c359fd Create angelscript library in build directory instead of lib directory.
This solves issues with multiple build directories (every one should have its own angelscript lib). It was causing conflicts eg. 32-bit library with 64-bit STK.
Ideally it should be commited upstream to avoid this problem after updating library.
2015-09-26 23:02:18 +02:00
Deve
35fa7fd272 Fixed a strange bug during changing window to fullscreen under Gnome 2015-09-26 20:32:55 +02:00
Deve
6af30b68f0 Silence angelscript warning in different way.
We can't remove project() line because it uses ${PROJECT_SOURCE_DIR} in other place.
2015-09-12 21:56:49 +02:00
Deve
27a2f1bdc1 Silence warning about project version in angelscript.
I still didn't find proper solution for it...
2015-09-07 18:19:42 +02:00
auriamg
b64de23b06 Merge pull request #2307 from Benau/master
Fix typo and and add quotation
2015-09-03 18:49:48 -04:00
Ben
c488e843b8 Fix typo and and add quotation
The quotation added is for Chinese Simplified which I discovered usage in translation work.
2015-09-03 16:30:22 +08:00
Marianne Gagnon
e2da2a36a1 Fix line endings 2015-09-01 19:39:30 -04:00
Benau
0a7a0d7c98 Fix the ugly hack for displaying Chinese in #2110, and then fix #2297 2015-08-30 02:35:17 +08:00
Deve
78cd8efdd4 Reset screensaver counter on linux when joystick event was received 2015-08-09 18:54:59 +02:00
deve
b5c15275de Fixed compiler warning.
This is already fixed upstream in commit r2174:
"Fixed compiler warnings in asGetTypeTraits on gnuc 5.1"
2015-08-06 14:35:26 +02:00
deve
5458792b79 Disable deprecated and unused irrlicht function to avoid compiler warnings 2015-08-06 13:54:40 +02:00
Marianne Gagnon
3687eb79d6 Apply modified version of patch from Benau to fix chinese word wrapping. See #2110 2015-07-29 18:51:03 -04:00
hiker
cd8fd7fb16 Merge remote-tracking branch 'origin/master' into Flakebi-fixes 2015-07-20 09:10:05 +10:00
hiker
93282f8abf Completely removed the usage of a physical wheel radius in the physics, it was
never really necessary, the phsyics are basically the same). Wheel rotation is
was refactored to be completely done in KartModel now.
2015-07-09 23:59:53 +10:00
hiker
3b9e85af0b Converted bullet's TravelCM (i.e. in cm) into Travel (i.e. in m). 2015-07-09 00:06:19 +10:00
Flakebi
d2ca7d11d7 Remove unused/commented out code 2015-07-03 15:36:45 +02:00
Flakebi
fbf26df23d Merge branch 'master' into fixes
Conflicts:
	src/graphics/2dutils.cpp
	src/graphics/graphics_restrictions.cpp
	src/graphics/render_skybox.cpp
	src/graphics/rtts.hpp
2015-07-03 15:29:53 +02:00
Marianne Gagnon
c48037984d Update to latest angelscript 2015-05-11 19:40:43 -04:00
Marianne Gagnon
9f883db6f7 Start work to enable scripting 2015-04-24 20:59:32 -04:00
hiker
e8b8bbdd3b Added display of normals at the vertices of the triangles the kart is driving on
to the debug display, which is useful to find why interpolated normals are wrong.
2015-04-15 07:44:50 +10:00
Deve
5e56f8904a MinGW: Allow to compile wiiuse.
Still disabled by default because it requires mingw-w64 and it may not work with other versions.
2015-03-31 19:27:07 +02:00
hiker
a560aafa50 Merge branch 'fix_non_hd_option' 2015-03-27 09:33:07 +11:00
hiker
27dec2fbf8 Added attribute to irrlicht's driver to enable automatic resize
of images that are too big. This is then used to automatically
resize any textures (except fonts, background screen) to be
automatically resized to 512x512 if they are bigger.
2015-03-26 11:28:22 +11: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
hiker
443d570196 Make legacy somewhat working on linux (just in case). 2015-03-12 11:47:38 +11:00
hiker
98671b620d Added some support to enable a legacy (2.1) opengl context. Many
things don't work with that atm (rtt, some transparent textures).
Needs to be manually set in the user's config file.
2015-03-11 16:45:20 +11:00
hiker
55934bd8f1 Fixed cmake on VS (before cmake create would fail, but redoing the configure
and then generating the project would still work, so with an existing
project this error was not detected).
2015-03-11 14:45:25 +11:00
Flakebi
e5abf4cec3 Merge branch 'origin/master' into fixes 2015-03-08 01:16:51 +01:00
Deve
0722df79da Fixed getScale() result when matrix contains very low negative values.
See #1548.
2015-03-05 20:00:02 +01:00