minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity
4,384 Commits 6 Branches 63 Tags 343 MiB
Commit Graph

36 Commits

Author SHA1 Message Date
kwolekr 8e08e92eb4 Cherry-pick most commits since 15c0376 
Commits not directly related to network changes were cherry-picked
on a best-effort basis, as some cause difficult merge conflicts.

Commits skipped over:
0d1eedcccc
aa474e4501
82482ecd9d
b214cde5b4
2066655aae
7e088fdfe3
40bf1d7b5f
1b2f64473e
7e56637ed0
64ff966bae
51057a56f5
009149a073
cf4045ff0f
e357577cb2
49f84b76bc
b019221c30
7880ff74b6
146f77fdb7
a704c04f00

Commits with conflicts:
038d3a31df
e9eda2b0d0
708337dfc2 ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp
36e8ba9ce2 ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set
3b6480c5b0 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f
5a5854ea9d
c09d026f05
3c91ad8fc2
 2015-03-07 16:25:50 -05:00
kwolekr 32352e90da Revert all commits up to (including) a704c04f 2015-03-07 16:16:25 -05:00
Markus Koschany 47d9b4d9aa Improve FindIrrlicht.cmake module 
Linux distributions prefer to link against a shared version of the Irrlicht
engine instead of using embedded code copies of the same. Search for this
shared version first and use that but fall back to the static version if it
does not exist.

This also fixes https://github.com/minetest/minetest/issues/2163
 2015-02-21 18:21:10 +01:00
ShadowNinja a3db918f78 Remove included SQLite3 2015-01-08 16:34:42 -05:00
Martin Doege c410e9182d OS X compatibility fixes 2014-06-29 17:27:33 +02:00
sapier 533785ec9a Add CURL_DLL search to show up CURL_DLL in cmake gui and don't silently ignore missing CURL_DLL 2013-11-17 02:28:39 -05:00
Kahrl 8bc7ea61b9 Show git hash in version string at top left corner of window 2013-09-28 21:30:17 +02:00
kwolekr d308352dbd Always use builtin JThread library 2013-09-15 23:00:01 -04:00
proller 10c03e1a9d build with ogles2 driver 2013-03-16 22:37:50 -04:00
proller dd8593f2d6 fix link if system json lib exists 2013-03-05 23:54:07 -05:00
proller ee07c3f7cf new auto masterserver 2013-02-22 02:04:53 +04:00
Ilya Zhuravlev c4172934e5 Prefer shared cURL library instead of the static one. 2012-12-21 20:35:04 +04:00
sfan5 05b58501f2 Tweak CMake files for cURL 2012-12-18 21:52:56 +04:00
Ilya Zhuravlev 3578e1d4a7 Added ability to fetch media from remote server (using cURL library) 2012-12-16 15:20:18 +04:00
Perttu Ahola 3a9753b85f Add OGG_INCLUDE_DIR to SOUND_INCLUDE_DIRS 2012-03-25 22:07:34 +03:00
Perttu Ahola c301e3c82a celeron55's sound system initial framework 2012-03-24 04:24:23 +02:00
Perttu Ahola 97b693052c Flatten share/ and user/ in the source and for the RUN_IN_PLACE build 2012-03-20 00:08:00 +02:00
q66 e81ff1e833 Gettext fix for *BSD - require special linkage as glibc is not used 2011-08-11 11:19:05 +02:00
Giuseppe Bilotta cce210f676 Locale dir should be parallel to global data dir 2011-07-24 19:23:03 +02:00
Giuseppe Bilotta 47381bde3b Bring po update out of cmake again 
This solves two issues at once:
* CMake would delete po files during ‘make clean’ because it thought
  they were autogenerated and not just managed
* the only gettext tools readily available in Windows are so old they
  don't support options like --package-name

The change also moves minetest.pot down one level, so we don't need to
special case ‘en’ anymore.

The downside is of course that you need some sane POSIX shell to update
the po files.
 2011-07-24 16:52:59 +02:00
Constantin Wenger f6d9bcc9bb updated cmakerules to autodetect if gettext can be used 
fixed error if gettext is disabled
 2011-07-23 22:36:11 +02:00
Giuseppe Bilotta d78e5e7329 updatepo cmake rule 
Get rid of the system-specific updatelocales.sh and introduce an
updatepo cmake rule. po files are also updated before creating the mo
files, and we now keep the .pot file (in the po/en directory). To
stabilize the po file creation, file contents are sorted by source
filename.

Update po files in the process.
 2011-07-22 12:40:29 +02:00
Giuseppe Bilotta d386f02893 Refactor mo creation/installation 2011-07-22 09:36:17 +02:00
Constantin Wenger fc95d00b2f fixed not finding dll for gettext in MSVC 2011-07-21 16:21:01 +02:00
Giuseppe Bilotta 9fa4b72a47 Find correct library for MSVC vs MingW in Winows 2011-07-21 14:50:15 +02:00
Constantin Wenger 2a6c0fc17f updated some path because the dlls are mostly under bin not lib 
added explanation why libintl must not belinked under some oses
 2011-07-21 13:24:37 +02:00
Giuseppe Bilotta 1340da7b54 Refactor and clean up gettext management 2011-07-21 12:33:29 +02:00
Giuseppe Bilotta cd45ae3d0f Use system sqlite3/jthread libs if available 2011-07-20 17:59:48 +02:00
Perttu Ahola 9de8e59c20 Added libIrrlicht.dll.a to searched library names for non-MSVC windows 2011-05-17 20:11:12 +03:00
Perttu Ahola e06751aea0 forgot some test code in... 2011-02-16 11:06:52 +02:00
Perttu Ahola dcda479434 Hopefully fixed some of the errors in cmake's finding of irrlicht 2011-02-16 09:43:04 +02:00
Perttu Ahola a0e8f3afd3 might work good on cmake+msvc now 2011-02-15 20:53:29 +02:00
Perttu Ahola 56320f7e8d Hopefully fixed the problem of IRRLICHT_SOURCE_DIR being not considered when a local version of irrlicht is found. 2011-02-01 10:45:55 +02:00
Perttu Ahola 359e575ba3 Mainly small build system fixes 2011-01-09 00:49:32 +02:00
Perttu Ahola 9fbb0889a7 CMake stuff works now on linux and windows... and should be possible to make to work on OS X. 2011-01-08 17:34:25 +02:00
Perttu Ahola d825ed572f CMake working on Linux (not on windows) 
--HG--
rename : Makefile => Makefile.bak
 2011-01-08 03:10:20 +02:00