Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-26 09:33:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,222 Commits 5 Branches 67 Tags 270 MiB
8c56434bd3
Commit Graph

256 Commits

Author SHA1 Message Date
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
Juhani Numminen
0e27b4b978 Update .appdata and .desktop files 2017-03-05 20:56:20 +01:00
sfan5
a95f983ea8 Continue with 0.4.15-dev 2016-12-22 23:14:17 +01:00
sfan5
231ac33d34 Bump version to 0.4.15 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
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
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
Pavel Puchkin
fe3f6be4d2 Simplify custom games packaging 2016-01-09 16:50:04 +01:00
est31
8acccf4c58 Fix "make install" and add underscore to doc file name 
Fix regression since commit:

915807f8db1f3721ad9ffc00a4863ad940010c45 "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
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
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
sfan5
4ea5a96fff Revert the upper-case PROJECT_NAME nonsense that was part of #2402 2015-04-27 16:24:49 +02: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
sapier
96f285f71e Update version numbers for 0.4.10 2014-07-06 22:39:47 +02:00
Martin Doege
c410e9182d OS X compatibility fixes 2014-06-29 17:27:33 +02:00
sfan5
5b3bbde1ef Fix AppData path for RUN_IN_PLACE, fixes #1365 2014-06-13 21:09:55 +02:00
David Gumberg
c39e46c00d Add AppData file 2014-06-13 13:51:01 -04:00
sapier
3e52dd5c68 Improved win32 file version information 2014-03-02 23:49:19 +01:00
sapier
31ec14afe2 Add check to avoid usage of broken LuaJIT < 2.0.0beta8 2014-02-13 23:28:01 +01:00
Kahrl
4d22977509 Reenable -dev suffix 2014-01-03 04:36:13 +01:00
kwolekr
1ad81c1ce3 Bump version to 0.4.9 2014-01-01 16:54:28 -05:00
PilzAdam
f87c1c2410 Reenable -dev suffix 2013-11-24 19:01:25 +01:00
kwolekr
122875c30c Bump version to 0.4.8 2013-11-24 02:23:49 -05:00
Kahrl
8bc7ea61b9 Show git hash in version string at top left corner of window 2013-09-28 21:30:17 +02:00
PilzAdam
314e4dd4a6 Fix installation of textures/texture_packs_here.txt 2013-08-04 22:44:31 +02:00
MetaDucky
40b2f36eb8 Fixes cmake-gui causing RUN_IN_PLACE to be always off 2013-06-13 16:45:52 +02:00
PilzAdam
6b3e553dd5 Bump version to 0.4.7 2013-06-06 17:14:26 +00:00
PilzAdam
b2577b1f27 Install mods/mods_here.txt instead of mods/minetest/mods_here.txt 2013-05-19 18:47:58 +02:00
PilzAdam
6074163bf3 Remove survival and build from CMakeLists.txt 2013-05-18 16:14:06 +02:00
PilzAdam
b76ec317c9 Remove common from CMakeLists.txt, README.txt, lua-api.txt and buildwin.sh 2013-05-18 16:13:32 +02:00
PilzAdam
098692ef26 Install menu textures of minetest_game 2013-05-04 12:37:02 +02:00
kwolekr
fbf76184f0 Revert "Fix to be able to build from dir different than source dir" 
This commit broke RUN_IN_PLACE
 2013-04-07 01:30:06 -04:00
