mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-08 12:30:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,966 Commits 83 Branches 48 Tags
565612e9734e55dbcce199c26456eee0e1c6e0f2
Commit Graph

5966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Fransson 565612e973 initializeGL stuff 2019-03-27 16:30:59 -06:00
Jonathan Fransson 7ee9982973 work on renderablesatellites 2019-03-27 11:55:00 -06:00
Jonathan Fransson be713c8cc4 Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris 2019-03-27 11:49:15 -06:00
Jonathan Fransson 2c65b8388e work on renderablesatellites 2019-03-27 11:48:54 -06:00
Elon 1698b064c0 merge 2019-03-27 10:39:34 -06:00
Elon 4fdd54aa56 correcting errors 2019-03-27 10:34:37 -06:00
Jonathan Fransson 2c24dcaa32 working on renderableSatellites 2019-03-27 10:33:55 -06:00
Elon 5979a59d6a appearance 2019-03-27 10:33:52 -06:00
Jonathan Fransson b4dd5e9b4b merge 2019-03-27 10:31:09 -06:00
Jonathan Fransson 6f60b7cff7 scene setup 2019-03-27 10:28:10 -06:00
Elon 8048aed37a some code to test 1 sgn, more renderables 2019-03-27 10:28:09 -06:00
Jonathan Fransson 9b1f941ffa added spaceDebris scene 2019-03-27 10:28:08 -06:00
Elon 3b1f33b840 include debris in default scene 2019-03-27 10:28:08 -06:00
Elon a1dc656e0e Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2019-03-27 09:14:09 -06:00
Emil Axelsson c4ab03ad3d Update ghoul 2019-03-27 15:32:47 +01:00
Emil Axelsson f50d215db9 Fix bug with fisheye rendering introduced in anchor-and-aim commit 2019-03-26 16:11:51 -06:00
Jonathan Fransson f7651c5d10 Merge 2019-03-26 14:13:40 -06:00
Jonathan Fransson ba5afe3b65 working on renderableSatellites 2019-03-26 14:11:35 -06:00
Elon 219b69c4ea correcting errors 2019-03-26 11:31:57 -06:00
Jonathan Fransson a3ff4e7ab1 merge 2019-03-25 14:40:28 -06:00
Jonathan Fransson 7b33d9e9a6 merge 2019-03-25 14:37:10 -06:00
Elon 31b1f7ea9a appearance 2019-03-25 14:34:56 -06:00
Jonathas Costa 9325e7fac3 Fixed unforms problems when eclipses are activated. (#797) 
* Fixed unforms problems when eclipses are activated.
 2019-03-24 13:21:07 +01:00
Emil Axelsson 55979fa2c8 Feature/statistics (#810) 
* Add statistics options for dashboarditemframerate
 2019-03-24 13:09:31 +01:00
Emil Axelsson 2f1131dac3 Issue/772 (#811) 
* Fix issue #772
* Update webgui frontend
 2019-03-24 12:50:54 +01:00
Alexander Bock bb3db7ada7 Feature/jenkins fix (#816) 
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
 2019-03-24 11:19:39 +01:00
Elon 08e123a3db Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris 2019-03-22 10:54:22 -06:00
Elon 95f1c5d2e7 some code to test 1 sgn, more renderables 2019-03-22 10:54:14 -06:00
Jonathan Fransson cdf4a11848 scene setup 2019-03-22 10:53:35 -06:00
Jonathan Fransson b360c11661 added spaceDebris scene 2019-03-18 16:09:02 -06:00
Emil Axelsson a216b7f8bd Fix bug with fisheye rendering introduced in anchor-and-aim commit 2019-03-18 17:31:07 +01:00
Elon ea4907dc42 include debris in default scene 2019-03-15 16:17:34 -06:00
Micah Acinapura 8ff4a63b02 fix for session recording to support macro variables (#802) 
Fix for session recording to support macro variables
 2019-03-11 16:41:12 +01:00
Emil Axelsson 70babdbd85 Update sgct 2019-03-11 13:58:27 +01:00
Emil Axelsson 87e2dcd788 Update Ghoul 2019-03-11 13:15:13 +01:00
Alexander Bock b65b8b3f42 Update SGCT and Ghoul 2019-03-08 11:52:57 +01:00
Gene Payne 63c1ac89fb Changes to touch module to allow it to build with or without webbrowser module enabled (#808) 2019-03-07 11:15:45 +01:00
Alexander Bock f49202c36c Update the gitignore file 
Update SGCT
 2019-03-06 13:07:59 +01:00
Emil Axelsson 5a8a944c61 Fix bug with hierarchical rotations in the scene graph 2019-03-05 18:55:34 +01:00
Emil Axelsson 6b28bac054 Fix anchor-and-aim related errors 2019-03-04 22:59:06 +01:00
Emil Axelsson b5eb41e27f Guard against potential nullpointer dereferencing 2019-02-22 17:58:08 +01:00
Gene Payne c44290fe1f Feature/touch web gui support (#798) 
* Added touch support for web GUI

* Code cleanup after master merge, no functionality changes

* Fixed alignment of function arguments
 2019-02-21 07:35:47 -07:00
Alexander Bock 21fd957f28 Add an option for hardcoding a fixed bounding sphere that is used if there is no renderable attached to a scenegraph node 2019-02-20 16:55:48 +01:00
Emil Axelsson 3e5b59b46a Add missing BIN path to TaskRunner to fix issue with config file 2019-02-20 12:49:19 +01:00
Emil Axelsson 738a5900d4 Patch imgui to work with new anchor and aim structure 2019-02-20 10:26:09 +01:00
Emil Axelsson 2e71eaa4cb Feature/anchor and aim (#799) 
Introduce the ability to navigate using an anchor and aim.
Example use: Set spacecraft as anchor and planet as aim to always look down at a planet, while followin the spacecraft in its orbit.
 2019-02-19 18:46:58 +01:00
mingenuity df9fbf8195 Add support for zoom sensitivity adjustment with Ctrl/Shift (#792) 
* Add support for zoom adjustment with Ctrl/Shift using Z (speed up zoom) and X (slow down zoom)
 2019-02-18 18:42:46 +01:00
Neal McBurnett cdac35619e README: Note OpenGL 3.3 requirment; fix wiki links (#795) 
Closes #794
 2019-02-18 18:34:03 +01:00
Gene Payne f6e27b7500 Gaia scene file needs to have capitalized to compare against loaded OpenSpace modules 2019-02-13 12:31:40 -07:00
Emil Axelsson 075625c223 Prevent file handles to leak into nodejs server application 2019-02-13 17:08:29 +01:00