diff --git a/.gitignore b/.gitignore
index cd6785a8ec..4ef5603f52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ platform/android/java/local.properties
 platform/android/java/project.properties
 platform/android/java/libs/*
 platform/android/java/assets
-platform/android/java/.idea/*
 platform/android/java/*.iml
 
 # General c++ generated files
@@ -52,13 +51,19 @@ gmon.out
 # Eclipse CDT files
 .cproject
 .settings/
+*.pydevproject
+*.launch
 
 # Geany/geany-plugins files
 *.geany
 .geanyprj
 
+# Jetbrains IDEs
+.idea/
+
 # Misc
 .DS_Store
+__MACOSX
 logs/
 
 # for projects that use SCons for building: http://http://www.scons.org/
@@ -66,7 +71,6 @@ logs/
 .sconsign.dblite
 *.pyc
 
-
 # https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
@@ -123,6 +127,7 @@ TestResult.xml
 *.tlh
 *.tmp
 *.tmp_proj
+*.bak
 *.log
 *.vspscc
 *.vssscc
@@ -130,6 +135,7 @@ TestResult.xml
 *.pidb
 *.svclog
 *.scc
+*.nib
 
 # Chutzpah Test files
 _Chutzpah*
@@ -245,8 +251,11 @@ __pycache__/
 #Kdevelop project files
 *.kdev4
 
-# xCode
-xcuserdata
+# Xcode
+xcuserdata/
+*.xcscmblueprint
+*.xccheckout
+*.xcodeproj/*
 
 # RIA/Silverlight projects
 Generated_Code/
@@ -275,11 +284,19 @@ FakesAssemblies/
 # =========================
 
 # Windows image file caches
-Thumbs.db
+[Tt]humbs.db
+[Tt]humbs.db:encryptable
 ehthumbs.db
+ehthumbs_vista.db
+
+# Windows stackdumps
+*.stackdump
+
+# Windows shortcuts
+*.lnk
 
 # Folder config file
-Desktop.ini
+[Dd]esktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/