MultiCraft
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update 1

master
Maksim Gamarnik 2015-11-27 12:03:23 +02:00
parent 18204b95ed
commit 96325da676
26 changed files with 60 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/android/Makefile
View File

@ -80,11 +80,12 @@ OGG_TIMESTAMP = $(OGG_DIR)timestamp
OGG_TIMESTAMP_INT = $(ROOT)/deps/ogg_timestamp
OGG_URL_GIT = https://github.com/vincentjames501/libvorbis-libogg-android
IRRLICHT_REVISION = 5122
IRRLICHT_DIR = $(ROOT)/deps/irrlicht/
IRRLICHT_LIB = $(IRRLICHT_DIR)lib/Android/libIrrlicht.a
IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)timestamp
IRRLICHT_TIMESTAMP_INT = $(ROOT)/deps/irrlicht_timestamp
IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es/
IRRLICHT_URL_SVN = http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@$(IRRLICHT_REVISION)
OPENSSL_VERSION = 1.0.1p
OPENSSL_BASEDIR = openssl-$(OPENSSL_VERSION)

6
build/android/res/values-w820dp/dimens.xml
View File

@ -1,6 +0,0 @@
<resources>
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
(such as screen margins) for screens with more than 820dp of available width. This
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
<dimen name="activity_horizontal_margin">64dp</dimen>
</resources>

2
builtin/mainmenu/common.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/dlg_config_world.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

4
builtin/mainmenu/dlg_create_world.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,
@ -111,7 +111,7 @@ local function create_world_buttonhandler(this, fields)
core.setting_set("fixed_map_seed", fields["te_seed"])
if not menudata.worldlist:uid_exists_raw(worldname) then
core.setting_set("mg_name","v6")
core.setting_set("mg_name","v7")
message = core.create_world(worldname,gameindex)
else
message = fgettext("A world named \"$1\" already exists", worldname)

2
builtin/mainmenu/dlg_delete_mod.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/dlg_delete_world.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/dlg_rename_modpack.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/gamemgr.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/init.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/modmgr.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/store.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/tab_credits.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/tab_mods.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/tab_multiplayer.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/tab_server.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/tab_settings.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/tab_singleplayer.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/tab_texturepacks.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

2
builtin/mainmenu/textures.lua
View File

@ -3,7 +3,7 @@
--
--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 2.1 of the License, or
--the Free Software Foundation; either version 3.0 of the License, or
--(at your option) any later version.
--
--This program is distributed in the hope that it will be useful,

12
multicraft.conf
View File

@ -1 +1,11 @@
mainmenu_last_selected_world = 1
mainmenu_last_selected_world = 2
fixed_map_seed =
menu_last_game = SnowCraft
mg_name = v7
name =
selected_world_path = /home/buildserver/MultiCraft/bin/../worlds/jhnngnhm
server_dedicated = false
wieldview_node_tiles = false
wieldview_update_time = 2
creative_mode = false
enable_damage = true

4
src/config.h
View File

@ -13,8 +13,8 @@
#if defined USE_CMAKE_CONFIG_H
#include "cmake_config.h"
#elif defined (__ANDROID__) || defined (ANDROID)
#define PROJECT_NAME "MultiCraft2"
#define PROJECT_NAME_C "MultiCraft2"
#define PROJECT_NAME "MultiCraft"
#define PROJECT_NAME_C "MultiCraft"
#define STATIC_SHAREDIR ""
#include "android_version.h"
#ifdef NDEBUG

14
src/defaultsettings.cpp
View File

@ -308,7 +308,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("liquid_update", "1.0");
//mapgen stuff
settings->setDefault("mg_name", "v6");
settings->setDefault("mg_name", "v7");
settings->setDefault("water_level", "1");
settings->setDefault("chunksize", "5");
settings->setDefault("mg_flags", "dungeons");
@ -336,24 +336,24 @@ void set_default_settings(Settings *settings)
settings->setDefault("fullscreen", "true");
settings->setDefault("enable_particles", "false");
settings->setDefault("video_driver", "ogles1");
//settings->setDefault("touchtarget", "false");
settings->setDefault("touchtarget", "true");
settings->setDefault("TMPFolder","/sdcard/" PROJECT_NAME_C "/tmp/");
settings->setDefault("touchscreen_threshold","20");
settings->setDefault("smooth_lighting", "false");
settings->setDefault("emergequeue_limit_diskonly", "8");
settings->setDefault("emergequeue_limit_generate", "8");
settings->setDefault("max_block_generate_distance", "3");
settings->setDefault("preload_item_visuals", "false");
settings->setDefault("viewing_range_nodes_max", "75");
settings->setDefault("viewing_range_nodes_min", "10");
settings->setDefault("viewing_range_nodes_max", "50");
settings->setDefault("viewing_range_nodes_min", "5");
settings->setDefault("enable_node_highlighting", "true");
settings->setDefault("inventory_image_hack", "true");
settings->setDefault("minimap_double_scan_height", "false");
settings->setDefault("mouse_sensitivity", "0.05");
settings->setDefault("enable_3d_clouds", "false");
settings->setDefault("max_block_send_distance", "5");
settings->setDefault("max_block_generate_distance", "3");
settings->setDefault("wanted_fps", "20");
settings->setDefault("fps_max", "35");
settings->setDefault("fps_max", "30");
settings->setDefault("pause_fps_max", "10");
//check for device with small screen
float x_inches = ((double) porting::getDisplaySize().X /
@ -377,4 +377,4 @@ void override_default_settings(Settings *settings, Settings *from)
const std::string &name = names[i];
settings->setDefault(name, from->get(name));
}
}
}

