Commit Graph

178 Commits

Author SHA1 Message Date
Maksim Gamarnik 4cd987b653 Merge Minetest 0.4.16 2017-06-06 23:03:34 +03:00
Loic Blot bf6569b570 Minetest for C++11 (CMakeLists + Travis)
* Move GCC to GCC 6 & GCC 7
* Move Clang to Clang 3.6 & Clang 4.0
* LINT moves from Clang 3.9 to Clang 4.0
* Move XCode 7.3 to 8.0
* Use more travis tricks to install compilers instead of adding complexity to our build script
* Clang format fixes on checked files (compat Cpp11 instead of Cpp03)
* Mingw GCC update from 4.8.4 to 5.3 (Ubuntu Xenial)
* Drop mingw cmake generated files and add them to gitignore
2017-06-04 09:57:08 +02:00
ShadowNinja 63ca71e9d2 Continue with 0.4.16-dev 2017-06-03 14:42:10 -04:00
ShadowNinja 80dc961d24 Bump version to 0.4.16 2017-06-03 14:42:10 -04:00
bigfoot547 287605ca81 Append -debug to version string (#5765) 2017-05-17 09:41:41 +02:00
Loic Blot ff4fef570e
Fix cmake library default build problem since moving to lib/
Also make Lua library check a cmake module
2017-04-07 23:56:02 +02:00
adrido 676951d90d Windows: Skip cmd for release builds (#5416) 2017-04-07 07:14:39 +02:00
Loïc Blot 86b1542181 Update embedded jsoncpp from unk version to 0.10.6 + move libs to lib/ instead of src/ (#5473)
* Update embedded jsoncpp from unk version to 0.10.6

0.10.6 is last release without c++11

* Make jsoncpp more compliant with its amalgamate

Jsoncpp cpp file should be upper, make the library like it does in amalgamate

* Reorganization: move minetest embedded libs outside of source tree to /lib

* Fix a dead grep in LINT
2017-04-02 10:51:50 +02:00
Loïc Blot 92b45b2a18 [CSM] implement client side mod loading (#5123)
* client side mods are located in clientmods/
* move builtin/preview.lua to clientmods/preview/init.lua as a preview mod
* refactor ModConfiguration class to work properly with client and server using child objects
* move some Server constructor mod load code to ModConfiguration to reduce code duplication between client and server
* remove mods.{cpp,h} unused functions
* use UNORDERED_SET instead of std::set in some modspec storages
2017-03-13 23:56:05 +01:00
Maksim Gamarnik 820fdb83d1 Compress png 2017-03-11 22:19:06 +02:00
Juhani Numminen 0e27b4b978 Update .appdata and .desktop files 2017-03-05 20:56:20 +01:00
Maksim Gamarnik 8cc092b177 Updated to Minetest ver. 0.4.15 2017-01-30 00:44:07 +02:00
sfan5 231ac33d34 Bump version to 0.4.15 2016-12-22 23:14:17 +01:00
sfan5 a95f983ea8 Continue with 0.4.15-dev 2016-12-22 23:14:17 +01:00
Yutao Yuan 6707d622bb Install texture_packs.txt to DOCDIR 2016-11-13 10:21:34 +01:00
est31 f092dac979 Also support X11 icon for minetest copies installed via make install (#4407)
Fixes #4323.
2016-08-20 21:26:44 +02:00
Maksim Gamarnik 778868d088 Update to Minetest 0.4.14 2016-05-15 16:30:09 +03:00
sfan5 fb31bd3806 Continue with 0.4.14-dev 2016-05-15 14:49:15 +02:00
sfan5 854d9e3745 Bump version to 0.4.14 2016-05-15 14:49:15 +02:00
Maksim Gamarnik 758af96b60 Merge release 2016-03-28 20:08:34 +03:00
Maksim Gamarnik 4e40dc5bef Merge remote-tracking branch 'upstream1/master' 2016-03-21 01:45:56 +02:00
est31 3132bcb373 Set EXAMPLE_CONF_DIR to DOCDIR if DOCDIR gets customized
Before, customisation of DOCDIR did not lead to
changes of the EXAMPLE_CONF_DIR default value.
This was inconsistent with expected behaviour
if you didn't know of the existence of the
EXAMPLE_CONF_DIR variable. The confusion is
very strong, as (for not in place builds) both
DOCDIR and EXAMPLE_CONF_DIR share the same
default value, it is unexpected that setting
CUSTOM_DOCDIR changes the location of all
documentation files but one.

The best meaning of EXAMPLE_CONF_DIR is to
further allow customization of the mt.conf.example
storage place, but otherwise keep defaulting to
whatever DOCDIR is set to, at least for not in
place builds. This patch implements that
behaviour.

Fixes #3863.
2016-03-16 23:06:33 +01:00
Maksim Gamarnik 9ac4477a67 Doc fix 2016-02-20 01:36:36 +02:00
Maksim Gamarnik 9abdf23879 Not Minetest, MultiCraft!
Change Minetest on MultiCraft. =)
2016-02-12 05:52:43 +02:00
Maksim Gamarnik af41a0321c Pre-release 2016-02-01 18:11:26 +02:00
Maksim Gamarnik 18c6b747b6 Merge branch 'master' of https://github.com/minetest/minetest 2016-01-31 20:57:03 +02:00
Pavel Puchkin fe3f6be4d2 Simplify custom games packaging 2016-01-09 16:50:04 +01:00
Maksim Gamarnik 9012ac8f22 Update
Sync all Minetest commits
2015-11-10 13:49:24 +02:00
est31 8acccf4c58 Fix "make install" and add underscore to doc file name
Fix regression since commit:

915807f8db "Rename doc/mapformat.txt and update doc to match SRP changes"

And add an underscore to doc file name to make it more readable.
2015-09-14 07:51:31 +02:00
HEXcube c345657289 Rename minetest-icon.svg to minetest.svg - Fixes #1564
-Complies with the Linux standard freedesktop icon naming specs: http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html#guidelines
-Ensures compatibility with icon themes
-Edit minetest.desktop, CMakeLists.txt and README.md to reflect this change
2015-09-03 19:26:28 +02:00
Maksim Gamarnik bd5f224561 Update CMakeLists.txt 2015-08-24 14:27:18 +03:00
est31 ffe3f03bc5 Continue with 0.4.13-dev 2015-08-20 04:02:00 +02:00
est31 d44fceac7e Bump version to 0.4.13 2015-08-20 04:02:00 +02:00
D Laboratory 162af5fe32 Fix a typo in comment of CMakeLists.txt 2015-07-18 07:50:52 +02:00
OttoLidenbrock 0c320aaff2 rename conf to multicraft.conf 2015-05-23 20:36:48 +10:00
ShadowNinja 0ac2dc99e7 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-13 17:00:50 +10:00
ShadowNinja 1be2d32fd5 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
OttoLidenbrock d649afa044 Merge upstream
Conflicts:
	builtin/mainmenu/tab_simple_main.lua
	src/client/clientlauncher.cpp
	src/game.cpp
	src/guiEngine.cpp
2015-04-29 19:59:54 +10:00
sfan5 4ea5a96fff Revert the upper-case PROJECT_NAME nonsense that was part of #2402 2015-04-27 16:24:49 +02:00
OttoLidenbrock 8cf938c928 Change project name and version (not android yet)
Update package Vendor and Email and version number
Change version to 1.0.1

Partially change project name

Changed android version code to 1
2015-04-27 00:54:48 +10:00
ShadowNinja 93fcab952b 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
Pavel Puchkin ca5df44edb Standalone bundle for OSX (w/ dependencies!) 2015-03-17 15:37:23 +01:00
BlockMen 627c747470 Uncomment version patch field 2015-02-18 23:52:51 +01:00
Perttu Ahola e6ad2ace10 Bump version to 0.4.12 2015-02-18 23:50:01 +01:00
kwolekr 3ea5ed4ffe Uncomment version patch field 2014-12-26 11:02:26 -05:00
kwolekr 3f83ca29d3 Bump version to 0.4.11 2014-12-24 22:28:06 -05:00
Pavel Puchkin 3b902fd574 Fix OSX packaging finally
Signed-off-by: Craig Robbins <kde.psych@gmail.com>
2014-12-16 20:33:54 +10:00
Jürgen Doser 83830e8682 Add basic support for generating API documentation using Doxygen
If CMake is run and Doxygen is found, add a make target called "doc",
which builds API documention in doc/html. This target is not included
in the default "all" target, you have to explicitly run "make doc" to
generate the documentation.

If graphviz is installed, in particular, if the "dot" binary is found,
doxygen is configured to generate various kinds of diagrams. Note that
due to this, the first run of doxygen can take a while.
2014-12-12 14:59:57 -05:00
sfan5 17345404ba 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
sapier 5ca336ea92 Switch back repository to dev-mode after 0.4.10 release. 2014-07-07 19:08:41 +02:00