ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,383 Commits 9 Branches 28 Tags 433 MiB
0934373fca
Commit Graph

324 Commits

Author SHA1 Message Date
hiker
d3224712c9 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-12-18 16:54:38 +11:00
hiker
6a806470f1 Fixed #1799 (linking issue) - use of VS only functions that were not 
enclosed on #ifdef (not an issue with default link options, since the
functions using the VS only functions are not actually used in STK).
 2014-12-18 16:51:08 +11:00
Vincent Lejeune
116cdec611 Try old method of creating a context 2014-12-18 01:50:09 +01:00
hiker
25e059dd3e Merge remote-tracking branch 'origin' into copy_kart_mesh 2014-12-09 08:50:23 +11:00
hiker
2c2847e912 Fixed line endings. 2014-12-09 08:05:16 +11:00
hiker
5b62d94c5b Minor performance optimisations. 2014-12-09 07:56:18 +11:00
hiker
b764339b20 Moved cloning of animated mesh into CSkinnedMesh (to get access to 
private members). Fixed animation bug, caused by copying already
animated vertex position from LocalBuffer to Weight (so they were
then later animated again). Might need a better solution to avoid
copying mesh twice (LocalBuffer = Weight, followed by Weight = LocalBuffer).
 2014-12-08 23:39:41 +11:00
hiker
d725d97314 Fixed coding style. 2014-12-03 08:19:13 +11:00
Timothy Hamlett
263d072c98 Fix some coding conventions 
Thanks to hiker for the info
 2014-12-01 12:49:15 -06:00
Timothy Hamlett
d95f7835fd Fix some compiler warnings in Irrlicht 2014-11-30 22:29:52 -06:00
Timothy Hamlett
211e698a29 Add some strings for Windows 8 and 8.1 
And server '12 and server '12 R2
 2014-11-30 22:29:28 -06:00
Marianne Gagnon
53bc15ad50 Merge remote-tracking branch 'origin/OSXFullscreen' 2014-11-28 18:50:51 -05:00
Marianne Gagnon
70da81bf4e Fix OpenGL 3.2 core profile use in fullscreen mode on OS X 2014-11-27 18:59:51 -05:00
hiker
6e3c766749 Minor improvements to fix for #1713. 2014-11-27 15:36:56 +11:00
Marianne Gagnon
954dba0873 Other OSX fullscreen attempt 2014-11-20 18:21:18 -05:00
Marianne Gagnon
d776bee39a Try to fix OSX fullscreen OpenGL profile 2014-11-19 18:43:55 -05:00
Marianne Gagnon
5b043a2564 Add some debug logging on linux 2014-11-18 19:15:13 -05:00
Flakebi
ac5db6f28e Fix #1708 Delete missmatch for currupted pngs 2014-11-17 00:08:47 +01:00
hiker
6f980b7605 Adding more btAsserts. 2014-11-12 19:14:59 +11:00
hiker
157bc445b9 Added more asserts for #1678. 2014-11-12 13:28:33 +11:00
hiker
cbd43704ac Added more asserts. 2014-11-12 07:53:24 +11:00
deve
65ee047b3c Apply patch from upstream irrlicht which allow to compile it on windows using clang. 2014-11-10 11:33:49 +01:00
Tobias Markus
1e384ebb52 Fix mac compilation (syntax error) 2014-11-03 13:55:22 +01:00
hiker
18bcb92afc Used better variable name. 2014-11-03 21:36:54 +11:00
hiker
150941aad2 Maintain a flag that indicates if the gamepad device name is 'useful' 
(on windows we might get a dummy name, identical for all gamepads).
Only add a number to the gamepad if the device has a useless default
name.
 2014-11-03 16:37:19 +11:00
Tobias Markus
4861a52c3f Fix compilation on OSX 10.10 
Closes #1646
 2014-11-01 22:22:58 +01:00
deve
ab82e3f62a Fixed cmake warning. 
Angelscript is not separated project, but static library.
 2014-10-29 09:30:03 +01:00
Marianne Gagnon
139f20b39d Merge remote-tracking branch 'sachith/ScriptEngine' 
Conflicts:
	CMakeLists.txt
	sources.cmake
	src/io/file_manager.cpp
	src/io/file_manager.hpp
	src/modes/world.hpp
	src/tracks/track.hpp
	src/tracks/track_object_presentation.cpp
 2014-10-27 18:43:09 -04:00
