Big update

Bluestone
New textures
More small fix
Fix doc
Other
This commit is contained in:
Maksim Gamarnik 2015-08-14 01:05:50 +03:00
parent d4a4772700
commit f313dac5cc
10 changed files with 26 additions and 38 deletions

View File

@ -51,7 +51,7 @@ $user = ~/.minetest
OS X: OS X:
$bin = Contents/MacOS $bin = Contents/MacOS
$share = Contents/Resources $share = Contents/Resources
$user = Contents/User OR ~/Library/Application Support/minetest $user = Contents/User OR ~/Library/Application Support/MultiCraft
World directory World directory
---------------- ----------------
@ -61,8 +61,8 @@ World directory
Configuration file: Configuration file:
------------------- -------------------
- Default location: - Default location:
$user/minetest.conf $user/MultiCraft.conf
- It is created by Minetest when it is ran the first time. - It is created by MultiCraft when it is ran the first time.
- A specific file can be specified on the command line: - A specific file can be specified on the command line:
--config <path-to-file> --config <path-to-file>
@ -82,23 +82,13 @@ This is an example for installing git on Debian/Ubuntu:
$ sudo apt-get install git-core $ sudo apt-get install git-core
Download source (this is the URL to the latest of source repository, which might not work at all times) using git: Download source (this is the URL to the latest of source repository, which might not work at all times) using git:
$ git clone --depth 1 https://github.com/minetest/minetest.git $ git clone --depth 1 https://github.com/MultiCraft/MultiCraft.git
$ cd minetest $ cd MultiCraft
Download minetest_game (otherwise only the "Minimal development test" game is available) using git:
$ git clone --depth 1 https://github.com/minetest/minetest_game.git games/minetest_game
Download source, without using git: Download source, without using git:
$ wget https://github.com/minetest/minetest/archive/master.tar.gz $ wget https://github.com/MultiCraft/MultiCraft/archive/master.tar.gz
$ tar xf master.tar.gz $ tar xf master.tar.gz
$ cd minetest-master $ cd MultiCraft-master
Download minetest_game, without using git:
$ cd games/
$ wget https://github.com/minetest/minetest_game/archive/master.tar.gz
$ tar xf master.tar.gz
$ mv minetest_game-master minetest_game
$ cd ..
Build a version that runs directly from the source directory: Build a version that runs directly from the source directory:
$ cmake . -DRUN_IN_PLACE=TRUE $ cmake . -DRUN_IN_PLACE=TRUE
@ -121,8 +111,8 @@ CMake options
------------- -------------
General options: General options:
BUILD_CLIENT - Build Minetest client BUILD_CLIENT - Build MultiCraft client
BUILD_SERVER - Build Minetest server BUILD_SERVER - Build MultiCraft server
CMAKE_BUILD_TYPE - Type of build (Release vs. Debug) CMAKE_BUILD_TYPE - Type of build (Release vs. Debug)
Release - Release build Release - Release build
Debug - Debug build Debug - Debug build
@ -139,7 +129,7 @@ ENABLE_SOUND - Build with OpenAL, libogg & libvorbis; in-game Sounds
ENABLE_LUAJIT - Build with LuaJIT (much faster than non-JIT Lua) ENABLE_LUAJIT - Build with LuaJIT (much faster than non-JIT Lua)
RUN_IN_PLACE - Create a portable install (worlds, settings etc. in current directory) RUN_IN_PLACE - Create a portable install (worlds, settings etc. in current directory)
USE_GPROF - Enable profiling using GProf USE_GPROF - Enable profiling using GProf
VERSION_EXTRA - Text to append to version (e.g. VERSION_EXTRA=foobar -> Minetest 0.4.9-foobar) VERSION_EXTRA - Text to append to version (e.g. VERSION_EXTRA=foobar -> MultiCraft 0.1-foobar)
Library specific options: Library specific options:
@ -194,7 +184,6 @@ ZLIB_LIBRARY - path to libz.a/libz.so/zlibwapi.lib
Compiling on Windows: Compiling on Windows:
--------------------- ---------------------
- This section is outdated. In addition to what is described here: - This section is outdated. In addition to what is described here:
- In addition to minetest, you need to download minetest_game.
- If you wish to have sound support, you need libogg, libvorbis and libopenal - If you wish to have sound support, you need libogg, libvorbis and libopenal
- You need: - You need:
@ -212,8 +201,7 @@ Compiling on Windows:
* Optional: gettext library and tools: * Optional: gettext library and tools:
http://gnuwin32.sourceforge.net/downlinks/gettext.php http://gnuwin32.sourceforge.net/downlinks/gettext.php
- This is used for other UI languages. Feel free to leave it out. - This is used for other UI languages. Feel free to leave it out.
* And, of course, Minetest:
http://minetest.net/download
- Steps: - Steps:
- Select a directory called DIR hereafter in which you will operate. - Select a directory called DIR hereafter in which you will operate.
- Make sure you have CMake and a compiler installed. - Make sure you have CMake and a compiler installed.
@ -228,7 +216,7 @@ Compiling on Windows:
- zlib-1.2.5.tar.gz - zlib-1.2.5.tar.gz
- zlib125dll.zip - zlib125dll.zip
- irrlicht-1.7.1.zip - irrlicht-1.7.1.zip
- 110214175330.zip (or whatever, this is the minetest source) - 110214175330.zip (or whatever, this is the MultiCraft source)
+ zlib-1.2.5 + zlib-1.2.5
- zlib.h - zlib.h
+ win32 + win32
@ -245,14 +233,14 @@ Compiling on Windows:
+bin +bin
+include +include
+lib +lib
+ minetest + MultiCraft
+ src + src
+ doc + doc
- CMakeLists.txt - CMakeLists.txt
... ...
----------------- -----------------
- Start up the CMake GUI - Start up the CMake GUI
- Select "Browse Source..." and select DIR/minetest - Select "Browse Source..." and select DIR/MultiCraft
- Now, if using MSVC: - Now, if using MSVC:
- Select "Browse Build..." and select DIR/minetest-build - Select "Browse Build..." and select DIR/minetest-build
- Else if using MinGW: - Else if using MinGW:
@ -301,7 +289,7 @@ Compiling on Windows:
- You should now have a working game with the executable in - You should now have a working game with the executable in
DIR/minetest/bin/minetest.exe DIR/minetest/bin/minetest.exe
Windows releases of minetest are built using a bat script like this: Windows releases of MultiCraft are built using a bat script like this:
-------------------------------------------------------------------- --------------------------------------------------------------------
set sourcedir=%CD% set sourcedir=%CD%

