Commit Graph

142 Commits (master)

Author SHA1 Message Date
Maksim Gamarnik 3fdca00066 fix license 2016-02-11 23:23:46 +02:00
Pavel Puchkin 8975457604 Implement OSX Travis builds 2016-02-04 13:22:32 +01:00
sfan5 dea634c634 Update URLs for buildbot & travis
The freehoster these files were hosted on is shutting down soon-ish, they're now hosted on my VPS.
2015-12-26 01:19:27 +01:00
est31 bcd0aceba5 Make travis work again
Now we do sudo apt-get update to download package sources.
This fixes travis build with the new GCE based infrastructure.

Closes #3427.
Closes #3426.
2015-12-05 18:01:01 +01:00
est31 9de2570cdb Re-add "file" type for --add-location for xgettext call
Passing line numbers in the comments is bad.

References:

* Commit 94961b3364f76d5861913af321e9be6200d080b3
* Previous commit
2015-10-17 22:20:47 +02:00
PilzAdam 65b81bc6d6 New settings tab contain all possible settings
Settings are automatically parsed from builtin/settingtypes.txt
The edit dialog automatically adjust based on the type of setting
2015-10-17 22:06:29 +02:00
est31 5f2b25c7ad Don't add line number to comment when running updatepo.sh
Otherwise, this updates all .po files for all line numbers that changed
since the last time updatepo.sh was run. We still add the filename, but
this information shouldn't change too often.

xgettext beginning with 0.18.4 supports this feature.
2015-09-02 01:34:37 +02:00
est31 aaf83875db Add fgettext_ne as keyword to updatepo.sh 2015-08-25 00:46:58 +02:00
Rui c611b4ef88 Update toolchain_mingw64.cmake 2015-07-18 09:02:55 +02:00
est31 17ba159bbf Add LibGMP
Uses system provided libgmp if found, if not it falls back to mini-gmp.
2015-05-11 17:48:33 +02:00
Megaf 0d0d72a84e Replaced libjpeg dependency on apt-get, it should be libjpeg-dev instead of libjpeg8-dev.
On Debian 8...
```
Package libjpeg8-dev is not available, but is referred to by another package.
This may mean that the package is missing, has been obsoleted, or
is only available from another source
However the following packages replace it:
  libjpeg62-turbo-dev
```
Using libjpeg-dev should make the OS select the most appropriate lib to be installed.
These are the packages available on Debian 8.
```
libjpeg-dev - Development files for the JPEG library [dummy package]
libjpeg-turbo-progs - Programs for manipulating JPEG files
libjpeg-turbo-progs-dbg - Programs for manipulating JPEG files (debugging symbols)
libjpeg62-turbo - libjpeg-turbo JPEG runtime library
libjpeg62-turbo-dbg - Debugging symbols for the libjpeg-turbo JPEG library
libjpeg62-turbo-dev - Development files for the libjpeg-turbo JPEG library
libturbojpeg1 - TurboJPEG runtime library - SIMD optimized
libturbojpeg1-dbg - TurboJPEG runtime library - SIMD optimized (debugging symbols)
libturbojpeg1-dev - Development files for the TurboJPEG library

```
This seems to work on all current Debian versions, Wheezy, Jessie and Sid.
https://packages.debian.org/wheezy/libjpeg-dev
https://packages.debian.org/jessie/libjpeg-dev
https://packages.debian.org/stretch/libjpeg-dev

Im not sure if Ubuntu has this dummy package.

http://packages.ubuntu.com/search?keywords=libjpeg-dev

Perhaps this should be further discussed.

libjpeg8-dev -> libjpeg-dev
2015-05-11 20:56:11 +10:00
ShadowNinja c86bb37674 Make Git version detection use VERSION_STRING instead of tags
This fixes the problem where 0.4.12-dev versions were erroneously shown as
0.4.11-dev because the tag was added on a separate branch.  It also fixes a
similar issue when builders didn't fetch new tags when updating.

