Minor fixes and docs update
MoNTE48
parent
26ba5bc207
commit
b64a7650ef
|
|
@ -15,7 +15,7 @@ set(CMAKE_CXX_STANDARD 11)
|
|||
# Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
|
||||
set(VERSION_MAJOR 1)
|
||||
set(VERSION_MINOR 2)
|
||||
set(VERSION_PATCH 0)
|
||||
set(VERSION_PATCH 1)
|
||||
set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
|
||||
|
||||
# Change to false for releases
|
||||
|
|
|
|||
12
README.md
12
README.md
|
|
@ -1,16 +1,16 @@
|
|||
MultiCraft Open Source Project
|
||||
========
|
||||
==============================
|
||||
|
||||
MultiCraft is an Open Source sandbox game inspired by [Minecraft](https://minecraft.net/).
|
||||
|
||||
MultiCraft is based on Minetest project which is developed by a [number of contributors](https://github.com/minetest/minetest/graphs/contributors).
|
||||
MultiCraft is based on the Minetest project, which is developed by a [number of contributors](https://github.com/minetest/minetest/graphs/contributors).
|
||||
|
||||
Copyright (c) 2014-2016 Maksim Gamarnik [MoNTE48] <MoNTE48@mail.ua> & MultiCraft Developement Team.
|
||||
Copyright © 2014-2019 Maksim Gamarnik [MoNTE48] <MoNTE48@mail.ua> & MultiCraft Development Team.
|
||||
|
||||
The engine and the game is licensed under LGPLv3 (or higher). Resources games licensed under CC-BY-SA 3.0, unless otherwise stated, and also a bit of proprietary code and resources.
|
||||
The engine and the game is licensed under LGPLv3 (or higher). Resources games licensed under CC-BY-SA 3.0, unless otherwise stated.
|
||||
|
||||
You can help in the development. But you should always publish your source code after any changes.
|
||||
Before any use of source code MultiCraft or any part of you should be familiar with [LGPL-3.0](doc/LGPL-3.0.md) and [Other License.txt](doc/Other%20License.md)
|
||||
Before any use of the MultiCraft source code or any part of it, you should be familiar with [LGPL-3.0](doc/LGPL-3.0.md) and [Other License.txt](doc/Other%20License.md)
|
||||
|
||||
Any code that you push to this repository is automatically licensed as LGPLv3 (or higher) and belongs MultiCraft Project and/or the owner of the project without exception.
|
||||
Adding code under another license is possible only by agreement with the owner of the project and the creation of appropriate notes.
|
||||
Adding code under another license is possible only by agreement with the project owner and the creation of appropriate notes.
|
||||
|
|
@ -97,7 +97,7 @@ return {
|
|||
cbf_formspec = function(tabview, name, tabdata)
|
||||
local version = core.get_version()
|
||||
return "label[0.1,-0.1;MultiCraft Open Source Project, ver. " .. version.string .. "]" ..
|
||||
"label[0.1,0.3;Copyright (c) 2014-2019 MultiCraft Developement Team]" ..
|
||||
"label[0.1,0.3;Copyright (c) 2014-2019 MultiCraft Development Team]" ..
|
||||
"label[0.1,0.7;Home page: https://github.com/MultiCraftProject/MultiCraft]" ..
|
||||
"label[0.1,1.1;Licence: LGPLv3.0+ and CC-BY-SA 3.0]" ..
|
||||
"tablecolumns[color;text]" ..
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ MultiCraft Open Source Project:
|
|||
=================================
|
||||
|
||||
LGPLv3.0+, CC-BY-SA 3.0 and a little bit proprietary textures. The list in the file nearby.
|
||||
You can use these textures without restriction within MultiCraft Project.
|
||||
You can not use them in another project.
|
||||
They are an integral part of this project and created exclusively for him.
|
||||
You can use these textures without restriction in the MultiCraft Project.
|
||||
You cannot use them in another project.
|
||||
They are an integral part of this project and are created or purchased exclusively for it.
|
||||
|
||||
--- --- ---
|
||||
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
# This file contains information (some of which was previously stored in
|
||||
# minetest.conf.example) that cannot be automatically generated from
|
||||
# builtin/settingtypes.txt.
|
||||
# This file contains a list of settings and their default value for minetest.conf
|
||||
|
||||
# By default, all the settings are commented and not functional.
|
||||
# Uncomment settings by removing the preceding #.
|
||||
|
||||
# minetest.conf is read by default from:
|
||||
# ../minetest.conf
|
||||
# ../../minetest.conf
|
||||
# Any other path can be chosen by passing the path as a parameter
|
||||
# to the program, eg. "minetest.exe --config ../minetest.conf.example".
|
||||
|
||||
# Further documentation:
|
||||
# http://wiki.minetest.net/
|
||||
|
||||
|
||||
# Mapgen
|
||||
|
||||
# Noise parameters and formats
|
||||
|
||||
# Noise parameters can be specified as a set of positional values, for example:
|
||||
#
|
||||
# Offset, scale, (x, y, z spread factors), seed offset, octaves, persistence, lacunarity
|
||||
# mgv6_np_terrain_base = -4, 20, (250, 250, 250), 82341, 5, 0.6, 2.0
|
||||
#
|
||||
# Or the group format can be used instead, for example:
|
||||
#
|
||||
# mgv6_np_terrain_base = {
|
||||
# offset = -4,
|
||||
# scale = 20,
|
||||
# spread = (250, 250, 250),
|
||||
# seed = 82341,
|
||||
# octaves = 5,
|
||||
# persistence = 0.6,
|
||||
# lacunarity = 2.0,
|
||||
# flags = "defaults"
|
||||
# }
|
||||
#
|
||||
# The advanced settings menu does not yet support the group format.
|
||||
# Only the group format supports noise flags which are needed for eased noise.
|
||||
# Mgv5 uses eased noise for np_ground so this is shown in group format below
|
||||
# and is not present in the advanced settings menu.
|
||||
|
||||
# Mapgen v5
|
||||
|
||||
# Noise parameter in group format, unsupported by advanced settings menu but
|
||||
# settable in minetest.conf.
|
||||
# See documentation of noise parameter formats above.
|
||||
#
|
||||
# 3D noise defining terrain.
|
||||
# type: noise_params
|
||||
# mgv5_np_ground = {
|
||||
# offset = 0,
|
||||
# scale = 40,
|
||||
# spread = (80, 80, 80),
|
||||
# seed = 983240,
|
||||
# octaves = 4,
|
||||
# persistence = 0.55,
|
||||
# lacunarity = 2.0,
|
||||
# flags = "eased"
|
||||
# }
|
||||
24
src/config.h
24
src/config.h
|
|
@ -23,18 +23,18 @@
|
|||
#define BUILD_TYPE "Debug"
|
||||
#endif
|
||||
#elif defined (__IOS__)
|
||||
#define PROJECT_NAME "MultiCraft"
|
||||
#define PROJECT_NAME_C "MultiCraft"
|
||||
#define STATIC_SHAREDIR ""
|
||||
#define VERSION_MAJOR 1
|
||||
#define VERSION_MINOR 2
|
||||
#define VERSION_PATCH 0
|
||||
#define VERSION_STRING "1.2.0"
|
||||
#ifdef NDEBUG
|
||||
#define BUILD_TYPE "Release"
|
||||
#else
|
||||
#define BUILD_TYPE "Debug"
|
||||
#endif
|
||||
#define PROJECT_NAME "MultiCraft"
|
||||
#define PROJECT_NAME_C "MultiCraft"
|
||||
#define STATIC_SHAREDIR ""
|
||||
#define VERSION_MAJOR 1
|
||||
#define VERSION_MINOR 2
|
||||
#define VERSION_PATCH 1
|
||||
#define VERSION_STRING "1.2.1"
|
||||
#ifdef NDEBUG
|
||||
#define BUILD_TYPE "Release"
|
||||
#else
|
||||
#define BUILD_TYPE "Debug"
|
||||
#endif
|
||||
#else
|
||||
#ifdef NDEBUG
|
||||
#define BUILD_TYPE "Release"
|
||||
|
|
|
|||
Loading…
Reference in New Issue