Merge remote-tracking branch 'origin/master' into add_cpp_yaml_parsing

Author: pjreiniger

.clang-format

@@ -25,7 +25,7 @@ BraceWrapping:
   AfterControlStatement: true
   AfterEnum:       true
   AfterFunction:   true
-  AfterNamespace:  true
+  AfterNamespace:  false
   AfterObjCDeclaration: true
   AfterStruct:     true
   AfterUnion:      true
@@ -34,7 +34,7 @@ BraceWrapping:
   IndentBraces:    true
   SplitEmptyFunction: false
   SplitEmptyRecord: false
-  SplitEmptyNamespace: false
+  SplitEmptyNamespace: true
 BreakBeforeBinaryOperators: All
 BreakBeforeBraces: Allman
 BreakBeforeInheritanceComma: false
@@ -53,7 +53,7 @@ Cpp11BracedListStyle: false
 DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: false
+FixNamespaceComments: true
 ForEachMacros:
   - foreach
   - Q_FOREACH
@@ -75,7 +75,7 @@ KeepEmptyLinesAtTheStartOfBlocks: true
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
-NamespaceIndentation: Inner
+NamespaceIndentation: None
 ObjCBlockIndentWidth: 4
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true

.gitignore

@@ -1,4 +1,11 @@
+
+# Created by https://www.gitignore.io/api/c++,java,gradle,eclipse,intellij,visualstudiocode
+# Edit at https://www.gitignore.io/?templates=c++,java,gradle,eclipse,intellij,visualstudiocode
+
 ### C++ ###
+# Prerequisites
+*.d
+
 # Compiled Object files
 *.slo
 *.lo
@@ -14,6 +21,10 @@
 *.dylib
 *.dll
 
+# Fortran module files
+*.mod
+*.smod
+
 # Compiled Static libraries
 *.lai
 *.la
@@ -25,67 +36,7 @@
 *.out
 *.app
 
-.vs/
-*.def
-!mockhal.def
-!snobotSim.def
-*.opensdf
-*.vcxproj
-*.vcxproj.user
-*.sdf
-*.sublime-project
-*.sublime-workspace
-
-# Compiled Java files
-*.class
-
-# Build directories
-/.gradle
-/build*
-!build.gradle
-/native
-/arm
-/gmock/build
-
-
-# Created by https://www.gitignore.io/api/intellij,eclipse,netbeans,java,gradle,c++,cmake
-
-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff:
-.idea/*
-
-## File-based project format:
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-### Intellij Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
-
-# *.iml
-# modules.xml
-
-
 ### Eclipse ###
-
 .metadata
 bin/
 tmp/
@@ -98,9 +49,6 @@ local.properties
 .loadpath
 .recommenders
 
-# Eclipse Core
-.project
-
 # External tool builders
 .externalToolBuilders/
 
@@ -113,8 +61,8 @@ local.properties
 # CDT-specific (C/C++ Development Tooling)
 .cproject
 
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
+# CDT- autotools
+.autotools
 
 # Java annotation processor (APT)
 .factorypath
@@ -137,77 +85,149 @@ local.properties
 # Code Recommenders
 .recommenders/
 
+# Annotation Processing
+.apt_generated/
 
-### NetBeans ###
-nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
-nbactions.xml
-.nb-gradle/
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
 
+### Eclipse Patch ###
+# Eclipse Core
+.project
 
-### C++ ###
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
 
-# Precompiled Headers
-*.gch
-*.pch
+# Annotation Processing
+.apt_generated
 
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
+.sts4-cache/
 
-# Fortran module files
-*.mod
+*/Debug/**
 
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# Executables
-*.exe
-*.out
-*.app
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
 
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
 
-### CMake ###
-CMakeCache.txt
-CMakeFiles
-CMakeScripts
-Makefile
-cmake_install.cmake
-install_manifest.txt
+# JetBrains templates
+**___jb_tmp___
 
+### Intellij Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
 
 ### Java ###
+# Compiled class file
 *.class
 
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
 # Package Files #
 *.jar
 *.war
+*.nar
 *.ear
+*.zip
+*.tar.gz
+*.rar
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-java_pid*.hprof
 
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
 
 ### Gradle ###
 .gradle
 build/
-external_dependencies/
 
 # Ignore Gradle GUI config
 gradle-app.setting
@@ -221,19 +241,12 @@ gradle-app.setting
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
 
-#VSCode
-.vscode/
-
-# My stuff
-snobotSim*.zip
-snobotSim*.jar
-!temp_libs
-!temp_libs/**
-snobot_sim_gui/src/main/java/com/snobot/simulator/SnobotSimGuiVersion.java
-snobot_sim_java/src/main/java/com/snobot/simulator/wrapper_accessors/java/JaveSimulatorVersion.java
-snobot_sim/src/main/native/cpp/SnobotSim/SnobotSimHalVersion.cpp
-maven_repo
-!scripts/boilerplates/
-target/
+### Gradle Patch ###
+**/build/
+
+# End of https://www.gitignore.io/api/c++,java,gradle,eclipse,intellij,visualstudiocode
+
+# SnobotSim things
 **/logs/snobot_sim
-callstack_dump.txt
+*/test_output
+**/simulator_config