Merge branch 'next' of gitlab.com:voxelands/voxelands into next

CMakeLists.txt

@@ -8,8 +8,8 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 project(voxelands)
 
 # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
-set(VERSION_MAJOR 1510)
-set(VERSION_MINOR 01)
+set(VERSION_MAJOR 1512)
+set(VERSION_MINOR 00)
 set(VERSION_EXTRA ":next")
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}${VERSION_EXTRA}")
 

README.txt

@@ -67,7 +67,7 @@ Action controls:
 LICENSE:
 Code:
 Voxelands is licensed under the GPLv3 or later.
-Copyright (c) 2013-2015 Lisa 'darkrose' Milne <lisa@ltmnet.com>
+Copyright (c) 2013-2016 Lisa 'darkrose' Milne <lisa@ltmnet.com>
 Forked from Minetest 0.3.x
 Copyright (c) 2010-2011 Perttu Ahola <celeron55@gmail.com>
 
@@ -78,6 +78,13 @@ This does not apply to texture packs made by others.
 Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
 http://creativecommons.org/licenses/by-sa/3.0/
 
+To satisfy the attribution clause, any project using Voxelands' assets
+ must provide a prominent notice as part of each of said project's
+ credits notices (such as in documentation, on a website, and/or any
+ other credits screen associated with the project) showing both the
+ CC-BY-SA licensing, the ownership by Voxelands of the asset, and a link
+ to the Voxelands' project at http://www.voxelands.com/.
+
 Artists include:
 sdzen
 darkrose

doc/changelog.txt

@@ -3,6 +3,30 @@ Voxelands changelog
 This should contain all the major changes.
 For minor stuff, refer to the commit log of the repository.
 
+1512.00: (release 2015-12-27)
+ - preload crack.png to reduce some HUD flicker
+ - make leaf falling work in autumn/winter
+ - fix possible bug in http_request
+ - add marble
+ - new table nodebox
+ - new chairs/benches
+ - this should have the game_mode setting working correctly on the server
+ - ensure getUser() returns a valid player name
+ - make CXX and LINKER flags use system
+ - new multiplayer menu
+ - add support for privileged crafting, add mithril key
+ - make coal block burn time equivelant to 10 coal lumps
+ - add check to ensure no tool is unwearable
+ - allow indomitus picks to dig stone + mineral
+ - allow forms to be closed with examine (q) key
+ - cobble stairs should not dig as roughstone stairs
+ - strip some unused/unneeded stuff out of networking
+ - replace TOCLIENT_OBJECTDATA with TOCLIENT_PLAYERINFO, with less data and less nested iterations
+ - generated selected/cracked nodes seperately to the rest of the mapblock
+ - remove nodemod/tempmod
+ - generate selected node data separate from mapblocks
+ - Make the electric lamp status more visible during the day
+
 1510.01: (release 2015-11-14)
  - re-enable cactus farming
  - vine on trellis should be plant type when digging