View File

@ -2,21 +2,21 @@
<application> <application>
<id type="desktop">minetest.desktop</id> <id type="desktop">minetest.desktop</id>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>LGPL-2.1+ and CC-BY-SA-3.0 and MIT and Apache-2.0</project_license> <project_license>LGPL-3.0+ and CC-BY-SA-3.0 and MIT and Apache-2.0</project_license>
<name>Minetest</name> <name>MultiCraft</name>
<summary>Multiplayer infinite-world block sandbox game</summary> <summary>Multiplayer infinite-world block sandbox game</summary>
<description> <description>
<p> <p>
Minetest is an infinite-world block sandbox game and game engine. MultiCraft is an infinite-world block sandbox game and game engine.
</p><p> </p><p>
Players can create and destroy various types of blocks in a Players can create and destroy various types of blocks in a
three-dimensional open world. This allows forming structures in three-dimensional open world. This allows forming structures in
every possible creation, on multiplayer servers or in singleplayer. every possible creation, on multiplayer servers or in singleplayer.
</p><p> </p><p>
Minetest is designed to be simple, stable, and portable. MultiCraft is designed to be simple, stable, and portable.
It is lightweight enough to run on fairly old hardware. It is lightweight enough to run on fairly old hardware.
</p><p> </p><p>
Minetest has many features, including: MultiCraft has many features, including:
</p> </p>
<ul> <ul>
<li>Ability to walk around, dig, and build in a near-infinite voxel world</li> <li>Ability to walk around, dig, and build in a near-infinite voxel world</li>
@ -31,6 +31,6 @@
<screenshot type="default" width="1440" height="851">http://minetest.net/_media/screen2.png</screenshot> <screenshot type="default" width="1440" height="851">http://minetest.net/_media/screen2.png</screenshot>
<screenshot width="1440" height="851">http://minetest.net/_media/screenshot_4032289578.png</screenshot> <screenshot width="1440" height="851">http://minetest.net/_media/screenshot_4032289578.png</screenshot>
</screenshots> </screenshots>
<url type="homepage">http://minetest.net</url> <url type="homepage">http://MultiCraft.mobi</url>
<updatecontact>sfan5@live.de</updatecontact> <updatecontact>MoNTE48@mal.ua</updatecontact>
</application> </application>

View File

@ -1,14 +1,14 @@
[Desktop Entry] [Desktop Entry]
Name=Minetest Name=MultiCraft
GenericName=Minetest GenericName=MultiCraft
Comment=Multiplayer infinite-world block sandbox Comment=Multiplayer infinite-world block sandbox
Comment[de]=Mehrspieler-Sandkastenspiel mit unendlichen Blockwelten Comment[de]=Mehrspieler-Sandkastenspiel mit unendlichen Blockwelten
Comment[es]=Juego sandbox multijugador con mundos infinitos Comment[es]=Juego sandbox multijugador con mundos infinitos
Comment[fr]=Jeu multijoueurs de type bac à sable avec des mondes infinis Comment[fr]=Jeu multijoueurs de type bac à sable avec des mondes infinis
Comment[ru]=Игра-песочница с безграничным миром, состоящим из блоков Comment[ru]=Игра-песочница с безграничным миром, состоящим из блоков
Comment[tr]=Tek-Çok oyuncuyla küplerden sonsuz dünyalar inşa et Comment[tr]=Tek-Çok oyuncuyla küplerden sonsuz dünyalar inşa et
Exec=minetest Exec=MultiCraft
Icon=minetest-icon Icon=MultiCraft-icon
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Game; Categories=Game;

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 479 B

After

Width:  |  Height:  |  Size: 433 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 372 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 489 B

After

Width:  |  Height:  |  Size: 436 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB