Slippery: Do not apply when swimming (#8198)

[oweals/minetest.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 77b6a2b00b7142299f6639bd90c0896c22d0f45f..6591b84bcd7abb5873ad81f229ca68c01699b0bf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1,63 @@
-## Generic ignorable patterns and files
+## Editors and Development environments
 *~
-.*.swp
-.*-swp
-*bak*
-tags
-*.vim
+*.swp
+*.bak*
 *.orig
-*.rej
+# Vim
+*.vim
+# Kate
+.*.kate-swp
+.swp.*
+# KDevelop4
+.kdev4/
+*.kdev4
+# Eclipse (CDT and LDT)
+.project
+.cproject
+.settings/
+.buildpath
+.metadata
+# GNU Global
+tags
+!tags/
+gtags.files
+.idea/*
+# Codelite
+*.project
 
 ## Files related to minetest development cycle
 /*.patch
+*.diff
+# GNU Patch reject file
+*.rej
 
-## Non-static Minetest directories
+## Non-static Minetest directories or symlinks to these
 /bin/
 /games/*
 !/games/minimal/
-/cache/
+/cache
 /textures/*
 !/textures/base/
-/sounds/
+/screenshots
+/sounds
 /mods/*
 !/mods/minetest/
 /mods/minetest/*
 !/mods/minetest/mods_here.txt
-/worlds/
+/worlds
 /world/
+/clientmods/*
+!/clientmods/preview/
+/client/mod_storage/
 
 ## Configuration/log files
 minetest.conf
 debug.txt
 
+## Other files generated by minetest
+screenshot_*.png
+testbm.txt
+
 ## Doxygen files
 doc/Doxyfile
 doc/html/
@@ -39,35 +67,47 @@ doc/doxygen_*
 CMakeFiles
 Makefile
 !build/android/Makefile
+build/android/path.cfg
+build/android/*.apk
+build/android/.externalNativeBuild
 cmake_install.cmake
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
+src/test_config.h
 src/android_version.h
 src/android_version_githash.h
 src/cmake_config.h
 src/cmake_config_githash.h
+src/unittest/test_world/world.mt
 src/lua/build/
 locale/
 .directory
-.kdev4/
 *.cbp
-*.kdev4
 *.layout
 *.o
 *.a
+*.ninja
+.ninja*
+*.gch
+*.iml
+test_config.h
+cmake-build-debug/
+cmake-build-release/
+cmake_config.h
+cmake_config_githash.h
+CMakeDoxy*
+compile_commands.json
 
 ## Android build files
-build/android/assets
-build/android/bin
-build/android/Debug
+build/android/src/main/assets
+build/android/build
 build/android/deps
-build/android/gen
-build/android/jni/src
 build/android/libs
+build/android/jni/lib
+build/android/jni/src
+build/android/src/main/jniLibs
 build/android/obj
-build/android/path.cfg
-build/android/and_env
-build/android/AndroidManifest.xml
+build/android/local.properties
+build/android/.gradle
 timestamp
-