Diego Martínez
046534e14b Fix to be able to build from dir different than source dir 2013-04-06 12:31:12 -04:00
Diego Martínez
1a5dcfd0c8 Install "build" and "survival" games with "make install" 2013-04-05 15:03:05 +02:00
kwolekr
37acadc2af Bump version to 0.4.6 2013-04-03 16:36:25 -04:00
Zeg9
923a97b108 Install locales in minetest directory, so they are correctly loaded 2013-03-30 21:48:12 -04:00
Perttu Ahola
b6dcadeb79 CMakeLists.txt: Add games/common to be installed when available 2013-03-22 07:46:48 +02:00
kwolekr
038529c763 Bump version to 0.4.5 2013-03-04 17:01:36 -05:00
Ilya Zhuravlev
30b9a4d6b4 Add Freetype support 2013-02-14 18:46:08 +01:00
Perttu Ahola
b7de864f2e Call this 0.4.4-d1 because it has a protocol addition since 0.4.4 2013-01-02 21:03:47 +02:00
Perttu Ahola
ab06fca4be Bump version to 0.4.4 2012-12-06 21:21:10 +02:00
Perttu Ahola
ca16119adb Install shaders properly 2012-12-02 01:45:31 +02:00
Perttu Ahola
f720c67f3e Change version to 0.4.4-dev because... ehm... why it wasn't that already? 2012-11-29 22:08:25 +02:00
Perttu Ahola
d67004a3be Bump version to 0.4.4 as this isn't compatible with 0.4.3 2012-11-26 00:56:47 +02:00
Perttu Ahola
9696ed31a4 Version 0.4.3 2012-09-05 01:31:06 +03:00
Perttu Ahola
1b63f8d6b9 Version 0.4.3-rc0; increase PROTOCOL_VERSION due to backwards-incompatible InventoryList width field 2012-09-05 00:39:43 +03:00
Perttu Ahola
d38b465b7c Call this 0.4.2-rc1 2012-07-28 16:31:45 +03:00
Perttu Ahola
aef1332e42 Improve build configuration options 2012-07-23 15:23:33 +03:00
Perttu Ahola
e3ddbe8c6b Version 0.4.1 2012-07-21 23:14:23 +03:00
Perttu Ahola
b0ba05c9ac BITCH, THIS IS 0.4.0. 2012-07-21 03:37:07 +03:00
Perttu Ahola
a8eb68142e Call this 0.4.dev-20120606 2012-06-07 00:40:04 +03:00
Perttu Ahola
3bea1a944e Call this 0.4.dev-20120603 2012-06-04 00:37:51 +03:00
Perttu Ahola
e4485f5412 Call this 0.4.dev-20120408 2012-04-08 23:55:17 +03:00
Perttu Ahola
18d8e3acec Support custom textures installed as /textures/all/*.png 2012-04-07 10:43:06 +03:00
Perttu Ahola
4483fc7df3 Fix installation path of minetest_game/mods (// in place of / doesn't work on virtualbox network drives) 2012-04-02 22:50:46 +03:00
Perttu Ahola
2cd5addc0c Fix things for cross-compiling using mingw 2012-04-02 21:14:30 +03:00
Perttu Ahola
5403b1cf6d Install minetest_game without .git and other unnecessary things 2012-03-31 00:05:01 +03:00
Perttu Ahola
0ff94978f5 Fix minetest_game installation and don't fail if it doesn't exist 2012-03-27 17:33:51 +03:00
Perttu Ahola
684b004751 Update version number to 0.4.dev-20120326 because much has changed from the previous one 2012-03-27 00:07:25 +03:00
Perttu Ahola
8e6ac5c263 Fix cmake install script (mesetint -> minetest) 2012-03-25 21:41:37 +03:00
Perttu Ahola
b91bba1ab2 Install lua_api.txt and mapformat.txt in because awesome. 2012-03-22 17:08:32 +02:00
Perttu Ahola
94f1ab4da3 Call this 0.4.dev-20120320 2012-03-20 01:37:28 +02:00
Perttu Ahola
2de91f11fb Add mods/mesetint/mods_here.txt to be installed on RUN_IN_PLACE builds 2012-03-20 01:19:47 +02:00
Perttu Ahola
db4911f956 Fix for MSVC and move stuff around a bit in CMakeLists.txt and src/CMakeLists.txt 2012-03-20 01:06:58 +02:00
Perttu Ahola
b9cc0a7976 Move icon files to misc/ 2012-03-20 00:32:43 +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
Perttu Ahola
fb3ac49335 Update version to 0.4.dev-20120318 2012-03-18 19:14:20 +02:00
Perttu Ahola
b409803527 Fix installation in cmake project files 2012-03-18 16:30:02 +02:00
Perttu Ahola
9eba6a349f Update version number to 0.4.dev-20120311 2012-03-11 15:10:34 +02:00
Juhani Numminen
a5f6d65c37 Add UNIX man pages to aid package creators. 2012-02-28 21:26:14 +02:00
Juhani Numminen
c8ec711503 Install icon and .desktop file on Unix systems 2012-02-28 21:03:38 +02:00
Perttu Ahola
cb05a28745 Call this 0.4.dev-20120122-1 2012-01-22 23:05:36 +02:00
Perttu Ahola
569156b013 Call this 0.4.dev-20120106-1 2012-01-06 20:41:52 +02:00
Perttu Ahola
48131bf988 Call this 0.4.dev-20120102-1 2012-01-02 13:51:43 +02:00
Perttu Ahola
e06d4555bf Call this 0.4.dev-20111209-1 2011-12-09 11:36:47 +02:00
Perttu Ahola
a00e908f52 Call this 0.4.dev-20111204-1 2011-12-04 01:24:47 +02:00
Perttu Ahola
fdf7b3bcdf Call this 0.4.dev-20111203-3 2011-12-03 12:02:45 +02:00
Perttu Ahola
3965d432ca Call this 0.4.dev-20111203-2 2011-12-03 11:45:26 +02:00
Perttu Ahola
cd608b1877 Set version 0.4.dev-20111203-1 2011-12-03 03:46:19 +02:00
Perttu Ahola
bc00cdeb2c Set version to 0.4.dev-20111202-1 2011-12-02 13:00:42 +02:00
Perttu Ahola
50b87c3791 Update version in CMakeLists.txt to 0.4.dev-20111201-1 2011-12-01 02:43:10 +02:00
Perttu Ahola
74c6836f2f Update version in CMakeLists.txt to 0.4.dev-20111201-0 2011-12-01 00:37:46 +02:00
Perttu Ahola
661ed387df Version 0.4.dev-20111129-2 2011-11-29 23:23:33 +02:00
Perttu Ahola
e5d372f238 dev-20111129-1 2011-11-29 21:46:03 +02:00
Perttu Ahola
95951ce558 Update version number to 0.4.dev-20111129 2011-11-29 19:13:58 +02:00
Perttu Ahola
e19d1ea95a Set version to 0.4 2011-11-29 19:13:41 +02:00
Perttu Ahola
bc0e5c0063 Update changelog and call this 0.3.1 2011-11-09 12:07:40 +02:00
Perttu Ahola
fea55a9b87 Call this 0.3.dev-20111108 2011-11-08 02:13:29 +02:00
Perttu Ahola
4142b8c352 Call this version 0.3.dev-20111104 2011-11-04 22:16:36 +02:00
Perttu Ahola
1469196d3b Update /README.txt, remove duplicate /doc/README.txt and update CMakeLists.txt to package /README.txt 2011-11-03 21:36:42 +02:00
Perttu Ahola
f65d157786 Set version to 0.3.0 and update changelog 2011-11-01 16:54:01 +02:00
Perttu Ahola
9c3e0a8040 0.3.dev-20111021 2011-10-21 18:29:13 +03:00
Perttu Ahola
286edd4f1e Update version number to 0.3.dev-20111016 2011-10-16 00:53:37 +03:00
Perttu Ahola
94dfececf6 strict_protocol_version_checking setting; PROTOCOL_VERSION in clientserver.h; clean up defaultsettings.cpp and minetest.conf.example 2011-10-15 15:02:28 +03:00
Perttu Ahola
857fe0551c Set a better version number 2011-10-15 12:51:30 +03:00
Perttu Ahola
853a78681e In CMake scripts: New version number, fix MSVC stuff 2011-10-14 09:55:39 +03:00
Perttu Ahola
bdf54908aa Make client report a newer version number to the server than 2011-07-31 does and make the server enforce it 2011-09-22 20:47:47 +03:00
Perttu Ahola
7244f09111 Oh well, let's call it just 0.2.20110922 2011-09-22 18:22:04 +03:00
Perttu Ahola
ca748ad44c Update changelog and version to 0.2.20110922_rc1 2011-09-22 18:15:05 +03:00
Perttu Ahola
63f1ded167 Update version number to something more proper for this stage of development (0.2.201109xx_dev) 2011-09-06 19:22:00 +03:00
Perttu Ahola
ff1471ba6d updated version in CMakeLists 2011-07-31 15:54:54 +03:00
Perttu Ahola
b62f4284fa updated version 2011-07-31 15:33:13 +03:00
Perttu Ahola
d6a9bec843 Added MaterialItem conversion from old content type namespace to new 2011-07-31 02:20:40 +03:00
Perttu Ahola
88a266db12 Updated CMakeLists, changelog and example config for release 2011-07-31 01:07:31 +03:00
Perttu Ahola
149875607c updated CMakeList.txts a bit 2011-07-31 00:51:18 +03:00
Perttu Ahola
4ccc99b291 updated version to rc2, rolling out new windows test binary 2011-07-30 21:16:36 +03:00
Perttu Ahola
1de45cc8a7 Removed remaining -delta references 2011-07-30 14:02:11 +03:00
Perttu Ahola
96fedb5cb0 removed -delta namings 2011-07-23 19:33:49 +03:00
Weedy
36d8f91f1a Tweak makefiles to add -delta suffix. 2011-07-21 09:03:20 +02:00
Nils Dagsson Moskopp
3560f0de08 Merge branch 'upstream/master' 
Conflicts:
	data/oerkki1.png
	src/client.cpp
 2011-07-14 22:43:28 +02:00
Perttu Ahola
81535f6277 Updated version and changelog 2011-07-04 22:15:15 +03:00
Sebastian Rühl
9d09103e48 Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge 
Conflicts:
	.gitignore
	CMakeLists.txt
	data/heart.png
	src/CMakeLists.txt
	src/game.cpp
	src/guiMainMenu.cpp
	src/inventory.cpp
	src/map.cpp
	src/mapblock.cpp
	src/mapnode.cpp
	src/mapnode.h
	src/materials.cpp
	src/server.cpp

Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
 2011-06-26 12:24:32 +02:00
Perttu Ahola
47e4eda4bb Reorganizing stuff (import from temporary git repo) 2011-06-25 04:23:21 +03:00
Perttu Ahola
5ac900ddd9 Changed MapBlockObjects to be never written anymore. Incremented version number. 2011-06-18 15:16:35 +03:00
Perttu Ahola
534287892d merged Mac OSX build fix from minetest-delta 2011-06-18 03:14:13 +03:00
Perttu Ahola
1b8cff8fbf In a globally installed build, debug.txt is now placed in userdata directory. Needs testing still. 2011-06-02 19:30:03 +03:00
Perttu Ahola
7d57b71ffe 0.2.20110602_0 2011-06-02 00:15:42 +03:00
MrLoom
2f2f28d398 MacOSX build support 2011-06-01 14:13:22 +02:00
Perttu Ahola
97dc966759 updated version 2011-05-31 00:24:44 +03:00
Perttu Ahola
a6c97be1a4 20110529_2 
--HG--
extra : rebase_source : cf6dd618ef0b7514c81ae87749733b5a328fc763
 2011-05-29 22:38:16 +03:00
Perttu Ahola
f966ea8659 version 
--HG--
extra : rebase_source : 6fa0a8b40406aa567f8fa84b5e2045a7e3762c1d
 2011-05-29 21:35:38 +03:00
Perttu Ahola
cc2df1a3ed changed version number to 0.2.20110529_0 
--HG--
extra : rebase_source : 9b05d4bfee9312aef4182fa6f63b4237368cec34
 2011-05-29 21:28:22 +03:00
Perttu Ahola
2704bdc68e Optimized smooth lighting calculation code 2011-04-24 21:15:50 +03:00
Perttu Ahola
c9967d6d07 updated menu a bit, and some other small fixes 2011-04-24 15:37:41 +03:00
Perttu Ahola
83414e8b73 removed /usr prefix from install paths 2011-04-24 00:30:41 +03:00
Perttu Ahola
4b8c5b1908 changed version for making a test binary 2011-04-23 20:37:12 +03:00
Perttu Ahola
4934f3d060 updated changelog and version 2011-04-10 23:39:33 +03:00
Perttu Ahola
00dd5cbb2e still modified version! 2011-04-06 11:55:38 +03:00
Perttu Ahola
6537e67909 Fixed wrong version number 2011-04-06 11:53:46 +03:00
Perttu Ahola
12f8f09f8c Changed version number according to a new versioning scheme. 2011-04-06 11:16:44 +03:00
Perttu Ahola
b7ddeb51be Incremented version to 0.0.2. 2011-04-05 18:27:00 +03:00
Perttu Ahola
92432a28c0 small fixes: crack texture, server build on windows, configuration file example, adding config file example to install 2011-02-16 20:03:31 +02:00
Perttu Ahola
a0e8f3afd3 might work good on cmake+msvc now 2011-02-15 20:53:29 +02:00
Perttu Ahola
9998355221 oops... blew. now? 2011-01-18 23:13:29 +02:00
Perttu Ahola
affa8f80ad Tried to fix install directory problem on linux... Let's hope this doesn't blow it all. 2011-01-18 23:12:52 +02:00