hiker
d8cb6e1069 Moved #include to the top. 2014-10-25 10:32:28 +11:00
hiker
759182bb68 Used SDL's joystick name detection on windows. 2014-10-25 10:18:27 +11:00
Marianne Gagnon
c1d6c054c8 Route a few more controls rendering through the skin, to make them use OpenGL 3 2014-10-04 19:38:44 -04:00
Marianne Gagnon
11bf9d15c7 Disable source of OpenGL warnings flood in code we don't use 2014-10-01 20:23:22 -04:00
hiker
86b23f2d23 Merge remote-tracking branch 'origin/master' into soft-physics-landing 2014-10-01 11:58:40 +10:00
Marianne Gagnon
7387a51381 Disable features of irrlicht's contextual menu that we don't need and cause floods of warnings 2014-09-30 19:33:25 -04:00
hiker
11916dd187 Different implementation of soft-landing. 2014-09-30 23:13:48 +10:00
hiker
8ca7730570 Removed unnecessary source file in glew. 2014-09-30 15:01:38 +10:00
vlj
b89f066d14 Merge branch 'minlicht' 2014-09-29 03:25:04 +02:00
vlj
4705b8d1a1 Remove X/MS3D file loader 2014-09-29 02:52:06 +02:00
vlj
9a5ecc1b23 Remove ogre loader 2014-09-29 02:46:15 +02:00
vlj
3c4a22d659 Remove Half Life loader 2014-09-29 02:38:23 +02:00
vlj
b19a9bdf2f Remove 3DS Loader 2014-09-29 02:25:31 +02:00
vlj
554cb1dda0 Remove another CBurning file 2014-09-29 02:01:49 +02:00
vlj
abeda85f77 Reenable GL 3.1 support on windows 2014-09-29 01:31:59 +02:00
vlj
a303eadf3d Remove a deprecated function call 2014-09-28 01:13:38 +02:00
Marianne Gagnon
7b5ce0f9d7 Fix compilation, why this didn't work for me but works for others is a mystery 2014-09-27 19:07:29 -04:00
vlj
a9ab147ae5 Remove software renderer 2014-09-28 00:48:20 +02:00
vlj
b5372c295d Remove D3D related files 2014-09-27 19:46:49 +02:00
vlj
9cc98f57e3 Reapply patch from http://sourceforge.net/p/glew/patches/40/ 
This reverts commit dd70f09fce.
 2014-09-27 18:49:33 +02:00
vlj
669c8af73e Try to fix linux, round 2 2014-09-26 23:36:13 +02:00
vlj
ac2a40837f Try to fix linux 2014-09-26 23:28:29 +02:00
vlj
18b0c65dd6 Use core context for linux too. 2014-09-26 23:21:09 +02:00
vlj
1e5ad1060b Use core context except for legacy 2014-09-26 23:17:05 +02:00
vlj
8e67131351 Another fix 2014-09-26 23:15:56 +02:00
vlj
b79e969b11 Remove some others deprecated calls 2014-09-26 23:10:10 +02:00
vlj
3b393b8618 Set useCoreContext outside of ifdef windows 2014-09-26 23:03:44 +02:00
vlj
f41c1497cf Revert "Declare bool in CIrrDeviceLinux" 
This reverts commit 35de5d3975.
 2014-09-26 23:03:25 +02:00
vlj
35de5d3975 Declare bool in CIrrDeviceLinux 2014-09-26 23:01:45 +02:00
vlj
64a84f7e58 Fix another bunch of deprecated function calls 2014-09-26 22:39:53 +02:00
vlj
032447bf30 Additionnal work. 2014-09-26 15:42:03 +02:00
vlj
f320b36db3 Do not use some deprecated function with core ctx 2014-09-26 15:27:50 +02:00
hiker
e8aa181348 Merge remote-tracking branch 'origin/master' into include-glew 2014-09-16 11:05:35 +10:00
Vincent Lejeune
bd4602fb5d Fix context creation on linux when driver support gl 4.3 2014-09-15 23:39:48 +02:00
hiker
8029bc5880 Build a static version of glew. 2014-09-15 21:49:06 +10:00
hiker
69473b1811 Try to include glew in stk. 2014-09-15 16:33:46 +10:00
vlj
6d685a843d Drop support for GL 3.1 on windows 
Fixed pipeline will be used instead
 2014-09-13 15:45:10 +02:00
