mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-05 03:00:21 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,952 Commits 83 Branches 46 Tags
dbe90fd94b736603bd972f0cccf78d12eeb7be28
Commit Graph

5952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lovisa Hassler
dbe90fd94b cleanup and renaming some variables 2018-11-13 11:51:48 -05:00
Lovisa Hassler
760eff56f8 merge master 2018-11-13 11:35:26 -05:00
Alexander Bock
9a368ede25 Fix issue that causes atmosphere to show up on the other side of a planet if the shading is disabled (closes #677) 2018-11-13 08:27:07 -05:00
Alexander Bock
6e3dfa6db8 Merge remote-tracking branch 'origin/feature/find-configuration' 2018-11-13 08:10:57 -05:00
Alexander Bock
e57b064309 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2018-11-13 08:10:08 -05:00
Emil Axelsson
1632c09af3 Coordinate Axes 
* Add coordinate axes renderable
 * Add debug helper
 * Add example asset
 * Fix bug with dynamic loading of assets. (#763)
 2018-11-13 08:09:14 -05:00
Alexander Bock
1d12c82cf9 Update Ghoul 2018-11-13 08:03:38 -05:00
Lovisa Hassler
0a0703aa82 fix merge conflict 2018-11-12 18:33:06 -05:00
Lovisa Hassler
5a49c66204 moved the color mapping to the asset files 2018-11-12 18:26:12 -05:00
Agnes Heppich
c3d031e6a5 reduced data struct, clean up 2018-11-12 18:14:32 -05:00
Agnes Heppich
2bdb7fece9 clean up 2018-11-12 18:05:37 -05:00
Agnes Heppich
9aefc203a3 ra dec translation 2018-11-12 17:30:33 -05:00
Emil Axelsson
989304835d Only update part of gui that was updated by CEF (#760) 2018-11-12 11:05:30 +01:00
Emil Axelsson
32226fe560 Use bin folder instead of cwd to find configuration file (#761) 2018-11-09 16:17:02 -05:00
Agnes Heppich
89e0b20cc4 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into 
thesis/2018/dsn merge
 2018-11-09 14:09:54 -05:00
Agnes Heppich
648e763abe rename dsnData 2018-11-09 14:09:24 -05:00
Lovisa Hassler
1f27da6778 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2018-11-09 12:30:19 -05:00
Lovisa Hassler
aba04f7105 added ra dec to cartesian helper function in spicemanager 2018-11-09 12:30:01 -05:00
Agnes Heppich
b5aa872b95 radec translation 2018-11-09 11:33:10 -05:00
Agnes Heppich
65350f7aa6 rename dsnManager to signalManager 2018-11-09 11:11:11 -05:00
Lovisa Hassler
df58130597 added unbindGL(), also some cleanup 2018-11-08 15:52:11 -05:00
Lovisa Hassler
cc18504392 got rid of sub class communicationlines, now all is handled in renderablesignals 2018-11-08 14:48:26 -05:00
Emil Axelsson
f9514ab92a Use bin folder instead of cwd to find configuration file 2018-11-08 11:54:27 -05:00
Lovisa Hassler
cebe111ee0 renamed renderablecommincationpackage to renderablesignals 2018-11-08 11:37:01 -05:00
Emil Axelsson
4ce29842d3 Add shortcut to disable master rendering 2018-11-08 10:32:42 -05:00
Lovisa Hassler
2cf1dc3670 added new webgui to dsn.scene, new z buffer clculations in shader files 2018-11-07 18:33:30 -05:00
Emil Axelsson
8977aa88d6 Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-11-07 15:47:07 -05:00
Emil Axelsson
e9c82facef Add webgui to scenes 2018-11-07 15:35:48 -05:00
Alexander Bock
cba6201b67 Minor coding style changes 2018-11-07 13:49:33 -05:00
Lovisa Hassler
5ad383412c Add sgct 2018-11-07 11:47:28 -05:00
Lovisa Hassler
df9d458045 Add sgct 2018-11-07 11:38:31 -05:00
Lovisa Hassler
90457d91e2 Merge branch 'master' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2018-11-07 11:25:09 -05:00
Alexander Bock
9dfb87e220 Add string sanitization to property description 2018-11-06 16:56:05 -05:00
Agnes Heppich
be0bb2839e folder path dynamic 2018-11-06 15:28:24 -05:00
Alexander Bock
06426c01c2 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2018-11-06 15:27:36 -05:00
Alexander Bock
f8c27629f5 Various small fixes 2018-11-06 15:07:17 -05:00
Emil Axelsson
e206099c4f Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-11-06 14:58:50 -05:00
Emil Axelsson
c58ae52735 Breaking change: Change property owner identifier renderable to Renderable 2018-11-06 14:58:11 -05:00
Alexander Bock
7c0268e87c CMake cleanup 2018-11-06 13:18:40 -05:00
Agnes Heppich
91c1cb7287 Merge branch'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 
Merge branch# the commit.
 2018-11-06 12:16:07 -05:00
Agnes Heppich
b50f86b330 estimated position from RA DEC and Range 2018-11-06 12:13:34 -05:00
Alexander Bock
7a3a8a5cf6 Misc coding style cleanups 2018-11-06 12:02:56 -05:00
Alexander Bock
d1fa145e0a Jenkins compile fix 2018-11-06 11:10:53 -05:00
Emil Axelsson
8e93463c1a Merge branch 'master' of github.com:OpenSpace/OpenSpace releases/v0.13.0 2018-11-05 21:29:45 -05:00
Emil Axelsson
04eef20868 Disable server process on webgui teardown 2018-11-05 21:28:57 -05:00
Alexander Bock
7b677d29c1 Added Micah to the CREDITS file 2018-11-05 21:28:37 -05:00
Alexander Bock
3ff7b974f5 Adapt ISWAManager and KameleonWrapper to removal of singleton 2018-11-05 21:11:01 -05:00
Alexander Bock
1742ed032d Updated ghoul repository 2018-11-05 20:52:51 -05:00
Alexander Bock
267879878b Beta-3 Release Candidate branch (#753) 
* Merge experimental session recording branch
 * Merge new CEF-based webgui branch
 2018-11-05 20:51:48 -05:00
Emil Axelsson
7181de4673 Feature/webgui ops (#723) 
* Update node packages, download nodejs in build process, start server from openspace process
  * Patch CEF cmake automatically
  * Build webserver automatically
  * Work on CMake for WebBrowser, Webgui and CefWebGui
  * Map key modifiers to CEF
  * Smooth time interpolation in webgui
  * Automatically focus on search field in filter lists
  * Move webgui code to external repositories
  * Use asset system to distribute webgui
  * Remove webgui from main repository
  * Add support for right click in webgui and improve timetopic
  * Resolve cmake policy warning
  * Add relative time interpolation to lua interface
  * Sanitize json error message before logging error. Workaround for #736
  * Added gui properties to scene graph nodes
  * Add version topic
  * Add shortcuttopic
  * Add ability to disable rendering of cefwebgui
  * Don't do message loop work if there is no browser.
  * Set correct path to nodejs on unix
  * Message loop work in presync
  * modifications for shortcuts in gui, added names for shortcuts
  * Set properties via lua scripts
  * Allow gui grouping for shortcuts
  * Add gui paths keybindings
  * Blocking keyboard callbacks when webgui has keyboard focus in an editable field
  * Allow disabling of WebBrowser and CefWebGui
  * Make it possible to hide GUI
  * Get rid of redundant dashboard items if web gui is used
  * Hide WebGUI on slave nodes
  * Hide WebGUI on main rendering window if a GUI window exists
 * Enable WebGUI on default unless it is overwritten in the openspace.cfg
  * Add guiName for propery owners in socket api
 2018-11-05 20:45:38 -05:00