mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 09:20:26 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,675 Commits 83 Branches 48 Tags
305ae9d8fbb4fc04914290ce18766e88bd85d644
Commit Graph

5675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GPayne 305ae9d8fb Merge with master branch 2018-05-15 13:56:17 -06:00
Emil Axelsson a6501cb288 Add missing include 2018-05-15 10:03:18 +02:00
GPayne e31e80d851 Make lower-right corner double tap zoom-out a non-optional feature 2018-05-14 15:03:47 -06:00
Jonathas Costa b2ba103889 Merge pull request #608 from OpenSpace/issue/607 
Issue/607
 2018-05-14 15:41:54 -04:00
Jonathas Costa 18f771b02a Merged master 2018-05-14 15:36:44 -04:00
Jonathas Costa ffb9d0c1d9 Merge pull request #603 from OpenSpace/feature/StereoATM 
Stereo and Performance ATM
 2018-05-14 15:33:42 -04:00
Jonathas Costa 447014aa6e Merge branch 'master' into issue/607 2018-05-14 15:13:49 -04:00
Jonathas Costa 26c65915d4 Fixed double initialization of font renderer and fixed bug in the msaa sampling pattern creation. 2018-05-14 15:03:09 -04:00
Jonathas Costa 959dfa8ede Temporarilly moved star's rendering back to original one in order to avoid unkown night sky for non-stereo users. 2018-05-14 14:16:15 -04:00
Jonathas Costa 25fbaf4294 Removed extra comma from configuration file. 2018-05-14 13:38:45 -04:00
Jonathas Costa f7dcc9c941 Merged master into StereoATM 2018-05-14 13:23:47 -04:00
GPayne a767c2fd08 Fixed some touch behavior (especially zoom) and implemented lower-right corner double-tap for zooming out 2018-05-08 16:44:53 -06:00
GPayne d686212b35 Added asymmetrical zooming to try for more balance between zooming in vs. out 2018-05-07 16:06:21 -06:00
GPayne 1d5298660b Modified control of gesture sensitivity settings to improve feel of interaction, fixed roll decay bug 2018-05-07 16:06:21 -06:00
GPayne 0e9dc1eff8 Fixed numerical error in touch interaction 2018-05-07 16:06:13 -06:00
Emil Axelsson 97b2311cb3 ToyVolume: Fix bugs, clean up and add example asset 2018-05-04 18:04:47 +02:00
Alexander Bock 20ff81017c Keep old image projections on a model 2018-05-03 17:43:29 -04:00
Alexander Bock b5be0db02c Make removeSceneGraphNode remove recursively correctly 2018-05-03 15:24:12 -04:00
Alexander Bock e13160efb5 Add distance information to voyager 1 and 2 
Update Saturn Ring texture
 2018-05-02 21:15:25 -04:00
Alexander Bock 0f33639ca2 Add LiU WMS files 
Make use of Sweden-based WMS files
Set correct name for automatically loaded Info files
 2018-05-01 17:16:28 -04:00
Alexander Bock d6571a131d Enable the disabling of hash generation in URL synchronization 2018-05-01 14:30:18 -04:00
Jonathas Costa 7285a66c89 Changes from comments. 2018-04-22 09:52:21 -04:00
Alexander Bock a881eef156 Cleanup in Renderers 2018-04-22 09:15:42 +00:00
Jonathas Costa 4e8ebb0bb8 Merge branch 'master' into issue/607 2018-04-21 16:46:57 -04:00
Jonathas Costa a5108db405 Removed unused transformations. 2018-04-21 16:45:19 -04:00
Jonathas Costa 7ca335a324 New size control configurations for a few assets. 2018-04-21 16:38:54 -04:00
Jonathas Costa fca8e7f46b Refined new size control and added possibility to change control size system. 2018-04-21 16:38:24 -04:00
Jonathas Costa fc71ad1a83 Copied changes from previous branch and added new size control system. 2018-04-21 15:17:41 -04:00
Alexander Bock 7068637c9d Make it possible to click on the friction markers in the image to toggle the friction (closes issue #576) 2018-04-21 19:04:47 +00:00
Alexander Bock f7e5ba8fff Closes #604 
Remove identifier from VirtualPropertyManager
Add VirtualPropertyManager to the query of allProperties
 2018-04-21 14:34:15 +00:00
Alexander Bock 5e1f26cc6b Issue/372 (#606) 
* Add commandline argument that applies a Lua script to the configuration
 2018-04-21 09:54:05 -04:00
Alexander Bock 8a902efb26 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2018-04-21 08:28:42 -04:00
Alexander Bock db66084ad8 Fix warnings and coding style issues 2018-04-21 08:27:20 -04:00
Alexander Bock d0368a2edd Fix warnings and coding style issues 2018-04-21 08:26:59 -04:00
Alexander Bock 818ee225a5 Define a Cache path on default 
Cleanup OpenSpaceEngine
Cleanup RenderEngine
  * ScreenSpaceRenderables are now owned by RenderEngine, rather than being shared_ptr
Cleanup LogFactory
 2018-04-21 07:00:43 -04:00
Alexander Bock 8aa4c4fa42 Update copyright headers 2018-04-21 00:44:54 -04:00
Alexander Bock a9b981d718 LLVM compile fixes 
Updated to new Ghoul commit
 2018-04-20 23:12:13 -04:00
Jonathas Costa 3960ee1f09 Requested changes for merging. Part VIII. 2018-04-20 23:05:20 -04:00
Jonathas Costa d5af5aab5d Fixed interaction of trail points with ATM. (#602) 
* Fixed interaction of trail points with ATM.
* Added fix from SunEarh day.
 2018-04-20 22:47:17 -04:00
Jonathas Costa 49b08ed1c3 Enabled eclipses on Earth again. 2018-04-20 21:52:51 -04:00
Jonathas Costa 4197bb8200 Merged master. 2018-04-20 21:37:40 -04:00
Jonathas Costa ce72e6c8ad Requested changes for merging. Part VII. 2018-04-20 21:15:25 -04:00
Jonathas Costa 87d1072712 Requested changes for merging. Part V. 2018-04-20 21:11:01 -04:00
Jonathas Costa d42bd39fa2 Fixed font rendering. 2018-04-20 20:54:24 -04:00
Jonathas Costa 5a63500cb0 Requested changes for merging. Part V. 2018-04-20 20:54:13 -04:00
Jonathas Costa cd95ebb213 Requested changes for merging. Part IV. 2018-04-20 19:56:17 -04:00
Jonathas Costa 908ade3215 Requested changes for merging. Part III. 2018-04-20 19:21:37 -04:00
Jonathas Costa c4ece52ca6 Requested changes for merging. Part II. 2018-04-20 19:11:38 -04:00
Jonathas Costa 64d84f3b10 Requested changes for merging. Part I. 2018-04-20 19:00:00 -04:00
Alexander Bock b4be63af65 Feature/configuration (#605) 
* Switch openspace.cfg file from a Dictionary-based loading to a variable based loading
 * Change ConfigurationManager to not use Dictionary anymore, but a struct with explicit configuration values instead
 2018-04-20 18:40:21 -04:00