Merge branch 'master' of github.com:CleverRaven/Cataclysm-DDA into do…

…xygen_stats Conflicts: src/activity_handlers.cpp src/bionics.cpp src/character.cpp
cataclysmbnteam · Nov 26, 2015 · 776d332 · 776d332
2 parents 08bcfb5 + 31f857d
commit 776d332
Show file tree

Hide file tree

Showing 749 changed files with 680,399 additions and 199,422 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+# 4 space indentation
+indent_style = space
+indent_size = 4
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+tests/cata_test
 cataclysm
 cataclysm-tiles
 chkjson*
@@ -89,3 +90,14 @@ nbproject/
 # OSX
 Cataclysm.app
 data/osx/AppIcon.icns
+Cataclysm.dmg
+
+# Jetbrains CLion
+.idea/
+
+# linked test executable
+tests/line_test
+tests/map_iterator_test
+tests/shadowcasting_test
+# static library used to link the test executable
+cataclysm.a