summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update codecov yaml file comment and status settingshotfix/issue_414Joel Fischer2016-06-011-1/+12
* Create .codecov.ymlJoel Fischer2016-05-311-0/+8
* Merge branch 'hotfix/issue_403'Joel Fischer2016-05-27796-218/+218
|\
| * Fix a few pathshotfix/issue_403Joel Fischer2016-05-252-7/+3
| * Re-link the README and other de-linked files from the moveJoel Fischer2016-05-251-10/+16
| * Shift files into root directoryJoel Fischer2016-05-25793-3/+2
* | Merge branch 'hotfix/issue_408'Joel Fischer2016-05-271-52/+0
|\ \
| * | Removed unnecessary video encoder settings.hotfix/issue_408Muller, Alexander (A.)2016-05-271-52/+0
| |/
* | Merge branch 'master' into developJoel Fischer2016-05-199-161/+183
|\ \ | |/
| * Update for 4.1.24.1.2Joel Fischer2016-05-195-160/+167
| * Merge branch 'master' into hotfix/issue_395hotfix/issue_395Joel Fischer2016-05-192-0/+7
| |\
| | * Merge branch 'mokagio-mokagio/gitignore-carthage'Joel Fischer2016-05-191-0/+3
| | |\
| | | * Ignore a possilbe ./Carthage/Build folderGiovanni Lodi2016-05-121-0/+3
| | * | Update PULL_REQUEST_TEMPLATE.mdJoel Fischer2016-05-131-0/+4
| | |/
| * | Enable new Xcode 7.3 static analyzer configsJoel Fischer2016-05-102-1/+9
| |/
* | Merge branch 'master' into developJoel Fischer2016-05-0937-141/+160
|\ \ | |/
| * Fix location of files linked to Xcode projectJoel Fischer2016-05-098-968/+29
| * Update for SDL v4.1.14.1.1Joel Fischer2016-05-098-103/+1059
| * Run clang-format over filesJoel Fischer2016-05-0933-192/+194
| * SDLRPCStructs print correctlyJoel Fischer2016-05-091-2/+2
| * Merge branch 'hotfix/issue_388'Joel Fischer2016-05-091-1/+1
| |\
| | * Init rpc message with mutable dictionaryhotfix/issue_388Joel Fischer2016-04-221-1/+1
* | | Merge branch 'feature/issue_390_xctool_args' of https://github.com/FordDev/sd...Joel Fischer2016-05-042-1/+8
|\ \ \
| * | | Fixed xctool-args filename typo.Muller, Alexander (A.)2016-04-251-0/+0
| * | | Added .xctool-args and update README.md with update xctool command.Muller, Alexander (A.)2016-04-252-1/+8
* | | | Merge branch 'master' into developJoel Fischer2016-05-042-7/+7
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Update testing depsJoel Fischer2016-05-042-7/+7
| |/
* | Merge branch 'master' into developJoel Fischer2016-03-305-7/+26
|\ \ | |/
| * Merge branch 'release/4.1.0'v4.1.04.1.0Joel Fischer2016-03-308-41/+59
| |\
| | * Update version to 4.1.0Joel Fischer2016-03-305-8/+8
| | * Fixed a typo in CHANGELOGrelease/4.1.0Joel Fischer2016-03-231-1/+1
| | * Update CHANGELOG with 4.1.0 in progress detailsJoel Fischer2016-03-231-1/+20
| |/ |/|
* | Merge branch 'master' into developJoel Fischer2016-03-220-0/+0
|\ \ | |/
| * Merge branch 'hotfix/issue_377'Joel Fischer2016-03-221-0/+33
| |\
* | \ Merge branch 'hotfix/issue_377' into developJoel Fischer2016-03-221-0/+33
|\ \ \ | | |/ | |/|
| * | use SDLGlobals versionhotfix/issue_377Justin Dickow2016-03-101-1/+1
| * | Sending application state to SDLJustin Dickow2016-03-101-0/+33
* | | Merge branch 'master' into developJoel Fischer2016-03-1613-535/+24
|\ \ \ | | |/ | |/|
| * | Merge branch 'hotfix/issue_380'Joel Fischer2016-03-1613-535/+24
| |\ \
| | * | Remove static OCMock, grab from CarthageJoel Fischer2016-03-1613-535/+24
| |/ /
* | | Merge branch 'pr/379' into developJoel Fischer2016-03-163-34/+33
|\ \ \
| * | | Added ignoring of warning for usage of deprecated methods in spec tests.Muller, Alexander (A.)2016-03-161-1/+7
| * | | Added Spec Test for handling heartbeat acknowledgement.Muller, Alexander (A.)2016-03-161-0/+25
| * | | Removed ability for in-app sending of heartbeats. Support for heartbeat now o...Muller, Alexander (A.)2016-03-152-33/+1
| |\ \ \
| | * | | Re-added the sendHeartbeat function to avoid doesNotRespondSelector error bec...Muller, Alexander (A.)2016-03-111-0/+10
| | * | | Initial commit that is re-adding the ability to acknowledge heartbeats, but w...Muller, Alexander (A.)2016-03-116-8/+88
| | * | | Re-added public facing header functions relating to Heartbeat, with __depreca...Muller, Alexander (A.)2016-03-076-1/+16
| | * | | Removal of heartbeat acknowledgement, maintenance and upkeep.Muller, Alexander (A.)2016-03-078-137/+1
* | | | | Merge branch 'master' into developJoel Fischer2016-03-163-2/+11
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge branch 'hotfix/issue_371'Joel Fischer2016-03-163-2/+11
| |\ \ \