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

307 Commits

Author SHA1 Message Date
hiker
39e218b2dc Try to fix server-only build ... now non-server build is broken :( 2018-07-23 09:28:12 +10:00
Deve
c76f48c701 Require enet >= 1.3.4. 
It's needed for enet_peer_ping_interval()
 2018-07-09 22:33:14 +02:00
Benau
02fea1ee43 Disable sound code in server only build and rename the flag 2018-07-07 09:48:43 +08:00
Benau
4099afb25f Remove image related code and library dependencies in server only build 2018-07-07 09:27:39 +08:00
Benau
a60b2d3761 Remove freetype in server only build 2018-07-07 02:06:49 +08:00
Benau
00db1f8405 Turn wii cmake flag into a dependent option 2018-07-07 01:58:19 +08:00
Benau
9c3aae554e Remove fribidi and tinygettext in server only build 2018-07-07 01:22:26 +08:00
QwertyChouskie
c4f0a71ef0 Add macOS to travis builds, fix server-only builds on macOS, msc. fixes (#3339) 
* Use thread number from Travis docs
The other number is probably incorrect.
See https://github.com/travis-ci/travis-ci/issues/4696

* Add macOS to travis builds

* Remove unnecessary libraries
Not sure why these were added in the first place.
First commit that added them: 6aecb42e42

* Fix server-only build on macOS
 2018-07-03 19:37:57 -04:00
Marianne Gagnon
cb8f519bd9 Change OSX build system to be homebrew-based 2018-06-05 19:56:15 -04:00
Benau
7e5263168e Add minimum required OpenSSL version 2018-06-03 14:44:53 +08:00
Benau
b43a5e4d18 Add AES encryption and validation for wan player 2018-06-02 12:28:29 +08:00
Deve
12fc3fd063 Enable gles for arm architecture on linux. 
It should be more useful than opengl renderer.
 2018-05-25 21:16:22 +02:00
Deve
056ee641d1 Allow to use openglrecorder with gles 2018-05-24 22:07:33 +02:00
Deve
765d4019b7 Allow to use texture compression with GLES when extension is available 2018-05-22 22:31:38 +02:00
hiker
acdba401a9
Merge pull request #3090 from qwertychouskie/simplify-version-number-change 
Reduce number of places version number needs to be changed on release
 2018-04-18 09:44:13 +10:00
Deve
8771c77689 Allow to use dependencies for vs and mingw without changing the names every time. 
Now there are:
- dependencies-vs
- dependencies-vs-64bit
- dependencies-mingw
- dependencies-mingw64

And if it's not found, then fallback to:
- dependencies
- dependencies-64bit

So that if you use only one compiler, then you can just still use "dependencies" or "dependencies-64bit".

And I didn't restrict it to WIN32 only, because in theory it should be possible to put there openglrecorder for linux build.
 2018-02-01 21:36:28 +01:00
Deve
fc15a33a39 Add an option to use system enet. 
Atm. use it only on linux, because there is no need to spam with cmake warnings on other platforms.
Also fallback to built-in enet if system enet is not found.
 2018-01-30 22:57:40 +01:00
Igor Gnatenko
810df68f9c Unbundle ENet 
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
 2018-01-30 22:29:38 +01:00
Deve
1979298b06 Use pkgconfig only on linux 2018-01-28 21:39:21 +01:00
Deve
0003b39d31 Install appdata file in correct directory. 
As reported on Debian:
https://lintian.debian.org/tags/appstream-metadata-in-legacy-location.html
 2018-01-26 22:33:37 +01:00
Benau
59045cd064 Merge remote-tracking branch 'origin/master' 2018-01-13 15:44:57 +08:00
Deve
24772eb9d7 GLEW_ERROR_NO_GLX_DISPLAY needs glew 2.1 2018-01-13 00:41:53 +01:00
Deve
226c2bbed5
Merge branch 'master' into unbundle-glew2 2018-01-13 00:13:45 +01:00
Qwerty Chouskie
6aefa2542b Reduce number of places version number needs to be changed on release 2018-01-11 08:56:23 -08:00
Benau
26a481e478 Allow using system libsquish 2018-01-11 14:40:33 +08:00
Deve
62fe84ecc7 Fixed server-only build 2018-01-09 20:35:33 +01:00
Deve
88897cae1d Enable wayland for testing. 
It's not 100% ready yet, but some testing won't hurt.

It's possible to switch between wayland/x11 using

    export IRR_DEVICE_TYPE=x11

or

    export IRR_DEVICE_TYPE=wayland

so that x11 device can be forced in wayland session.
 2018-01-07 21:23:21 +01:00
Deve
92f7caf696 Fixed cygwin warning 2018-01-07 21:15:08 +01:00
Benau
7797115867 Add SP for correct normal and easier shader system 2017-12-25 14:00:10 +08:00
Rémi Verschelde
e3264d1de3 CMake: Add option to use system GLEW 2.0+ 
The option is enabled by default, but the system version will only be used
if found and newer than 2.0.0 (to ensure that https://sourceforge.net/p/glew/patches/40/
is fixed). When missing, we silently fallback to the vendored source code,
so there is no change for e.g. Windows compilation.
 2017-11-22 11:54:38 +01:00
Deve
a67be44422 Allow to compile STKRelease build with debug symbols. 
It may be useful for decoding backtraces from our linux static package.
 2017-11-12 23:59:12 +01:00
Deve
08be02af8f Fixed 64-bit dependencies. 
Thanks to qwertychouskie for finding it.
 2017-11-05 21:54:43 +01:00
auria.mg
204e715637 Fix build 2017-10-17 20:08:15 -04:00
Deve
77161cc583 Avoid compilation errors for GLES 2017-10-17 23:34:19 +02:00
Benau
88e15147b8 Merge remote-tracking branch 'origin/win-64bit' 2017-10-17 00:55:22 +08:00
Deve
126991118d Now only irrlicht depends on x11 2017-09-27 21:45:08 +02:00
Deve
71334bac5b Move xrandr to irrlicht cmake file and also fixed indentations 2017-09-18 22:14:43 +02:00
Deve
8a3cdb4fef Don't link with useless libs. 
Also remove custom script for xrandr.
 2017-09-05 00:19:55 +02:00
hiker
f3d56b37df Merge branch 'master' into win-64bit 2017-08-16 17:29:57 +10:00
Deve
a89b2f5df2 Minor tweak for linux icon. 
On freedesktop specs they suggest to use 48x48 icon.
 2017-07-30 12:56:25 +02:00
Deve
20850c9811 Remove unused cmake option 2017-07-18 00:11:09 +02:00
Deve
1fd6a8aa86 Make sure that we are not using files from our zlib/libpng when STK is compiled with shared libraries. 
It's possible that STK was using these files for compilation when cmake was run from main directory. In this case compiled files are stored in stk-code/lib, so that CMAKE_CURRENT_BINARY_DIR is stk-code/lib/irrlicht rather than stk-code/build/lib/irrlicht and we include whole lib/libpng rather than non-existing directory.
 2017-07-10 21:14:28 +02:00
QwertyChouskie
76257f68c5 Avoid error when libopenglrecorder not found (#2871) 
* Avoid error when libopenglrecorder not found

* Full fix
 2017-06-27 19:56:53 -04:00
QwertyChouskie
a2d831c1ea Handle missing libopenglrecorder gracefully (#2867) 
* Handle missing libopenglrecorder gracefully

* Tweak readme

* Change version to "git"

* fail when version !== git

* oops

gota do my research :/
 2017-06-22 20:27:29 -04:00
Deve
15ce5b4ebf Fixed windows compilation 2017-06-05 21:54:44 +02:00
Deve
e02a8f4448 Allow to make single build with both x11 and wayland device 2017-05-06 21:53:32 +02:00
Deve
e27df23415 Draw mouse cursor 2017-05-04 21:06:40 +02:00
Deve
035c33f960 Merge branch 'master' into wayland 2017-04-22 21:11:10 +02:00
Benau
4de0ca83aa Move capture right before glfencesync if possible 2017-04-13 13:59:36 +08:00
Benau
b1f9ce2dbd Remove libwebm and recorder code 2017-04-12 11:51:59 +08:00
Deve
91e7c51ae7 Make sure we don't link with GLU 2017-04-08 12:31:09 +02:00
hiker
5e5d86bc6d On windows look for the 64-bit dependency package in dependencies-64bit. 
This allows installation compiling 32 and 64-bit windows versions from
the same repo without switching dependencies.
 2017-04-06 23:59:01 +10:00
deve
70d7fdd197 Fixed mingw compilation. 
It should be possible to simplify it with something like
find_library(CURL_LIBRARIES NAMES libcurl libcurldll PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
so you can look if it works on Visual Studio.

And as far as I see pkgconfig is used only on unix. Btw. I'm also not sure if it should be if(UNIX AND NOT APPLE) ?
 2017-04-06 11:39:53 +02:00
Benau
1a072d609f Add vp9 encode support, though it encodes very slowly 2017-04-05 01:10:44 +08:00
Benau
b7c709c709 Allow muxing mjpeg with vorbis audio with mkv 
Not sure if playable in with all players
 2017-04-04 16:12:09 +08:00
Benau
b0d0a0739e Add CMake flag to enable / disable recorder 2017-04-04 14:23:04 +08:00
Benau
2d4bfa9fb0 Use shared library for vpx on msvc 2017-04-03 14:32:07 +08:00
Benau
19f88e3939 Allow stk to be built with 64bit msvc 
Please use lastest adv_recording_64 branch in repo
 2017-04-03 01:33:13 +08:00
Benau
8a5e28251e Fix mingw build 2017-04-02 14:55:55 +08:00
Benau
8a8b388170 Allow pulseaudio to be loaded dynamically 2017-04-01 15:21:58 +08:00
Benau
cacbdbd668 Allow recording audio in windows using wasapi 2017-04-01 00:52:38 +08:00
Benau
9039324145 Allow muxing into webm using libwebm 2017-03-30 13:30:21 +08:00
Benau
be103dd666 Implement real time vp8 encoding 2017-03-25 16:30:41 +08:00
Benau
a68c085e95 Use pulseaudio + vorbisenc for sound recording (linux for now) 2017-03-24 21:51:17 +08:00
deve
4df773d283 Some fixes in cmake. 
Note that you need updated dependencies on windows.
 2017-03-22 10:24:33 +01:00
Benau
196b2b722c Fix mac build 2017-03-22 07:42:48 +08:00
Benau
547d28a9e4 Use jpeg-turbo library in msvc 2017-03-21 09:17:39 +08:00
Benau
feb66664f4 Don't build graphics utils if server only or gles 2017-03-16 11:29:16 +08:00
Benau
ce76abf4fe Merge remote-tracking branch 'origin/master' into hq_mipmap_generator 2017-03-16 11:23:27 +08:00
Benau
cc2c2c6f33 Remove the usage of openmp in stk, see #2810 2017-03-16 08:42:53 +08:00
Benau
76aa38e5b4 Try HQMipmapGenerator 2017-03-13 10:28:43 +08:00
hiker
019e61ec66 iFixed pi compilation. 2016-11-16 00:19:09 +11:00
hiker
ae36208e29 Merge remote-tracking branch 'origin/master' into new-pi 2016-11-15 12:38:21 +11:00
hiker
feae91042a Explicitly disable X11 compilation for windows. No idea why it is 
defined in CGUIEditbox now, but it somehow is ;(
 2016-11-14 18:25:00 +11:00
hiker
61a3d10e10 More Compile SERVER_ONLY, still not fully working. 2016-11-12 00:09:39 +11:00
hiker
8d9bb9c30f Cherry picked commits from old pi branch (which was based on dumb client). 2016-11-11 17:21:59 +11:00
Deve
08202f2fa8 Remove USE_XRANDR flag from cmake. 
Our vidmode code is old, has some bugs (eg. resolution is not restored properly in some cases), doesn't have multi monitor support and IMO shouldn't be used in current state.

If someone really wants to use it, the flags can be set directly in IrrCompileConfig.h.
 2016-08-12 23:39:12 +02:00
Deve
0f7976e5f8 Merge branch 'master' into gles 2016-07-11 23:23:02 +02:00
Deve
3728adf1c5 The gles renderer is currently supported only on linux 2016-07-09 03:03:15 +02:00
Benau
aa0edb65dc Use cmake to find libbfd 2016-06-24 08:59:39 +08: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
Benau
6222ce650f Add optional linux crash reporting with backtrace (using libbfd) 
Notice:

To get backtrace too for leak check, you need to
define GET_STACK_TRACE in leak_check.cpp, but will slow down STK
 2016-06-23 16:18:17 +08:00
Deve
56c6062a81 One more tweak..... 2016-06-04 00:10:56 +02:00
hiker
0f79dcc238 Fixed FreeBSD builds (freebsd installs Freetype etc in /usr/local/lib, 
but does not search in that directory for libraries).
 2016-05-31 13:43:07 +10:00
hiker
9299eca758 Fixed compilation after moving the windows installer to a different directory. 2016-04-22 07:54:40 +10:00
Marianne Gagnon
33defa44b7 Merge most modifications by egirsova to build 64-bits on OS X 2016-03-21 20:16:59 -04:00
Benau
61113bbef9 Silence warning as auria suggested 2016-01-18 09:52:34 +08:00
deve
92248399d0 Update project version :P 2015-12-03 14:48:03 +01:00
deve
cbc8d84fc4 Allow to enable wiiuse build for mingw in cmake. 
Still disabled by default because it only works with mingw-w64. It won't work with other compiler versions due to some inconsistencies in header files. But at least it's possible now to enable it without modifying cmake file.
 2015-12-03 14:47:08 +01:00
Benau
b9b2b538fa Clean up freetype code 
1. Remove all ifdef of freetype

2. Require freetype in CMake

3. Clean up declaration

4. Add leak check

5. Make script language display better in title
 2015-10-30 18:08:02 +08:00
Deve
c81243fc1a Merge branch 'master' into wayland 2015-10-28 22:43:02 +01:00
Deve
af68dd9046 Fixed compilation 2015-10-28 22:28:12 +01:00
Marianne Gagnon
dd975de74f Remove the font tool, which is no longer necessary 2015-10-18 20:10:31 -04:00
Marianne Gagnon
cee6d9d611 Merge branch 'master' into freetype_lazyloadchar 2015-10-17 21:34:19 -04:00
Deve
91db8620f8 Some work on support 64-bit windows compilation using mingw 2015-10-13 01:05:41 +02:00
Benau
3a5ec83ae9 Basic render of text using freetype 
This is a testing version of stk using freetype

It enable better arabic font display with less blurred glyph to all fonts thanks to hinting provide by freetype.

TODO: billboard text
 2015-10-04 11:59:44 +08:00
Deve
bfa92bc339 Don't complain about angelscript library not found in system 2015-09-07 18:14:57 +02:00
Deve
bd49fa4fd8 Move adding definition to other definitions 2015-09-06 21:00:50 +02:00
Deve
c124f5f371 Remove unused code from cmake. 
We are using now two different repositories (svn and git), and still creating the package without attached libraries doesn't have a sense.
 2015-09-06 20:58:12 +02:00
Deve
4498870cb8 Merge pull request #2271 from konstin/network_cmake 
Allow enabeling Network Multiplayer through CMake flags
 2015-09-06 20:33:10 +02:00