Sachith Hasaranga Seneviratne
10e2634f22 Merged master 2014-09-13 08:45:41 +05:30
deve
e6ab299f37 Fixed mingw compilation 2014-09-12 09:01:35 +02:00
Sachith Hasaranga Seneviratne
b6a9e5be9c Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-09-10 17:15:01 +05:30
vlj
fbe2896460 Use non debug gl ctx in non debug build 2014-09-09 16:57:46 +02:00
Sachith Hasaranga Seneviratne
118db58a02 Merged Master 2014-09-07 11:28:15 +05:30
Vincent Lejeune
4822b8a75e Fix travis 2014-09-07 00:44:56 +02:00
Vincent Lejeune
b9a595e666 Revert "Revert "Use pointer arithmetic to enforce matrix 16 bytes alignment"" 
This reverts commit e83bd11891.
 2014-09-07 00:44:49 +02:00
Vincent Lejeune
e83bd11891 Revert "Use pointer arithmetic to enforce matrix 16 bytes alignment" 
This reverts commit 0eeeb60685.
 2014-09-07 00:20:35 +02:00
Vincent Lejeune
cbb59fa640 Revert "Fix travis" 
This reverts commit bdb867bce2.
 2014-09-07 00:20:31 +02:00
Vincent Lejeune
bdb867bce2 Fix travis 2014-09-07 00:17:43 +02:00
Vincent Lejeune
0eeeb60685 Use pointer arithmetic to enforce matrix 16 bytes alignment 2014-09-07 00:08:47 +02:00
vlj
56459f39ab Use a matrix multiplication 2014-09-05 23:53:38 +02:00
Vincent Lejeune
d6c265daf6 Fix VS warning 2014-09-05 23:51:43 +02:00
vlj
44d50aa8d7 Fix build 2014-09-05 17:56:43 +02:00
Vincent Lejeune
6223f5205b Add an SSE optimised inverse matrix 2014-09-05 16:42:24 +02:00
deve
e57b927c96 Allow to compile STK on Windows using MinGW compiler. 
It needs vorbis dll's as additional dependencies.

TODO: add an alternative to inet_ntop function.
TODO: link wiimote library
 2014-09-03 14:08:23 +02:00
Deve
db53dd6767 xrandr: Simplify code a bit. 
Fixed some memory leaks.
 2014-08-24 17:40:40 +02:00
Deve
c2cf83bb6a xrandr: move restore resolution to separated function because it makes a mess... 2014-08-20 19:44:06 +02:00
Deve
56fa56a38f xrandr: don't restore resolution if output was disconnected during game 2014-08-20 19:44:06 +02:00
Deve
5c4c54bf20 xrandr: make sure that output_id and old_mode are declared 2014-08-20 19:44:06 +02:00
Deve
6a48010644 Fixed compilation error with disabled xrandr 2014-08-20 06:49:38 +02:00
Deve
0dc34b2c0d xrandr: few more checks 
- try to run in windowed mode if no output was found
 - close display correctly in case of no output
 - add few warnings
 2014-08-18 20:56:30 +02:00
Deve
3e3a27252a xrandr: fixed memory leak 2014-08-16 16:02:22 +02:00
Deve
a9bd12bfab xrandr: use primary output if window manager reports this information 2014-08-16 12:21:55 +02:00
Sachith Hasaranga Seneviratne
84d3802f08 Merge branch 'master' of https://github.com/supertuxkart/stk-code into se 2014-08-15 21:47:09 +05:30
Deve
d45429bf88 First destroy the window, then restore resolution. 
This may solve some possible issues with WM fullscreen.
 2014-08-15 11:34:16 +02:00
Sachith Hasaranga Seneviratne
a695c197b2 Merge master 2014-08-13 12:12:51 +05:30
Deve
15b316a9af xrandr: update width and height params when wanted resolution was not found and we get the default one. 2014-08-03 21:56:16 +02:00
Sachith Hasaranga Seneviratne
c3a774fcc9 Merged master 2014-08-01 18:40:05 +05:30
Deve
67948dfe28 xrandr: add support for rotated screens 2014-07-31 23:13:03 +02:00
Deve
73b45e71c7 xrandr: fixed issue with fullscreen window which was placed in wrong screen in some window managers. 
In some cases main screen may have other position than (0, 0) - fixed it.
 2014-07-30 21:30:43 +02:00
