Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

name change! we are now voxelands

This commit is contained in:
darkrose 2014-07-12 22:38:12 +10:00
parent 919c6ed62e
commit 17e9191a07
19 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -5,7 +5,7 @@ if(${CMAKE_VERSION} STREQUAL "2.8.2")
endif(${CMAKE_VERSION} STREQUAL "2.8.2") endif(${CMAKE_VERSION} STREQUAL "2.8.2")
# This can be read from ${PROJECT_NAME} after project() is called # This can be read from ${PROJECT_NAME} after project() is called
project(minetest-classic) project(voxelands)
# Also remember to set PROTOCOL_VERSION in clientserver.h when releasing # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
set(VERSION_MAJOR 1405) set(VERSION_MAJOR 1405)
@ -68,7 +68,7 @@ endif()
install(FILES "README.txt" DESTINATION "${DOCDIR}") install(FILES "README.txt" DESTINATION "${DOCDIR}")
install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}") install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}") install(FILES "voxelands.conf.example" DESTINATION "${DOCDIR}")
# #
# Subdirectories # Subdirectories
@ -79,21 +79,21 @@ add_subdirectory(src)
# CPack # CPack
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "An InfiniMiner/Minecraft inspired game") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The Fun-Focused Free Software Voxel World Game")
set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}) set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
set(CPACK_PACKAGE_VENDOR "celeron55") set(CPACK_PACKAGE_VENDOR "darkrose")
set(CPACK_PACKAGE_CONTACT "Perttu Ahola <celeron55@gmail.com>") set(CPACK_PACKAGE_CONTACT "Lisa 'darkrose' Milne <lisa@ltmnet.com>")
if(WIN32) if(WIN32)
# For some reason these aren't copied otherwise # For some reason these aren't copied otherwise
# NOTE: For some reason now it seems to work without these # NOTE: For some reason now it seems to work without these
#if(BUILD_CLIENT) #if(BUILD_CLIENT)
# install(FILES bin/minetest-classic.exe DESTINATION bin) # install(FILES bin/voxelands.exe DESTINATION bin)
#endif() #endif()
#if(BUILD_SERVER) #if(BUILD_SERVER)
# install(FILES bin/minetest-classic-server.exe DESTINATION bin) # install(FILES bin/voxelands-server.exe DESTINATION bin)
#endif() #endif()
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32") set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32")
@ -101,7 +101,7 @@ if(WIN32)
set(CPACK_GENERATOR ZIP) set(CPACK_GENERATOR ZIP)
# This might be needed for some installer # This might be needed for some installer
#set(CPACK_PACKAGE_EXECUTABLES bin/minetest-classic.exe "Minetest" bin/minetest-classic-server.exe "Minetest Server") #set(CPACK_PACKAGE_EXECUTABLES bin/voxelands.exe "Voxelands" bin/voxelands-server.exe "Voxelands Server")
elseif(APPLE) elseif(APPLE)
# TODO # TODO
# see http://cmake.org/Wiki/CMake:CPackPackageGenerators#Bundle_.28OSX_only.29 # see http://cmake.org/Wiki/CMake:CPackPackageGenerators#Bundle_.28OSX_only.29

0
po/da/minetest.po → po/da/voxelands.po
View File

0
po/de/minetest.po → po/de/voxelands.po
View File

0
po/fr/minetest.po → po/fr/voxelands.po
View File

0
po/it/minetest.po → po/it/voxelands.po
View File

15
src/CMakeLists.txt
View File

