mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 11:09:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge with develop and solve conflicts.

Browse Source
This commit is contained in:
Kalle Bladin
2016-07-18 17:26:30 -04:00
parent 6691dab91e a244defdbc
commit 541fbba322
62 changed files with 754 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/common.lua
View File

@@ -11,6 +11,8 @@ helper.setCommonKeys = function()
openspace.bindKey("F2", "openspace.setPerformanceMeasurement(true)")
openspace.bindKey("F3", "openspace.setPerformanceMeasurement(false)")
openspace.bindKey("ESC", "openspace.toggleShutdown()")
openspace.bindKey("PRINT_SCREEN", "openspace.takeScreenshot()")
openspace.bindKey("SPACE", "openspace.time.togglePause()")