diff --git a/.gitignore b/.gitignore
index dd9b2ab0..0ce71e49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,49 +1,3 @@
-build*
-CMakeCache.txt
-CMakeFiles
-cmake_install.cmake
-Makefile
-/otclient
-/*.h
-/*.cxx
-*.o
-*.gch
-*.a
-*.exe
-*.spr
-*.dat
-*.kdev*
-*.cbp
-*~
-*.kate-swap
-*.autosave
-CMakeLists.txt.user*
-*.xml
-*.otb
-*.otbm
-*.log
-*.bak
-*.swp
-*.pic
-.lvimrc
-.clang_complete
-config.otml
-/modules/otclientrc.lua
-/doc
-!.gitignore
-otclient.map
-otclient.layout
-otclient.exp
-otclient.lib
-LOCALTODO
-tags
-Thumbs.db
-.directory
-src/framework/graphics/dx/
-modules/.project/modules.sublime-workspace
-vc14/.vs/
-*.dll
-
 #################
 ## Visual Studio
 #################
@@ -55,6 +9,8 @@ vc14/.vs/
 *.suo
 *.user
 *.sln.docstates
+.idea/
+.vscode/
 
 # Build results
 
@@ -64,6 +20,7 @@ x64/
 build/
 [Bb]in/
 [Oo]bj/
+cmake-build-*/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -90,16 +47,19 @@ build/
 *.vssscc
 .builds
 *.pidb
-*.log
 *.scc
+*.dll
+*.exe
 
 # Visual C++ cache files
 ipch/
 *.aps
 *.ncb
 *.opensdf
+*.opendb
 *.sdf
 *.cachefile
+*.VC.db
 
 # Visual Studio profiler
 *.psess
@@ -112,3 +72,184 @@ ipch/
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 *.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# Vim files
+*~
+.*.swp
+.*.swo
+
+#################
+## OTClient
+#################
+
+/otclient
+/modules/otclientrc.lua
+src/framework/graphics/dx/
+
+*.o
+*.gch
+*.a
+*.kdev*
+*.cbp
+*~
+*.kate-swap
+*.autosave
+*.bak
+*.swp
+.lvimrc
+.clang_complete
+LOCALTODO
+tags
+
+# user-specific files
+*.xml
+*.otb
+*.otbm
+*.spr
+*.dat
+*.pic
+config.otml
+
+## Cmake cache
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+
+## Sublime
+  
+# Cache files for Sublime Text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+
+# Workspace files are user-specific
+*.sublime-workspace
+
+# Project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using Sublime Text
+# *.sublime-project
+
+# SFTP configuration file
+sftp-config.json
+sftp-config-alt*.json
+
+# Package control specific files
+Package Control.last-run
+Package Control.ca-list
+Package Control.ca-bundle
+Package Control.system-ca-bundle
+Package Control.cache/
+Package Control.ca-certs/
+Package Control.merged-ca-bundle
+Package Control.user-ca-bundle
+oscrypto-ca-bundle.crt
+bh_unicode_properties.cache
+
+# Sublime-github package stores a github token in this file
+# https://packagecontrol.io/packages/sublime-github
+GitHub.sublime-settings
\ No newline at end of file