Minor fixes and docs update
parent
9a7b7e2333
commit
ef023b5f7b
|
@ -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.
|
||||
|
||||
--- --- ---
|
||||
|
||||
|
|
|
@ -5,6 +5,6 @@ License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v3.0+
|
|||
|
||||
Textures:
|
||||
Copyright (C) 2013 Vattic
|
||||
Copyright (C) 2017-2019 Maksim Gamarnik [MoNTE48] MoNTE48@mail.ua & MultiCraft Developement Team
|
||||
Copyright (C) 2017-2019 Maksim Gamarnik [MoNTE48] MoNTE48@mail.ua & MultiCraft Development Team
|
||||
|
||||
Special credit to Jordach and MirceaKitsune for providing the default 3d character model.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
MultiCraft game mod: beds
|
||||
MultiCraft Game mod: beds
|
||||
=======================
|
||||
See license.txt for license information.
|
||||
|
||||
|
|
|
@ -28,8 +28,8 @@ local torch_get_output_rules = function(node)
|
|||
end
|
||||
|
||||
local torch_get_input_rules = function(node)
|
||||
local rules = {{x = -2, y = 0, z = 0},
|
||||
{x = -1, y = 1, z = 0}}
|
||||
local rules = {{x = -2, y = 0, z = 0},
|
||||
{x = -1, y = 1, z = 0}}
|
||||
|
||||
return rotate_torch_rules(rules, node.param2)
|
||||
end
|
||||
|
@ -49,11 +49,12 @@ local torch_selectionbox =
|
|||
wall_side = {-0.5, -0.1, -0.1, -0.5+0.6, 0.1, 0.1},
|
||||
}
|
||||
|
||||
minetest.register_node("mesecons_torch:mesecon_torch_off", {
|
||||
--[[minetest.register_node("mesecons_torch:mesecon_torch_off", {
|
||||
drawtype = "torchlike",
|
||||
tiles = {"jeija_torches_off.png", "jeija_torches_off_ceiling.png", "jeija_torches_off_side.png"},
|
||||
inventory_image = "jeija_torches_off.png",
|
||||
paramtype = "light",
|
||||
is_ground_content = false,
|
||||
walkable = false,
|
||||
paramtype2 = "wallmounted",
|
||||
selection_box = torch_selectionbox,
|
||||
|
@ -63,30 +64,34 @@ minetest.register_node("mesecons_torch:mesecon_torch_off", {
|
|||
state = mesecon.state.off,
|
||||
rules = torch_get_output_rules
|
||||
}}
|
||||
})
|
||||
})]]
|
||||
|
||||
minetest.register_node("mesecons_torch:mesecon_torch_on", {
|
||||
description = "Bluestone Torch",
|
||||
drawtype = "torchlike",
|
||||
tiles = {"jeija_torches_on.png", "jeija_torches_on_ceiling.png", "jeija_torches_on_side.png"},
|
||||
inventory_image = "jeija_torches_on.png",
|
||||
wield_image = "jeija_torches_on.png",
|
||||
paramtype = "light",
|
||||
is_ground_content = false,
|
||||
sunlight_propagates = true,
|
||||
walkable = false,
|
||||
paramtype2 = "wallmounted",
|
||||
selection_box = torch_selectionbox,
|
||||
groups = {dig_immediate=3},
|
||||
groups = {dig_immediate = 3, attached_node = 1},
|
||||
light_source = default.LIGHT_MAX-5,
|
||||
description="Bluestone Torch",
|
||||
mesecons = {receptor = {
|
||||
state = mesecon.state.on,
|
||||
rules = torch_get_output_rules
|
||||
}},
|
||||
})
|
||||
|
||||
minetest.register_alias("mesecons_torch:mesecon_torch_off", "mesecons_torch:mesecon_torch_on")
|
||||
|
||||
minetest.register_node("mesecons_torch:bluestoneblock", {
|
||||
description = "Bluestone Block",
|
||||
tiles = {"bluestone_block.png"},
|
||||
paramtype = "light",
|
||||
groups = {cracky = 1},
|
||||
light_source = default.LIGHT_MAX-5,
|
||||
sounds = default.node_sound_stone_defaults(),
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
MultiCraft game mod: boats
|
||||
MultiCraft Game mod: boats
|
||||
========================
|
||||
See license.txt for license information.
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
MultiCraft game mod: Colored Blocks
|
||||
MultiCraft Game mod: Colored Blocks
|
||||
|
||||
Include Colored Glass, Hardened Clay
|
||||
|
||||
License of source code:
|
||||
-----------------------
|
||||
Copyright (C) 2019 MultiCraft Developement Team
|
||||
Copyright (C) 2019 MultiCraft Development Team
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published by
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
MultiCraft game mod: dye
|
||||
MultiCraft Game mod: dye
|
||||
======================
|
||||
See license.txt for license information.
|
||||
See init.lua for documentation.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
MultiCraft game mod: Hunger
|
||||
MultiCraft Game mod: Hunger
|
||||
=====================
|
||||
Version: 1.1.3
|
||||
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
MultiCraft Game mod: signs
|
||||
|
||||
License of source code:
|
||||
-----------------------
|
||||
Copyright (C) 2018-2019 MultiCraft Development Team
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 3.0 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
http://www.gnu.org/licenses/lgpl-3.0.html
|
|
@ -126,7 +126,6 @@ minetest.register_lbm({
|
|||
minetest.register_node("signs:sign", {
|
||||
description = "Sign",
|
||||
tiles = {"default_wood.png"},
|
||||
inventory_image = "signs_inventory.png",
|
||||
drawtype = "nodebox",
|
||||
paramtype = "light",
|
||||
paramtype2 = "facedir",
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 216 B |
|
@ -1,4 +1,4 @@
|
|||
MultiCraft game mod: wool
|
||||
MultiCraft Game mod: wool
|
||||
=======================
|
||||
See license.txt for license information.
|
||||
Authors of source code
|
||||
|
|
|
@ -8,4 +8,4 @@ Originally by xyz (MIT)
|
|||
BlockMen (MIT)
|
||||
sofar (MIT)
|
||||
Various Minetest developers and contributors (MIT)
|
||||
MultiCraft Developement Team (MIT)
|
||||
MultiCraft Development Team (MIT)
|
||||
|
|
|
@ -6,7 +6,7 @@ Copyright (C) 2014-2016 xyz
|
|||
Copyright (C) 2014-2016 BlockMen
|
||||
Copyright (C) 2016 Auke Kok <sofar@foo-projects.org>
|
||||
Copyright (C) 2014-2016 Various Minetest developers and contributors
|
||||
Copyright (C) 2019 MultiCraft Developement Team
|
||||
Copyright (C) 2019 MultiCraft Development Team
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of this
|
||||
software and associated documentation files (the "Software"), to deal in the Software
|
||||
|
|
|
@ -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