Merge pull request #1 from simulationcraft/bfa-dev

update

.clang-tidy

@@ -1 +1 @@
-HeaderFilterRegex: 'engine/util/(utf8|rapidxml|rapidjson|fmt)/*'
+HeaderFilterRegex: '*/util/(utf8-h|utf8-cpp|rapidxml|rapidjson|fmt)/*'

.gitignore

@@ -29,28 +29,42 @@ moc_*.cpp
 Win32OpenSSL_Light-*
 Win64OpenSSL_Light-*
 
-/CMakeFiles/
+# simc executables
+/simc
+engine/simc
+engine/sc_rng
+cli/simc
+
+#SimulationCraft executables
+/SimulationCraft
+/gui/SimulationCraft
+
+# Cast extract
 casc_extract/cache/
 casc_extract/wow/
+casc_extract/wow_ptr/
 casc_extract/__pycache__/
-vs/int_gui/
-x64/
-x86/
-simc-*/
+
+# Documentation
 doc/build/
 doc/doxygen/
 doc/ext/breathe/
 
-/simc
-/SimulationCraft
-engine/simc
-engine/sc_rng
-/build
+# Reports
 results.html
 simc_gui.simc
 simc_log.txt
 simc_report.html
+simc_report.json
 simc_report.xml
+
+/CMakeFiles/
+vs/int_gui/
+x64/
+x86/
+simc-*/
+
+/build
 .DS_Store
 [Dd]ebug
 simcqt.app
@@ -95,6 +109,7 @@ lib/*.vcxproj*
 gui/build
 gui/release
 gui/debug
+gui/moc
 gui/*.vcxproj*
 cli/build
 cli/release
@@ -105,5 +120,15 @@ simulationcraft*.db
 engine/simulationcraft.hpp.cpp
 gui/*_resource*
 .vs/
+.vscode/
+.idea/
 .ycm_*
-dbc_extract3/cache/live/DBCache.bin
+dbc_extract3/cache/live/DBCache.bin
+dbc_extract3/cache/ptr/DBCache.bin
+
+apikey.txt
+
+# Hide some commong build folders
+Debug/
+Build/
+Release/

.travis.yml

@@ -29,6 +29,12 @@ addons:
       - valgrind
       - g++-5
       - bats
+      - libcurl3
+      - libcurl4-gnutls-dev
+
+osx_image:
+  - xcode8.3
+  - xcode10
 
 #env:
   # Each line is a separate build in the build matrix. A build in the build
@@ -45,7 +51,8 @@ matrix:
 
 before_install:
   # Install bats on OSX through brew
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew install bats; fi
+  # retry via travis_retry because brew sometimes hangs
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then travis_retry brew update && travis_retry brew install bats; fi
 
 notifications:
   irc:

CMakeLists.txt

@@ -9,7 +9,7 @@ option(BUILD_GUI "Build the Qt gui along with cli binary" ON)
 option(SC_NO_THREADING "Disable all dependencies on pthreads" OFF)
 option(SC_NO_NETWORKING "Disable all networking related stuff." OFF)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 
 # enable colored output with ninja build system
 if(${CMAKE_GENERATOR} STREQUAL "Ninja")

README.md

@@ -3,7 +3,7 @@
 
 SimulationCraft is a tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm).
 
-It is a multi-player event driven simulator written in C++ that models player character damage-per-second in various raiding scenarios.
+It is a multi-player event driven simulator written in C++ that models player character damage-per-second in various raiding and dungeon scenarios.
 
 Increasing class synergy and the prevalence of proc-based combat modifiers have eroded the accuracy of traditional calculators that rely upon closed-form approximations to model very complex mechanics. The goal of this simulator is to close the accuracy gap while maintaining a performance level high enough to calculate relative stat weights to aid gear selection.
 
@@ -13,7 +13,7 @@ A simple graphical interface is included with the tool, allowing players to down
 
 ## How Can I Use It?
 
-Go to the [downloads page](https://www.simulationcraft.org/download.html) and get the package for your particular platform. 
+Go to the [downloads page](https://www.simulationcraft.org/download.html) and get the package for your particular platform.
 The Windows package offers both a formal install and a archive that can be extracted on to your desktop. There is no Linux release since it is so ridiculously easy to build it yourself on that platform. Releases occur quite frequently so be sure to check the release notes.
 
 Two executables are shipped: *SimulationCraft* sports a simple graphical user interface whereas *simc* uses a command-line interface.
@@ -27,9 +27,9 @@ There is also an excellent [starters guide](../../wiki/StartersGuide) on our wik
 
 For a simple overview, thoroughly read the Welcome page that is presented upon launching SimulationCraft. In addition, detailed documentation material can be found on our [wiki pages](../../wiki/). Here you will find a list of features, a starters guide, as well as answers to frequently asked questions.
 
-If your question is not answered there, then see the [Community](#community) section below on how to reach other users via IRC. We periodically scan the WoW, MMO, and Wowhead forums as well, but we cannot promise swift responses in those arenas.
+If your question is not answered there, then see the [Community](#community) section below on how to reach other users via Discord. We periodically scan the WoW, MMO, and Wowhead forums as well, but we cannot promise swift responses in those arenas.
 
-If you have detailed questions that need to be answered in real time then I recommend you visit the IRC channel detailed in the [Community](#community) section below. There are active SimulationCraft developers on that channel 24hrs a day.
+If you have detailed questions that need to be answered in real time then I recommend you visit the Discord server detailed in the [Community](#community) section below. There are active SimulationCraft developers on the server 24hrs a day.
 
 If you believe that the reported analysis is incorrect please open an [issue](../../issues). If you are unable to download your character, please open an [issue](../../issues). If you feel that the tool is missing features/directives necessary for analysis, please open an [issue](../../issues). Opening an [issue](../../issues) (as opposed to an email, forum post, chat msg, etc) is by far the most effective method of getting a swift resolution to your problem.
 
@@ -45,7 +45,7 @@ Discord: [SimCMinMax](https://discord.gg/tFR2uvK) (#simulationcraft)
 
 ## Important Notice
 
-SimulationCraft is different from SimCraft. Please use the full name SimulationCraft (or SimC) to refer to this project. Visit SimCraft if you are looking for full-motion simulators for SimRacing and FlightSim. 
+SimulationCraft is different from SimCraft. Please use the full name SimulationCraft (or SimC) to refer to this project. Visit SimCraft if you are looking for full-motion simulators for SimRacing and FlightSim.
 
 ## External Libraries