Merge branch 'develop' into feature/globebrowsing

This commit is contained in:
Matthew Territo
2016-08-11 21:59:38 -06:00
8 changed files with 105 additions and 7 deletions

View File

@@ -11,6 +11,9 @@ helper.setCommonKeys = function()
openspace.bindKey("F2", "openspace.setPerformanceMeasurement(true)")
openspace.bindKey("F3", "openspace.setPerformanceMeasurement(false)")
openspace.bindKey("t", "openspace.toggleFrametimeType(1)")
openspace.bindKey("Shift+t", "openspace.toggleFrametimeType(0)")
openspace.bindKey("ESC", "openspace.toggleShutdown()")
openspace.bindKey("PRINT_SCREEN", "openspace.takeScreenshot()")