@ -1,4 +1,4 @@
project(minetest-classic) project(voxelands)
cmake_minimum_required( VERSION 2.6 ) cmake_minimum_required( VERSION 2.6 )
if(RUN_IN_PLACE) if(RUN_IN_PLACE)
@ -99,6 +99,7 @@ set(common_SRCS
content_craftitem.cpp content_craftitem.cpp
content_toolitem.cpp content_toolitem.cpp
content_mapnode.cpp content_mapnode.cpp
content_mapnode_util.cpp
content_list.cpp content_list.cpp
content_nodebox.cpp content_nodebox.cpp
auth.cpp auth.cpp
@ -149,7 +150,7 @@ if(WIN32)
endif() endif()
# Client sources # Client sources
set(minetest_SRCS set(voxelands_SRCS
${common_SRCS} ${common_SRCS}
content_mapblock.cpp content_mapblock.cpp
content_cao.cpp content_cao.cpp
@ -175,7 +176,7 @@ set(minetest_SRCS
) )
# Server sources # Server sources
set(minetestserver_SRCS set(voxelandsserver_SRCS
${common_SRCS} ${common_SRCS}
servermain.cpp servermain.cpp
) )
@ -194,7 +195,7 @@ include_directories(
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin") set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
if(BUILD_CLIENT) if(BUILD_CLIENT)
add_executable(${PROJECT_NAME} ${minetest_SRCS}) add_executable(${PROJECT_NAME} ${voxelands_SRCS})
target_link_libraries( target_link_libraries(
${PROJECT_NAME} ${PROJECT_NAME}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
@ -213,7 +214,7 @@ if(BUILD_CLIENT)
endif(BUILD_CLIENT) endif(BUILD_CLIENT)
if(BUILD_SERVER) if(BUILD_SERVER)
add_executable(${PROJECT_NAME}-server ${minetestserver_SRCS}) add_executable(${PROJECT_NAME}-server ${voxelandsserver_SRCS})
target_link_libraries( target_link_libraries(
${PROJECT_NAME}-server ${PROJECT_NAME}-server
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
@ -293,7 +294,7 @@ endif()
# #
# Example configuration file # Example configuration file
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR}) install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../voxelands.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
if(BUILD_CLIENT) if(BUILD_CLIENT)
install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
@ -341,7 +342,7 @@ if (USE_GETTEXT)
set(MO_FILES) set(MO_FILES)
foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES}) foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/minetest.po") set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/voxelands.po")
set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE}) set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo") set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")

4
src/content_craftitem.cpp
View File

@ -1,7 +1,7 @@
/************************************************************************ /************************************************************************
* content_craftitem.cpp * content_craftitem.cpp
* minetest-classic - 3d voxel world sandbox game * voxelands - 3d voxel world sandbox game
* Copyright (C) Lisa Milne 2013 <lisa@ltmnet.com> * Copyright (C) Lisa Milne 2014 <lisa@ltmnet.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
src/content_list.cpp
View File

@ -1,6 +1,6 @@
/************************************************************************ /************************************************************************
* content_list.cpp * content_list.cpp
* minetest-classic - 3d voxel world sandbox game * voxelands - 3d voxel world sandbox game
* Copyright (C) Lisa Milne 2014 <lisa@ltmnet.com> * Copyright (C) Lisa Milne 2014 <lisa@ltmnet.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify

4
src/content_toolitem.cpp
View File

@ -1,7 +1,7 @@
/************************************************************************ /************************************************************************
* content_toolitem.cpp * content_toolitem.cpp
* minetest-classic - 3d voxel world sandbox game * voxelands - 3d voxel world sandbox game
* Copyright (C) Lisa Milne 2013 <lisa@ltmnet.com> * Copyright (C) Lisa Milne 2014 <lisa@ltmnet.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

6
src/game.cpp
View File

@ -903,7 +903,7 @@ void the_game(
// First line of debug text // First line of debug text
gui::IGUIStaticText *guitext = guienv->addStaticText( gui::IGUIStaticText *guitext = guienv->addStaticText(
L"Minetest-Classic", L"Voxelands",
core::rect<s32>(5, 5, 795, 5+text_height), core::rect<s32>(5, 5, 795, 5+text_height),
false, false); false, false);
// Second line of debug text // Second line of debug text
@ -2063,7 +2063,7 @@ void the_game(
Update gui stuff (0ms) Update gui stuff (0ms)
*/ */
const char program_name_and_version[] = const char program_name_and_version[] =
"Minetest-Classic " VERSION_STRING; "Voxelands " VERSION_STRING;
if(show_debug) if(show_debug)
{ {
static float drawtime_avg = 0; static float drawtime_avg = 0;
@ -2403,7 +2403,7 @@ void the_game(
if (lastFPS != fps) if (lastFPS != fps)
{ {
core::stringw str = L"Minetest Classic ["; core::stringw str = L"Voxelands [";
str += driver->getName(); str += driver->getName();
str += "] FPS="; str += "] FPS=";
str += fps; str += fps;

4
src/guiMainMenu.cpp
View File

@ -451,8 +451,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
rect += topleft_content + v2s32(0, 50); rect += topleft_content + v2s32(0, 50);
gui::IGUIStaticText *t = Environment->addStaticText( gui::IGUIStaticText *t = Environment->addStaticText(
narrow_to_wide( narrow_to_wide(
"Minetest-Classic\n" "Voxelands\n"
"http://www.minetest-classic.com/\n" "http://www.voxelands.com/\n"
"\n" "\n"
"By Lisa 'darkrose' Milne <lisa@ltmnet.com>\n" "By Lisa 'darkrose' Milne <lisa@ltmnet.com>\n"
"and contributers: sdzen, MichaelEh?, Pentium44, Jordach, Menche, MavJS, tiemay\n" "and contributers: sdzen, MichaelEh?, Pentium44, Jordach, Menche, MavJS, tiemay\n"

6
src/guiPauseMenu.cpp
View File

@ -113,7 +113,7 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
} }
std::ostringstream os; std::ostringstream os;
os<<"Minetest-Classic by darkrose and contributors"; os<<"Voxelands by darkrose and contributors";
Environment->addStaticText(narrow_to_wide(os.str()).c_str(), rect, false, true, this, 259); Environment->addStaticText(narrow_to_wide(os.str()).c_str(), rect, false, true, this, 259);
} }
@ -128,7 +128,7 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
} }
std::ostringstream os; std::ostringstream os;
os<<"www.minetest-classic.com"; os<<"www.voxelands.com";
Environment->addStaticText(narrow_to_wide(os.str()).c_str(), rect, false, true, this, 259); Environment->addStaticText(narrow_to_wide(os.str()).c_str(), rect, false, true, this, 259);
} }
@ -143,7 +143,7 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
} }
std::ostringstream os; std::ostringstream os;
os<<"darkrose@minetest-classic.com"; os<<"darkrose@voxelands.com";
Environment->addStaticText(narrow_to_wide(os.str()).c_str(), rect, false, true, this, 259); Environment->addStaticText(narrow_to_wide(os.str()).c_str(), rect, false, true, this, 259);
} }

