From c2e7b1f57941cb34cb7e3d71dc040fad53a64e3e Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Tue, 31 Jan 2017 16:43:45 +0000 Subject: Derive NodeMetaRef from MetaDataRef --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index d7e0daab4..c2600afeb 100644 --- a/.gitignore +++ b/.gitignore @@ -74,6 +74,7 @@ locale/ *.a *.ninja .ninja* +*.gch ## Android build files build/android/src/main/assets @@ -86,4 +87,3 @@ build/android/obj build/android/local.properties build/android/.gradle timestamp - -- cgit v1.2.3 From be0663696514dd3d3525949be7c317c9eae9dbb0 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Thu, 6 Apr 2017 15:37:02 +0200 Subject: Clang-format continuation indent fixes + .gitignore additions * Proper support for continuation indents in clang format * make src/wieldmesh.h proper and remove it from whitelist * Add CLion default build directories in .gitignore --- .clang-format | 2 ++ .gitignore | 2 ++ src/wieldmesh.h | 20 ++++++++------------ util/travis/clang-format-whitelist.txt | 1 - 4 files changed, 12 insertions(+), 13 deletions(-) (limited to '.gitignore') diff --git a/.clang-format b/.clang-format index 63d884a09..05a6b3385 100644 --- a/.clang-format +++ b/.clang-format @@ -21,3 +21,5 @@ IncludeCategories: Priority: 2 - Regex: '^<.*' Priority: 1 +AlignAfterOpenBracket: DontAlign +ContinuationIndentWidth: 16 diff --git a/.gitignore b/.gitignore index c2600afeb..c51cced03 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,8 @@ locale/ *.ninja .ninja* *.gch +cmake-build-debug/ +cmake-build-release/ ## Android build files build/android/src/main/assets diff --git a/src/wieldmesh.h b/src/wieldmesh.h index 2e78232ae..200587058 100644 --- a/src/wieldmesh.h +++ b/src/wieldmesh.h @@ -20,8 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef WIELDMESH_HEADER #define WIELDMESH_HEADER -#include "irrlichttypes_extrabloated.h" #include +#include "irrlichttypes_extrabloated.h" struct ItemStack; class Client; @@ -31,30 +31,27 @@ struct TileSpec; /* Wield item scene node, renders the wield mesh of some item */ -class WieldMeshSceneNode: public scene::ISceneNode +class WieldMeshSceneNode : public scene::ISceneNode { public: WieldMeshSceneNode(scene::ISceneNode *parent, scene::ISceneManager *mgr, s32 id = -1, bool lighting = false); virtual ~WieldMeshSceneNode(); - void setCube(const TileSpec tiles[6], - v3f wield_scale, ITextureSource *tsrc); - void setExtruded(const std::string &imagename, - v3f wield_scale, ITextureSource *tsrc, u8 num_frames); + void setCube(const TileSpec tiles[6], v3f wield_scale, ITextureSource *tsrc); + void setExtruded(const std::string &imagename, v3f wield_scale, + ITextureSource *tsrc, u8 num_frames); void setItem(const ItemStack &item, Client *client); // Sets the vertex color of the wield mesh. // Must only be used if the constructor was called with lighting = false void setColor(video::SColor color); - scene::IMesh *getMesh() - { return m_meshnode->getMesh(); } + scene::IMesh *getMesh() { return m_meshnode->getMesh(); } virtual void render(); - virtual const aabb3f &getBoundingBox() const - { return m_bounding_box; } + virtual const aabb3f &getBoundingBox() const { return m_bounding_box; } private: void changeToMesh(scene::IMesh *mesh); @@ -84,6 +81,5 @@ private: scene::IMesh *getItemMesh(Client *client, const ItemStack &item); -scene::IMesh *getExtrudedMesh(ITextureSource *tsrc, - const std::string &imagename); +scene::IMesh *getExtrudedMesh(ITextureSource *tsrc, const std::string &imagename); #endif diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt index 352fe2973..0dcc7713d 100644 --- a/util/travis/clang-format-whitelist.txt +++ b/util/travis/clang-format-whitelist.txt @@ -438,4 +438,3 @@ src/voxelalgorithms.h src/voxel.cpp src/voxel.h src/wieldmesh.cpp -src/wieldmesh.h -- cgit v1.2.3 From 98286a24bce14627295230fd3b846abf9641c086 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Fri, 14 Apr 2017 09:26:11 +0200 Subject: Fix android build --- .gitignore | 1 + build/android/Makefile | 5 ++++- build/android/jni/Android.mk | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index c51cced03..ee2f0aa96 100644 --- a/.gitignore +++ b/.gitignore @@ -83,6 +83,7 @@ build/android/src/main/assets build/android/build build/android/deps build/android/libs +build/android/jni/lib build/android/jni/src build/android/src/main/jniLibs build/android/obj diff --git a/build/android/Makefile b/build/android/Makefile index d261a0e95..22700da93 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -795,7 +795,10 @@ install_release: prep_srcdir : @if [ ! -e ${ANDR_ROOT}/jni/src ]; then \ - ln -s ${PROJ_ROOT}/src ${ANDR_ROOT}/jni/src; \ + ln -s ${PROJ_ROOT}/src ${ANDR_ROOT}/jni/src; \ + fi; \ + if [ ! -e ${ANDR_ROOT}/jni/lib ]; then \ + ln -s ${PROJ_ROOT}/lib ${ANDR_ROOT}/jni/lib; \ fi clean_apk : diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 66c61029e..fd104db06 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -309,6 +309,7 @@ LOCAL_SRC_FILES += \ jni/src/script/lua_api/l_inventory.cpp \ jni/src/script/lua_api/l_item.cpp \ jni/src/script/lua_api/l_itemstackmeta.cpp\ + jni/src/script/lua_api/l_localplayer.cpp \ jni/src/script/lua_api/l_mainmenu.cpp \ jni/src/script/lua_api/l_mapgen.cpp \ jni/src/script/lua_api/l_metadata.cpp \ -- cgit v1.2.3 From 50cb503d77aa09c5dbc9b6953b06e2ed80713d8c Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sun, 21 May 2017 10:05:46 +0200 Subject: Add clientmods/mods.conf & client/mod_storage to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index ee2f0aa96..2ef4fa6df 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,8 @@ gtags.files !/mods/minetest/mods_here.txt /worlds /world/ +/clientmods/mods.conf +/client/mod_storage/ ## Configuration/log files minetest.conf -- cgit v1.2.3 From ed8215042c3fdf0f020b2870c8fb783ca839e30b Mon Sep 17 00:00:00 2001 From: red-001 Date: Wed, 31 May 2017 19:08:13 +0100 Subject: Add more files and file types to `.gitignore` (#5859) --- .gitignore | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 2ef4fa6df..7b5ecab67 100644 --- a/.gitignore +++ b/.gitignore @@ -22,9 +22,12 @@ tags !tags/ gtags.files .idea/* +# Codelite +*.project ## Files related to minetest development cycle /*.patch +*.diff # GNU Patch reject file *.rej @@ -43,13 +46,17 @@ gtags.files !/mods/minetest/mods_here.txt /worlds /world/ -/clientmods/mods.conf +/clientmods/* +!/clientmods/preview/ /client/mod_storage/ ## Configuration/log files minetest.conf debug.txt +## Other files generated by minetest +screenshot_*.png + ## Doxygen files doc/Doxyfile doc/html/ -- cgit v1.2.3