mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-26 23:08:55 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,217 Commits 83 Branches 46 Tags
17b00343847df3ef355b5f02db830d827eab35ba
Commit Graph

4217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Territo
17b0034384 Put _optionParser back into use. 2017-05-19 15:22:00 -06:00
Matthew Territo
ade212665e Change tab to spaces 2017-05-19 12:15:39 -06:00
Matthew Territo
ce83666ec0 Cleanup Launcher config comments, unecessary changes, etc. 2017-05-19 12:08:55 -06:00
Matthew Territo
5086d1e5ea Merge branch 'master' into feature/launcherconfigs 2017-05-19 11:41:22 -06:00
Alexander Bock
4adae3afa1 Merge pull request #309 from OpenSpace/feature/luaconsole 
Feature/luaconsole
 2017-05-18 15:21:25 -04:00
Alexander Bock
36be013578 Merge remote-tracking branch 'origin/master' into feature/luaconsole 2017-05-18 15:09:06 -04:00
Alexander Bock
e7a48f150a Remove clang warning 
Make the opening speed DPI scaling-dependent
 2017-05-18 14:59:17 -04:00
Alexander Bock
ba19348b58 Speed up console opening (and make it depenent on the current frametime, rather than the average) 
Make the ESC key close the console
Make the Numpad Enter key work the same as regular Enter key
 2017-05-18 14:53:03 -04:00
Kalle Bladin
8f415ff907 Remove unnecessary misstake 2017-05-18 14:04:31 +02:00
Kalle Bladin
b46a5be65a Merge branch 'feature/luaconsole' of github.com:OpenSpace/OpenSpace into feature/luaconsole 2017-05-18 13:57:32 +02:00
Kalle Bladin
28bdf4eb32 Fix OSX issues 2017-05-18 13:57:11 +02:00
Emil Axelsson
187b7b6506 Add missing includes 2017-05-18 12:59:29 +02:00
Emil Axelsson
abaed50afb Add keybindings 2017-05-18 10:57:41 +02:00
Emil Axelsson
05a541aacb Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/luaconsole 2017-05-18 10:17:37 +02:00
Matthew Territo
0a1101d0e4 Missing Destructors: Issue #307 (#308) 
* Adding empty destructor for Scene.

* RenderEngine Destructor empty/no longer default

* Create empty ~ScreenLog
 2017-05-18 10:13:20 +02:00
Emil Axelsson
4671928754 Merge branch 'master' of github.com:OpenSpace/OpenSpace 
Conflicts:
	modules/base/rendering/multimodelgeometry.cpp
 2017-05-18 09:39:15 +02:00
Emil Axelsson
d2d6810451 Change include to cstring 2017-05-18 09:38:21 +02:00
Emil Axelsson
c97813c851 Linux compile fix: add missing include 2017-05-18 09:31:25 +02:00
Emil Axelsson
d7e46e2824 Formatting 2017-05-17 21:34:14 +02:00
Emil Axelsson
4fcb92385c Fix inconsistent order of members in header file and initialization 2017-05-17 21:28:20 +02:00
Emil Axelsson
1eee40887d Tweak animation and appearance of lua console + Remove some duplicate code 2017-05-17 21:21:51 +02:00
Alexander Bock
70aeaeaed5 Added missing line ending 2017-05-17 11:32:41 -04:00
Alexander Bock
11c3e29ca0 Rendering a cursor to show the current text entry state 2017-05-17 11:27:43 -04:00
Alexander Bock
cefedabd84 More work on LuaConsole 2017-05-17 10:49:28 -04:00
Alexander Bock
65d284efc7 More work on LuaConsole 
Don't have the console consume function keys
 2017-05-16 16:13:52 -04:00
Alexander Bock
38e2521743 Some more work on new LuaConsole 
Add Inconsolata font
 2017-05-16 14:47:44 -04:00
Alexander Bock
2e38f29eb0 Enable color picking for vec3 and vec4 properties marked as color properties 2017-05-16 14:47:17 -04:00
Alexander Bock
4568654531 Merge branch 'master' into feature/luaconsole 2017-05-15 15:29:51 -04:00
Alexander Bock
f4ad2ce4c2 More include file cleanup 2017-05-15 15:27:59 -04:00
Alexander Bock
302fa06067 More code cleanup 2017-05-15 14:39:48 -04:00
Alexander Bock
2c54e3675d Some more work on the LuaConsole 2017-05-15 14:34:35 -04:00
Alexander Bock
3d9375277b Adding LuaConsole to global property namespace 
Initial reworking of LuaConsole look and feel
 2017-05-14 12:47:10 -04:00
Matthew Territo
af953ca4f1 Add Launcher LogLevel to config file. Set to None. 2017-05-12 15:56:39 -06:00
Matthew Territo
92f55f24d6 Merge remote-tracking branch 'origin/master' into feature/launcherconfigs 
# Conflicts:
#	ext/sgct
#	openspace.cfg
 2017-05-12 15:40:06 -06:00
Alexander Bock
2d5c292326 Fix the ScriptLog output 2017-05-12 14:03:57 -04:00
Alexander Bock
66f8043982 Adding more documentation to the space module classes 2017-05-12 13:37:04 -04:00
Alexander Bock
0b1c6706dd Remove unused RenderablePath 
Add documentations to base module classes
Change RenderableSphere to not use power scaled coordinates
 2017-05-12 11:28:10 -04:00
Alexander Bock
773828c057 Adding documentations to more classes 2017-05-11 22:51:11 -04:00
Alexander Bock
b660a84464 Code cleanup 2017-05-11 18:51:42 -04:00
Alexander Bock
5ebf2a4913 Rename Documented to DocumentationGenerator 2017-05-11 18:16:30 -04:00
Alexander Bock
17fe85afba Add documentation 2017-05-11 18:01:36 -04:00
Alexander Bock
d597750398 Some more refactoring of the documentation feature 2017-05-11 13:56:06 -04:00
Alexander Bock
1d024dfff3 Use correct variable for Sun transformation 2017-05-10 15:39:42 -04:00
Alexander Bock
7d5a53fb5e Update SGCT 2017-05-10 09:18:29 -04:00
Alexander Bock
ddc9ef1bc5 Add abstract class to handle Handlebar-based documentation file generation 
Apply Documented class to the InteractionHandler
Update Ghoul
 2017-05-09 18:06:14 +01:00
Alexander Bock
fa7cee729c Add documentation to Keybinding doc file 2017-05-09 11:17:32 +01:00
Alexander Bock
701b3afb2c Clean up interdace of Mission class 2017-05-09 11:17:14 +01:00
Alexander Bock
ab192959c5 Position frame number rendering correctly on MacOS 
Use more efficient drawing method
Small style fixes
 2017-05-09 10:58:28 +01:00
Alexander Bock
fdd5a98bcd Render shutdown information correctly on MacOS 2017-05-09 10:44:20 +01:00
Alexander Bock
63d607281a Update SGCT repository 
Add property to toggle date rendering independent from rendering statistics
 2017-05-09 10:30:35 +01:00