Deve
46f73e8ecc Some improvements for xrandr 
- choose best available refresh rate
 - if resolution doesn't exist, choose first available
 - other minor changes.

Works fine with Gnome, but I notices some issues on Openbox and Unity.
 2014-07-28 19:23:03 +02:00
Deve
992c97258f Few more checks 2014-07-27 20:00:04 +02:00
Deve
0409a84fa0 Remove debug output 2014-07-27 19:36:40 +02:00
Deve
068b88cb4b Rename some variables, free memory etc. 2014-07-27 19:32:12 +02:00
Deve
85dd8d11a9 Add experimental support for multi-monitor on linux using xrandr. 
Now you can play STK on one screen and watch TV on the second ;-)

Currently I use first (main) screen. We can detect from which screen STK was executed using xinerama.

Will be improved.
 2014-07-27 00:48:34 +02:00
Sachith Hasaranga Seneviratne
3573452519 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-07-03 07:39:09 +05:30
Deve
a56d6405dc Simplify code for checking best refresh rate on linux, which I added previously. 2014-06-25 22:22:54 +02:00
Sachith Hasaranga Seneviratne
390642cb5f Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-06-13 08:00:56 +05:30
Flakebi
e490874a90 Fix compiler warnings 2014-06-05 18:27:19 +02:00
Sachith Hasaranga Seneviratne
795a6022e5 Revert "Revert "Merge sources.cmake change"" 
This reverts commit 0290564310.
 2014-06-05 12:38:38 +05:30
Sachith Hasaranga Seneviratne
0290564310 Revert "Merge sources.cmake change" 
This reverts commit 03bff8819f, reversing
changes made to 540c7818aa.
 2014-06-05 11:46:11 +05:30
Sachith Hasaranga Seneviratne
03bff8819f Merge sources.cmake change 2014-06-05 11:30:28 +05:30
vlj
8cc1df3dd1 Update glext.h 2014-06-05 03:19:17 +02:00
Sachith Hasaranga Seneviratne
e08bbb5138 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-06-02 13:08:53 +05:30
vlj
63992a3908 Play with glTexStorage2D 
Should reduce memory movements.
 2014-06-01 02:48:03 +02:00
sachith500
cfef3e5456 Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine 2014-05-23 08:54:38 +05:30
Deve
da41a06ae4 Add fallback for such exotic window managers as "larswm" which don't support netwm. 
It's because Cand complains :)
 2014-05-22 18:39:28 +02:00
Sachith Hasaranga Seneviratne
27de7c6f3c MERGE STK into scripting branch 2014-05-19 08:27:15 +05:30
Marianne Gagnon
474bbb4373 Try to convert icon rendering to new helper function (for GL3 support) 2014-05-13 20:00:16 -04:00
Deve
0b463f5222 Allow to run xrandr instead of vidmode as an option 2014-05-12 20:08:15 +02:00
Deve
e8b4926b0b Fixed #1313. 
In some cases STK was barely playable because of very low refresh rates (25-30Hz).

This may be caused by last changes in display drivers. I remember that previously refresh rates for resolution were in order from the lowest to the greatest. Now I see it in reversed order.
Irrlicht didn't check refresh rates and always set the last available for specified resolution.

Now we use the highest available refresh rate.

Perhaps we should use xrandr library instead of vidmode. It should be much smarter and maybe would solve some multimonitor issues.
 2014-05-12 18:43:36 +02:00
Guillaume P
7a3ba812d7 Use smaller textures when HD textures option is disabled. Generate them if they are not already in the cache directory. 2014-05-02 19:16:54 +02:00
Max Teufel
4f7bc981bd Declare use of OpenGL 3.2 on OS X 2014-04-05 19:33:45 +02:00
Vincent Lejeune
e034cd31a0 Fix context creation for intel. 2014-03-31 19:29:20 +02:00
Vincent Lejeune
b9d0088ff9 Parse more context in windows build. 2014-03-26 22:13:02 +01:00
Vincent Lejeune
efa7316fc5 Definitively fix stencil bug thx to graphitemaster from irc 2014-03-22 19:19:59 +01:00
Vincent Lejeune
ae3cf30070 Add a function to query supported glsl ver 2014-03-22 18:36:20 +01:00
auriamg
37ee2d73b3 Merge pull request #1254 from nathan-osman/bluetooth-check 
Check for libbluetooth on Unix platforms.
 2014-03-18 19:37:00 -04:00