This also removes the number-of-commits-since-tag field, since it's
incompatible with this.  Said field doesn't seem to be useful anyway if you
have the commit hash.
2015-05-05 17:13:05 +02:00
ShadowNinja 2de60ae349 Clean up and tweak build system
* Combine client and server man pages.
  * Update unit test options and available databases in man page.
  * Add `--worldname` to man page.
  * Fix a bunch of places where `"Minetest"` was used directly instead of `PROJECT_NAME`.
  * Disable server build by default on all operating systems.
  * Make `ENABLE_FREETYPE` not fail if FreeType isn't found.
  * Enable LevelDB, Redis, and FreeType detection by default.
  * Remove the `VERSION_PATCH_ORIG` hack.
  * Add option to search for and use system JSONCPP.
  * Remove broken LuaJIT version detection.
  * Rename `DISABLE_LUAJIT` to `ENABLE_LUAJIT`.
  * Rename `minetest_*` variables in `version.{h,cpp}` to `g_*`.
  * Clean up style of CMake files.
2015-03-27 15:00:48 -04:00
Loic Blot 35af6ccbba Rename --do-unittests to --run-unittests as @Zeno- and @sfan5 requested 2015-02-24 08:56:52 +01:00
Loic Blot e329b0c079 Unit tests must be done at integration process.
* Remove --enable-unittests and --disable-unittests and add --do-unittests function
* --do-unittests function will exit 0 on success.
* minetest and minetestserver binaries are launched with --do-unittests in travis build.
2015-02-21 11:04:19 +01:00
sfan5 6782943673 Add LevelDB and redis to Travis Linux builds 2015-02-16 11:55:12 +01:00
ShadowNinja 0a2e53077b Reduce gettext wide/narrow and string/char* conversions 2015-02-05 03:24:22 -05:00
ShadowNinja d6134f9808 Add wstrgettext to list of translation update keywords 2015-02-05 03:23:53 -05:00
sfan5 0511bd48a0 Add SQLite3 libraries to buildbot 2015-01-08 16:34:42 -05:00
sfan5 77f3cd1731 Fix buildbot (was broken by 04a1a446cf845a0db80d39fd0e42771aa07e4492) 2015-01-06 19:43:21 +01:00
Kahrl 360b2d5b8a Add util/bump_version.sh 2014-12-30 00:03:10 +10:00
sfan5 b092142bf4 Update MinGW toolchain downloads used by travis 2014-12-23 17:20:26 +01:00
sfan5 a5f1bb300a Build for win32 & win64 on Travis too 2014-12-06 19:56:31 +01:00
sfan5 a2eb66716b Update the cURL the buildbot uses to 7.38.0 2014-10-19 16:09:36 +02:00
Diego Martínez 9795f62d21 updatepo.sh: Find all files 2014-09-30 13:25:26 -04:00
sfan5 1131f436c1 Add ZLIBWAPI_DLL and LEVELDB_DLL CMake options Remove legacy MINGWM10_DLL CMake option Update 32-bit buildbot (OpenAL updated, zlib updated) Change build directory for buildbots to '_build' to prevent removal of Android build files Use -win64 suffix for 64-bit Windows builds Fixes #1476 2014-07-29 20:03:18 +02:00
ShadowNinja 613a7df3ac Move master server to seperate repository 2014-06-30 17:27:24 -04:00
proller 36518f32aa Masterserver: Fix compiling servers.jst 2014-06-30 20:47:50 +04:00
proller 3f19f27fb4 Masterserver: Fix undefined players 2014-06-28 22:10:55 +04:00
sfan5 cdf32e20b8 Update buildbot scripts and add 64-bit buildbot 2014-06-18 16:40:24 +02:00
proller f07b235e63 Fix null string escape 2014-02-24 20:41:04 +04:00
proller 3116d1d531 Send long announce as POST, show OS in useragent
Add lag reporting to masterserver (average dtime)
StyledWriter  -> FastWriter in masterserver announce
2014-01-07 02:50:45 +04:00
proller a8377a8a83 Rename names -> can_see_far_names in announce 2013-12-03 20:14:06 +04:00
proller 6a46180075 Remove link to #, add unlimited_player_transfer_distance to announce 2013-12-03 19:48:43 +04:00
proller 0fe0d4b724 Masterserver uptime fix 2013-11-05 21:18:37 +04:00
Ilya Zhuravlev 09ce114c2d Fix masterserver README.md 2013-11-04 21:54:25 +04:00
proller 0ed0e86805 Masterserver fixes 2013-11-04 13:02:42 +04:00
proller 7062ed9bbb Masterserver show privs and js autoload 2013-11-04 04:56:39 +04:00
ShadowNinja f6cd8b30bb Add a "More..." link when the serverlist is filtered 2013-11-03 18:21:53 -05:00
ShadowNinja bf0035ed4d Only show servers with at least master.min_clients clients 2013-11-03 18:02:07 -05:00
ShadowNinja c9c80177a0 Use a doT.js template for the serverlist 2013-11-03 17:47:16 -05:00
proller 27f4275ff0 Masterserver totals fix 2013-10-18 23:57:22 +04:00
proller 670ac4ac88 Masterserver update 2013-10-18 01:32:49 +04:00
sapier 281dc6a502 Add translation for main menu
Add engine.gettext() and remove gettext() calls in guiFormspecMenu.cpp
2013-08-17 16:01:43 +02:00
Sfan5 42c9f2cc7e Fix stored XSS vulnerability in the serverlist 2013-08-07 09:24:32 +02:00
proller 437d785409 Master server script improvement 2013-08-05 01:50:34 +04:00
proller c4f2790630 Masterserver bugfix 2013-08-04 23:46:03 +04:00
proller e9fc09892b More info in serverlist 2013-08-03 03:02:59 +04:00
proller 3ce09f147d Masterserver mods fix 2013-07-13 04:11:26 +04:00
proller 47c9b4b0b2 Better masterserver html 2013-07-13 01:41:49 +04:00
proller cb3e7ca3b7 Masterserver mods announse, ipv6, better curl errors 2013-07-13 00:19:05 +04:00
RealBadAngel e0d877e097 Add texture bumpmapping feature. 2013-07-04 02:36:32 +02:00
PilzAdam b019642e11 Remove common from CMakeLists.txt, README.txt, lua-api.txt and buildwin.sh 2013-05-18 16:13:32 +02:00
proller 282989d2b2 Fix masterserver javascript: adjustable output id 2013-04-11 20:20:11 +04:00
proller c1be39bd9c Fix backward compatibility for server uptime in master server web page 2013-03-30 02:36:06 +04:00
proller 4d94e25e23 Masterserver: report gameid, uptime, cosmetic fixes on server web page 2013-03-30 02:03:24 +04:00
Perttu Ahola 80f3777b1d Update buildwin32.sh to get minetest/common 2013-03-21 19:45:20 +02:00
PilzAdam 0acf1a5573 Update buildbot 2013-02-24 18:52:44 +01:00
PilzAdam 269f01224b Change Minetest-c55 to Minetest 2013-02-24 18:49:03 +01:00
proller a06297e4e7 new auto masterserver 2013-02-22 02:04:53 +04:00
sfan5 bfa166236d Tweak buildbot
* CURL support
* only download packages if they don't exist
* fixed download links (libvorbis and libogg)
* manual downloading if automatic downloading fails (only minetest and minetest_game)
* mingwm10.dll and openal_stripped.zip are downloaded automatically
2013-01-23 20:42:46 +02:00
DannyDark 9a7ef4fd16 Fixed two typos in wireshark lua file. 2012-12-23 02:17:34 +04:00
Perttu Ahola 223b04e396 Update minetestmapper.py to support ver. 24 and 25 2012-07-24 15:17:00 +03:00
Perttu Ahola e4227bb5ae Remove util/old/genmap.py, because it is uselessly old 2012-07-19 21:17:31 +03:00
Perttu Ahola 045c303435 Move genmap.py and pnoise.py to old/ 2012-06-08 15:50:27 +03:00
Perttu Ahola 79a8661d42 Update minetestmapper.py to support the current map format (and previous ones) 2012-06-08 15:17:03 +03:00
Perttu Ahola 6a25b89808 Fix buildbot 2012-04-03 08:55:13 +03:00
Perttu Ahola 45e0d04de1 Add util/buildbot 2012-04-03 08:48:44 +03:00
Perttu Ahola b1ac834578 Add multiplayer test script 2012-04-03 00:32:08 +03:00
Kahrl 63d3403a20 Wireshark dissector: correct messed up field names 2011-12-01 11:38:06 +02:00
Kahrl 7f7fe444d3 Wireshark dissector: Add TOSERVER_RESPAWN and TOCLIENT_DEATHSCREEN, plus some failed assertion fix (well, hack). 2011-12-01 11:38:06 +02:00
Kahrl 3e975d8f28 minetestmapper: Fix the way ylist is computed, use cStringIO instead of rolling own Bytestream, remove some artifacts when drawing underground blocks, introduce a --drawunderground switch (defaults to of), 'blocknum' renamed to 'content'. 2011-09-27 02:38:19 +02:00
Perttu Ahola 08ac3454cc minetestmapper speed tweaks (kahrl & JacobF) 2011-09-26 22:31:34 +03:00
Perttu Ahola 3ca847b4e1 Add apple color to minetestmapper and fix cactus color 2011-09-26 20:55:00 +03:00
Perttu Ahola e7fcc08d26 Fix minetestmapper.py 2011-09-26 20:54:42 +03:00
Kahrl 561bb64963 Support Python 2 and 3 in sectors2sqlite.py. 2011-09-26 13:24:21 +02:00
Kahrl d5899a53fd Fix processing of blocks below y=0 in sectors2sqlite.py. 2011-09-26 13:10:22 +02:00
JacobF 7f51bccf47 update minetestmapper so it can read the database also 2011-09-16 18:59:33 +03:00
Kahrl ae89aa55b9 Updated colors.txt (which is used by minetestmapper) 2011-09-15 23:09:00 +02:00
JacobF 0c91d01866 Cull empty lines... 2011-09-04 17:06:23 -04:00
JacobF e34cef312f Files to database converter 2011-09-04 17:02:50 -04:00
Kahrl 9ebfbd150e dissector branch: added wireshark dissector minetest.lua 2011-08-25 21:29:41 +02:00
Giuseppe Bilotta dd9909a574 minetestmapper can be run from any directory
If it doesn't find colors.txt locally, it looks for the one in the
directory of the script itself.
2011-08-05 08:45:15 +02:00
Constantin Wenger 0fb208e63c updated po update script to detect wgettext and N_ 2011-08-05 08:45:15 +02:00
Nils Dagsson Moskopp 75816150ec * honor environment variables, use utf-8 2011-07-30 21:17:04 +02:00
Nils Dagsson Moskopp 4681392bac * PEP 8 compliance 2011-07-30 21:05:33 +02:00
Wolfgang Fellger edbcf7c039 * support for content types extension in minetestmapper 2011-07-30 20:35:55 +02:00
Nils Dagsson Moskopp 4ef9c7675a Merge remote-tracking branch 'origin/upstream' 2011-07-30 18:55:43 +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
Perttu Ahola 90d793f8f3 extended content-type range 2011-07-23 16:55:26 +03:00
Perttu Ahola b55d2d4a65 added minetestmapper in utils/ 2011-06-25 17:46:08 +03:00
Perttu Ahola 47e4eda4bb Reorganizing stuff (import from temporary git repo) 2011-06-25 04:23:21 +03:00