Commit Graph

190 Commits

Author SHA1 Message Date
Mrchiantos 291d35fe69 Start Test with BlockColor
The goal is to modify the multicraft / minetest sources to run blockcolor on and to provide a legal and valid source to compile for windows, android, linux.

The goal is to modify the multicraft / minetest sources to run blockcolor on and to provide a legal and valid source to compile for windows, android, linux.

It may be that the project does not compile correctly or badly, I have not finished. Any help is welcome and I would soon open a forum for this.
2019-07-19 12:41:33 +02:00
MoNTE48 df06d60f29 Version 1.3.0-release, iOS 1.3.0-release 2019-07-17 20:47:43 +02:00
MoNTE48 ef023b5f7b Minor fixes and docs update 2019-06-18 11:10:08 +02:00
Maksim Gamarnik 33192bd4a1 Android: update java part 2019-05-13 14:16:51 +02:00
MoNTE48 a13e033c89 Back sqlite3 for WIN, fix Sky 2019-05-03 21:32:29 +02:00
MoNTE48 695e833477 Merge remote-tracking branch 'upstream/stable-0.4' into sync 2019-04-01 20:18:54 +02:00
SmallJoker 6dc7177a5d Bump version to 0.4.17.1 2018-06-10 17:18:11 +02:00
SmallJoker ecbb9310de Bump version to 0.4.17 2018-06-03 17:35:20 +02:00
MoNTE48 359e7472bf Fix WindowsApp build, change global version: 1.1.10 2018-05-27 13:31:00 +02:00
sfan5 87b9451820 Revert version scheme changes
This reverts commit 41b7823057.
This reverts commit 7968f1ddaa.
2017-11-20 19:28:58 +01:00
rubenwardy 41b7823057 Fix branch being labelled as 0.4.17 instead of 0.4.17-dev
You should use tags instead of this branch to track the latest release
2017-09-09 20:42:23 +01:00
Loïc Blot 7968f1ddaa
New version scheme (#6292)
* Version changes: current dev version is now 0.4.17

* This change permit to have multi branches with various versions
* Dev version is 0.4.17-dev and next release will be 0.4.17
2017-08-20 17:25:07 +02:00
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