6
src/main.cpp
View File

@ -1251,10 +1251,10 @@ int main(int argc, char *argv[])
{ {
core::array<std::string> filenames; core::array<std::string> filenames;
filenames.push_back(porting::path_userdata + filenames.push_back(porting::path_userdata +
DIR_DELIM + "minetest.conf"); DIR_DELIM + "voxelands.conf");
#ifdef RUN_IN_PLACE #ifdef RUN_IN_PLACE
filenames.push_back(porting::path_userdata + filenames.push_back(porting::path_userdata +
DIR_DELIM + ".." + DIR_DELIM + "minetest.conf"); DIR_DELIM + ".." + DIR_DELIM + "voxelands.conf");
#endif #endif
for(u32 i=0; i<filenames.size(); i++) for(u32 i=0; i<filenames.size(); i++)
@ -1430,7 +1430,7 @@ int main(int argc, char *argv[])
//driver->setMinHardwareBufferVertexCount(50); //driver->setMinHardwareBufferVertexCount(50);
// Set the window caption // Set the window caption
device->setWindowCaption(L"Minetest [Main Menu]"); device->setWindowCaption(L"Voxelands [Main Menu]");
// Create time getter // Create time getter
g_timegetter = new IrrlichtTimeGetter(device); g_timegetter = new IrrlichtTimeGetter(device);

4
src/server.cpp
View File

@ -2120,9 +2120,9 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
if (getClient(peer_id)->net_proto_version < PROTOCOL_VERSION) { if (getClient(peer_id)->net_proto_version < PROTOCOL_VERSION) {
SendChatMessage(peer_id, L"# Server: WARNING: YOUR CLIENT IS OLD AND MAY NOT WORK PROPERLY WITH THIS SERVER"); SendChatMessage(peer_id, L"# Server: WARNING: YOUR CLIENT IS OLD AND MAY NOT WORK PROPERLY WITH THIS SERVER");
if (getClient(peer_id)->net_proto_version == PROTOCOL_DOTTHREE) { if (getClient(peer_id)->net_proto_version == PROTOCOL_DOTTHREE) {
SendChatMessage(peer_id, L"# Server: Please update to Minetest Classic http://www.minetest-classic.com"); SendChatMessage(peer_id, L"# Server: Please update to Voxelands http://www.voxelands.com");
}else{ }else{
SendChatMessage(peer_id, L"# Server: The latest client can be downloaded from http://www.minetest-classic.com/download.html"); SendChatMessage(peer_id, L"# Server: The latest client can be downloaded from http://www.voxelands.com/download.html");
} }
} }

0
minetest-icon-24x24.png → voxelands-icon-24x24.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 913 B

After

Width:  |  Height:  |  Size: 913 B

0
minetest-icon.ico → voxelands-icon.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

0
minetest-icon.svg → voxelands-icon.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

0
minetest.conf.example → voxelands.conf.example
View File

8
minetest-classic.desktop → voxelands.desktop
View File

@ -1,9 +1,9 @@
[Desktop Entry] [Desktop Entry]
Name=Minetest Classic Name=Voxelands
GenericName=Minetest Classic GenericName=Voxelands
Comment=3D Voxel World Game Comment=3D Voxel World Game
Icon=minetest-icon Icon=voxelands-icon
Exec=minetest-classic Exec=voxelands
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Game; Categories=Game;