8
src/game.cpp
View File

@ -1110,7 +1110,7 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
// " --> place single item to slot\n"
// ));
#else
std::string control_text = wide_to_narrow(wstrgettext("Default Controls:\n"
std::string control_text = strgettext("Default Controls:\n"
"- WASD: move\n"
"- Space: jump/climb\n"
"- Shift: sneak/go down\n"
@ -1121,7 +1121,7 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
"- Mouse right: place/use\n"
"- Mouse wheel: select item\n"
"- T: chat\n"
));
);
#endif
float ypos = singleplayermode ? 0.5 : 0.1;
@ -1141,11 +1141,11 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
<< strgettext("Sound Volume") << "]";
os << "button_exit[" << PAUSE_MENU_BUTTON_LEFT << "," << (ypos++) << ";3,0.5;btn_key_config;"
<< strgettext("Change Keys") << "]";
#endif
os << "button_exit[" << PAUSE_MENU_BUTTON_LEFT << "," << (ypos++) << ";3,0.5;btn_exit_menu;"
<< strgettext("Exit to Menu") << "]";
#endif
os << "button_exit[" << PAUSE_MENU_BUTTON_LEFT << "," << (ypos++) << ";3,0.5;btn_exit_os;"
<< strgettext("Exit to OS") << "]"
<< strgettext("Exit") << "]"
#ifndef __ANDROID__
<< "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]"
<< "textarea[0.4,0.25;3.5,6;;" << PROJECT_NAME_C "\n"

31
src/touchscreengui.cpp
View File

@ -52,11 +52,11 @@ const char *touchgui_button_imagenames[] = {
"fly_btn.png",
"noclip_btn.png",
#endif
"minimap_btn.png",
// "minimap_btn.png",
"debug_btn.png",
"chat_btn.png",
// "camera_btn.png",
"rangeview_btn.png"
// "rangeview_btn.png"
};
static irr::EKEY_CODE id2keycode(touch_gui_button_id id)
@ -95,12 +95,12 @@ static irr::EKEY_CODE id2keycode(touch_gui_button_id id)
key = "noclip";
break;
case fast_id:
key = "minimap";
key = "fast";
break;
#endif
case minimap_id:
/* case minimap_id:
key = "minimap";
break;
break;*/
case debug_id:
key = "toggle_debug";
break;
@ -110,9 +110,9 @@ static irr::EKEY_CODE id2keycode(touch_gui_button_id id)
/* case camera_id:
key = "camera_mode";
break;*/
case range_id:
/* case range_id:
key = "rangeselect";
break;
break;*/
}
assert(key != "");
return keyname_to_keycode(g_settings->get("keymap_" + key).c_str());
@ -299,12 +299,12 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density)
L"fast", false, SLOW_BUTTON_REPEAT);
#endif
/* init minimap button */
initButton(minimap_id,
/* initButton(minimap_id,
rect<s32>(m_screensize.X - (0.75*button_size),
m_screensize.Y - (4*button_size),
m_screensize.X,
m_screensize.Y - (button_size*3.25)),
L"minimap", false, SLOW_BUTTON_REPEAT);
L"minimap", false, SLOW_BUTTON_REPEAT);*/
#ifndef NDEBUG
/* init debug button */
initButton(debug_id,
@ -326,12 +326,12 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc, float density)
L"cam", false, SLOW_BUTTON_REPEAT);*/
/* init rangeselect button */
initButton(range_id,
/* initButton(range_id,
rect<s32>(0, 0,
0.75*button_size, 0.75*button_size),
0.75*button_size, 0.75*button_size),*/
/*rect<s32>(0.78 * button_size, 0,
1.5 * button_size, 0.75*button_size+0.03),*/
L"far", false, SLOW_BUTTON_REPEAT);
/*L"far", false, SLOW_BUTTON_REPEAT);*/
}
touch_gui_button_id TouchScreenGUI::getButtonID(s32 x, s32 y)
@ -554,17 +554,14 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
translated->MouseInput.Event = EMIE_LMOUSE_LEFT_UP;
m_receiver->OnEvent(*translated);
delete translated;
doubleTapDetection();
m_shootline = m_device
->getSceneManager()
->getSceneCollisionManager()
->getRayFromScreenCoordinates(
v2s32(event.TouchInput.X,event.TouchInput.Y));
}
else {
/* do double tap detection */
doubleTapDetection();
}
}
else {
infostream

2
src/touchscreengui.h
View File

@ -49,7 +49,7 @@ typedef enum {
noclip_id,
fast_id,
#endif
minimap_id,
// minimap_id,
debug_id,
chat_id,
// camera_id,