Nathan Osman
6b8f12b1b5 Check for libbluetooth on Unix platforms. 2014-03-17 19:02:53 -07:00
Sachith Hasaranga Seneviratne
7e4cf23ee3 Removed unnecessary projectfiles 2014-03-16 16:36:18 +05:30
Sachith Hasaranga Seneviratne
df67597ec7 added AS library 2014-03-16 14:44:05 +05:30
KroArtem
ccd6019f48 Merge remote-tracking branch 'upstream/master' 2014-03-15 01:15:48 +04:00
Vincent Lejeune
5e03e461bc Revert to compatibility context for linux build. 2014-03-14 17:04:44 +01:00
Vincent Lejeune
cf2035ca0a Batch draw calls 2014-03-14 16:51:05 +01:00
hiker
2916e3e351 Removed typedef (which is a work around for certain mesa versions) 
from windows and osx.
 2014-02-26 12:06:59 +11:00
hiker
244d00280c Applied patch from jpirie for fixing mesa 10 compilation problems. 2014-02-26 11:13:03 +11:00
KroArtem
d2179e960d #1156, fix quotes in CMakeLists files, see http://cmake.org/Wiki/CMake/Language_Syntax#Quoting for more info 2014-02-21 23:09:10 +04:00
hiker
2595d31eba Implemented crude work around for drivers that do not support 
opengl 3.3.
 2014-02-17 16:52:40 +11:00
Vincent Lejeune
0243546e4d Use an openGL 3.3 compatibility context when available. 2014-02-12 22:16:10 +01:00
Vincent Lejeune
fbc47dd6ca Do not use GL_PACK_INVERT_MESA when screenshooting 
Oddly enough it is reported as FeatureAvailable in Windows.
This fixes the screenshot bug.
 2014-02-02 02:56:10 +01:00
Vincent Lejeune
afd5d1917c Fix Opengl pre 3.0 context creation. 2014-02-02 01:03:01 +01:00
Vincent Lejeune
19fd67995d Use system's glext.h/glxext.h on linux. 2014-02-02 00:47:27 +01:00
Vincent Lejeune
098303dced GPUParticles: Use transparent_effect pass 2014-01-28 21:40:53 +01:00
Vincent Lejeune
f50e6f817d Use another normal encoding method from a crytek slide. 2014-01-27 23:29:46 +01:00
Vincent Lejeune
d642bc1489 Lightprepass: Only store normals in rtt 
Use a more economical rtt format.
 2014-01-27 21:47:25 +01:00
Vincent Lejeune
5694d8b41a Expose depthbuffer texture 2014-01-27 20:21:41 +01:00
Vincent Lejeune
c77ffb1882 STKBillboard: Create new SceneNode wrapper. 2014-01-27 17:33:08 +01:00
hiker
41a9b14859 Fixed missing collisions in mansionl (caused by negative default mass 
for objects). Added assert to bullet to catch this kind of problem early.
 2014-01-26 23:36:44 +11:00
Vincent Lejeune
559e0a96ca Remove wrong glHint 
Spotted by ARB_DEBUG_OUTPUT
 2014-01-24 20:27:18 +01:00
Vincent Lejeune
176e46e5a9 STKAnimatedMesh: Uses custom render. 
But not direct gl draw call yet.
 2014-01-23 21:35:56 +01:00
Vincent Lejeune
38fc539520 Enable debug 2014-01-22 18:06:39 +01:00
Vincent Lejeune
271a26eaf0 OGL32CTX: Always return true when a feature is queried 2014-01-21 22:25:19 +01:00
Vincent Lejeune
f880d13175 Fix FBO related queries with OGL3.2+ 2014-01-21 22:25:18 +01:00
Deve
dcfd55502c Added experimental change which allow to use alt-tab and other shortcuts on linux when game is run in fullscreen mode. 
This method is used in many other projects and should work good. Currently modern games
use window manager fullscreen rather than grab whole mouse and keyboard.

Tested on Gnome, Unity and Openbox and it works well. Though it should be tested also on
other desktop environments.

Also performance impact should be tested.

I added simple workaround for Gnome, which sometimes creates fullscreen window smaller
than display.

If some problems will occur, feel free to revert it.
 2014-01-19 21:31:54 +01:00