diff --git a/README.md b/README.md index 3f1ba9861..4a6c88649 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,10 @@ MultiCraft is based on Minetest project which is developed by a [number of contr Copyright (c) 2014-2015 Maksim Gamarnik [MoNTE48] & MultiCraft Developement Team. -The engine and the game is licensed under LGPLv3 (or higher). Resources games licensed under CC-BY-SA 3.0, unless otherwise stated. +The engine and the game is licensed under LGPLv3 (or higher). Resources games licensed under CC-BY-SA 4.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 [License notice](License%20notice%20on%20adbs%20and%204hunger%20mods%20(ENG).txt). +Before any use of source code MultiCraft or any part of you should be familiar with [LGPL-3.0](doc/LGPL-3.0.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 owner of the project and the creation of appropriate notes. \ No newline at end of file diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index 7d7ffc606..f7b659861 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -81,7 +81,7 @@ local function init_globals() menudata.worldlist:set_sortmode("alphabetic") if not core.setting_get("menu_last_game") then - local default_game = core.setting_get("default_game") or "PixelCraft" + local default_game = core.setting_get("default_game") or "default" core.setting_set("menu_last_game", default_game ) end diff --git a/doc/Other License.txt b/doc/Other License.txt index ba2f8cb3a..98eda8cb2 100644 --- a/doc/Other License.txt +++ b/doc/Other License.txt @@ -147,3 +147,34 @@ DroidSansFallback: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + +basis33 is a fixed-width bitmap font for programming and text editing, which contains Latin, Cyrillic, Greek and Hebrew characters. + +It’s designed by Manchson basing on Latin-only font Proggy Clean by Tristan Grimmer. + +basis33 is free/libre software, you are welcome to redistribute and/or modify it under the terms of MIT/Expat license; see LICENSE for details. + + + The MIT License (MIT) + +Copyright (c) 2004, 2005 Tristan Grimmer +Copyright (c) 2014 Manchson + +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 without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/doc/README.android b/doc/README.android deleted file mode 100644 index 0b17647c0..000000000 --- a/doc/README.android +++ /dev/null @@ -1,130 +0,0 @@ -Minetest Android port -===================== -Date: 2014 06 28 - -Controls --------- -The Android port doesn't support everything you can do on PC due to the -limited capabilities of common devices. What can be done is described -below: - -While you're playing the game normally (that is, no menu or inventory is -shown), the following controls are available: -* Look around: touch screen and slide finger -* double tap: place a node or use selected item -* long tap: dig node -* touch shown buttons: press button -* Buttons: -** left upper corner: chat -** right lower corner: jump -** right lower corner: crouch -** left lower corner: walk/step... - left up right - down -** left lower corner: display inventory - -When a menu or inventory is displayed: -* double tap outside menu area: close menu -* tap on an item stack: select that stack -* tap on an empty slot: if you selected a stack already, that stack is placed here -* drag and drop: touch stack and hold finger down, move the stack to another - slot, tap another finger while keeping first finger on screen - --> places a single item from dragged stack into current (first touched) slot - -Special settings ----------------- -There are some settings especially useful for Android users. Minetest's config -file can usually be found at /mnt/sdcard/Minetest. - -* gui_scaling: this is a user-specified scaling factor for the GUI- In case - main menu is too big or small on your device, try changing this - value. -* inventory_image_hack: if your inventory items are messed up, try setting - this to true - -Known issues ------------- -Not all issues are fixed by now: - -* Unable to exit from volume menu -- don't use the volume menu, use Android's - volume controls instead. -* 512 MB RAM seems to be inadequate -- this depends on the server you join. - Try to play on more lightweight servers. - -Versioning ----------- -Android version numbers are 4 digits instead of Minetest's 3 digits. The last -number of Android's version represents the Android internal version code. This -version code is strictly incremental. It's incremented for each official -Minetest Android build. - -E.g. prerelease Minetest Android builds have been 0.4.9.3, while the first -official version most likely will be 0.4.10.4 - -Requirements ------------- - -In order to build, your PC has to be set up to build Minetest in the usual -manner (see the regular Minetest documentation for how to get this done). -In addition to what is required for Minetest in general, you will need the -following software packages. The version number in parenthesis denotes the -version that was tested at the time this README was drafted; newer/older -versions may or may not work. - -* android SDK (x86_64 20131030) -* android NDK (r9d) -* wget (1.13.4) - -Additionally, you'll need to have an Internet connection available on the -build system, as the Android build will download some source packages. - -Build ------ - -Debug build: -* Enter "build/android" subdirectory -* Execute "make" -* Answer the questions about where SDK and NDK are located on your filesystem -* Wait for build to finish - -After the build is finished, the resulting apk can be fond in -build/android/bin/. It will be called Minetest-debug.apk - -Release build: - -* In order to make a release build you'll have to have a keystore setup to sign - the resulting apk package. How this is done is not part of this README. There - are different tutorials on the web explaining how to do it - - choose one yourself. - -* Once your keystore is setup, enter build/android subdirectory and create a new - file "ant.properties" there. Add following lines to that file: - - > key.store= - > key.alias=Minetest - -* Execute "make release" -* Enter your keystore as well as your Mintest key password once asked. Be - careful it's shown on console in clear text! -* The result can be found at "bin/Minetest-release.apk" - -Other things that may be nice to know ------------- -* The environment for Android development tools is saved within Android build - build folder. If you want direct access to it do: - - > make envpaths - > . and_env - - After you've done this you'll have your path and path variables set correct - to use adb and all other Android development tools - -* You can build a single dependency by calling make and the dependency's name, - e.g.: - - > make irrlicht - -* You can completely cleanup a dependency by calling make and the "clean" target, - e.g.: - - > make clean_irrlicht diff --git a/fonts/basis33.ttf b/fonts/basis33.ttf new file mode 100644 index 000000000..b20255b29 Binary files /dev/null and b/fonts/basis33.ttf differ diff --git a/fonts/liberationsans.ttf b/fonts/liberationsans.ttf deleted file mode 100644 index 59d2e251b..000000000 Binary files a/fonts/liberationsans.ttf and /dev/null differ diff --git a/textures/base/pack/background.jpg b/textures/base/pack/background.jpg index e4be16406..9695e7bae 100644 Binary files a/textures/base/pack/background.jpg and b/textures/base/pack/background.jpg differ diff --git a/textures/base/pack/chat.png b/textures/base/pack/chat.png new file mode 100644 index 000000000..5e98583c7 Binary files /dev/null and b/textures/base/pack/chat.png differ diff --git a/textures/base/pack/chat_btn.png b/textures/base/pack/chat_btn.png deleted file mode 100644 index ffc0c8bc9..000000000 Binary files a/textures/base/pack/chat_btn.png and /dev/null differ diff --git a/textures/base/pack/down.png b/textures/base/pack/down.png index 81971be71..1278b6f49 100644 Binary files a/textures/base/pack/down.png and b/textures/base/pack/down.png differ diff --git a/textures/base/pack/down_arrow.png b/textures/base/pack/down_arrow.png deleted file mode 100644 index 20f2759b6..000000000 Binary files a/textures/base/pack/down_arrow.png and /dev/null differ diff --git a/textures/base/pack/down_one.png b/textures/base/pack/down_one.png new file mode 100644 index 000000000..193f2a8c0 Binary files /dev/null and b/textures/base/pack/down_one.png differ diff --git a/textures/base/pack/down_three.png b/textures/base/pack/down_three.png new file mode 100644 index 000000000..66347c7df Binary files /dev/null and b/textures/base/pack/down_three.png differ diff --git a/textures/base/pack/down_two.png b/textures/base/pack/down_two.png new file mode 100644 index 000000000..c8bacfa03 Binary files /dev/null and b/textures/base/pack/down_two.png differ diff --git a/textures/base/pack/drop.png b/textures/base/pack/drop.png new file mode 100644 index 000000000..c676a7014 Binary files /dev/null and b/textures/base/pack/drop.png differ diff --git a/textures/base/pack/drop_btn.png b/textures/base/pack/drop_btn.png deleted file mode 100644 index 400af6217..000000000 Binary files a/textures/base/pack/drop_btn.png and /dev/null differ diff --git a/textures/base/pack/inventory_btn.png b/textures/base/pack/inventory.png similarity index 100% rename from textures/base/pack/inventory_btn.png rename to textures/base/pack/inventory.png diff --git a/textures/base/pack/jump.png b/textures/base/pack/jump.png new file mode 100644 index 000000000..307cf83cf Binary files /dev/null and b/textures/base/pack/jump.png differ diff --git a/textures/base/pack/jump_btn.png b/textures/base/pack/jump_btn.png deleted file mode 100644 index c8a13cabe..000000000 Binary files a/textures/base/pack/jump_btn.png and /dev/null differ diff --git a/textures/base/pack/left.png b/textures/base/pack/left.png new file mode 100644 index 000000000..0e55aafb7 Binary files /dev/null and b/textures/base/pack/left.png differ diff --git a/textures/base/pack/left_arrow.png b/textures/base/pack/left_arrow.png deleted file mode 100644 index c2a78c194..000000000 Binary files a/textures/base/pack/left_arrow.png and /dev/null differ diff --git a/textures/base/pack/rangeview.png b/textures/base/pack/rangeview.png new file mode 100644 index 000000000..14e0e2631 Binary files /dev/null and b/textures/base/pack/rangeview.png differ diff --git a/textures/base/pack/rangeview_btn.png b/textures/base/pack/rangeview_btn.png deleted file mode 100644 index 4fd9ed4a6..000000000 Binary files a/textures/base/pack/rangeview_btn.png and /dev/null differ diff --git a/textures/base/pack/right.png b/textures/base/pack/right.png new file mode 100644 index 000000000..f8943f081 Binary files /dev/null and b/textures/base/pack/right.png differ diff --git a/textures/base/pack/right_arrow.png b/textures/base/pack/right_arrow.png deleted file mode 100644 index 2d0c6d871..000000000 Binary files a/textures/base/pack/right_arrow.png and /dev/null differ diff --git a/textures/base/pack/up_arrow.png b/textures/base/pack/up_arrow.png deleted file mode 100644 index 3a99730b5..000000000 Binary files a/textures/base/pack/up_arrow.png and /dev/null differ diff --git a/textures/base/pack/up_one.png b/textures/base/pack/up_one.png new file mode 100644 index 000000000..20ca04532 Binary files /dev/null and b/textures/base/pack/up_one.png differ diff --git a/textures/base/pack/up_three.png b/textures/base/pack/up_three.png new file mode 100644 index 000000000..37b84ae78 Binary files /dev/null and b/textures/base/pack/up_three.png differ diff --git a/textures/base/pack/up_two.png b/textures/base/pack/up_two.png new file mode 100644 index 000000000..d1c758c07 Binary files /dev/null and b/textures/base/pack/up_two.png differ