mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-30 15:59:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
328 Commits 85 Branches 48 Tags
82ff7fa984f385a71be34a9fa5fc67e751e95975
Commit Graph

328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonas Strandstedt 82ff7fa984 Merge branch 'develop' into stars 
Conflicts:
	include/openspace/util/constants.h
	shaders/pscstandard_fs.glsl
	shaders/pscstandard_vs.glsl
	src/interaction/interactionhandler.cpp
	src/main.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp
	src/util/factorymanager.cpp
 2014-09-24 15:39:22 +02:00
Jonas Strandstedt 326599c538 Small fix for missing Boost 2014-09-24 13:46:04 +02:00
jonasstrandstedt 43610798f6 Made it easier to get started on Windows 2014-09-23 13:39:39 +02:00
Alexander Bock dd629db53d More code cleanup, force inclusion of swizzling for GLM 2014-09-19 17:44:33 +02:00
Alexander Bock 51be4b1788 Make use of new Dictionary::getValueSafe method 
Clean up code in various places
 2014-09-19 00:29:36 +02:00
Alexander Bock bd850d56f5 Remove renderableToggle as it has been replaced with a property 2014-09-18 20:39:30 +02:00
Alexander Bock 80b73f9910 Fix for rendering volumes 2014-09-18 17:28:50 +02:00
Alexander Bock 0fbdbb8dab Fix a bug in TemplateProperty preventing new bool values to be set 
Add "isEnabled" flag BoolProperty to all renderables
 2014-09-18 08:46:46 +02:00
Alexander Bock d1bc655323 Updated used Ghoul version 2014-09-17 20:17:00 +02:00
Alexander Bock 3f1e8d67ca Added more faster interaction 2014-09-17 20:11:59 +02:00
Alexander Bock 27901c1629 Make GUI creation optional 2014-09-17 01:13:17 +02:00
Alexander Bock 448aa97ce6 Removed old GUI application and added new version 2014-09-17 01:11:39 +02:00
Alexander Bock 7fd3519d10 Make the single.xml SGCT file allow external commands 2014-09-17 01:11:12 +02:00
Alexander Bock 8ec9bc6705 Cleaned up main.cpp 
Added functionality to send Lua scripts over the network
 2014-09-17 01:10:52 +02:00
Alexander Bock 03e25f69d5 Update post-receive hook 2014-09-15 18:52:43 +02:00
Alexander Bock 8e1135cf27 Update post-receive hook 2014-09-15 18:32:22 +02:00
Alexander Bock 954b2d07e9 A change to check the build system 2014-09-15 18:31:27 +02:00
Alexander Bock c7c7fa4413 Fix the build again 2014-09-15 18:02:57 +02:00
Alexander Bock 7f8b7950af Deliberately break to check email from Jenkins 2014-09-15 17:59:06 +02:00
Alexander Bock 82b61c567b Merge branch 'feature/time' into develop 2014-09-15 16:27:02 +02:00
Alexander Bock a81547f40e Merge branch 'develop' into feature/time 2014-09-15 00:16:33 +02:00
Alexander Bock 3ae37d0991 More compile fixes for Jenkins 2014-09-14 23:53:41 +02:00
Alexander Bock 50494cffdd More compile fixes for Jenkins 2014-09-14 23:49:38 +02:00
Alexander Bock b30de7726e More compile fixes for Jenkins 2014-09-14 23:46:02 +02:00
Alexander Bock 1f7f4016ae More compile fixes for Jenkins 2014-09-14 23:40:48 +02:00
Alexander Bock d8c41c7d4f Remove warnings and errors in Jenkin's gcc 2014-09-14 23:35:14 +02:00
Alexander Bock c48b35a7ce Added Doxygen configuration file 2014-09-14 18:37:30 +02:00
Alexander Bock 66722e83a6 Cleaned up script functionality in SceneGraph 
Removed scriptfunctions.h and cpp as the functions have moved into other classes
 2014-09-14 18:36:33 +02:00
Alexander Bock 3d62caae46 Added missing documentation 2014-09-14 17:40:19 +02:00
Alexander Bock f0dfd0fa04 Added documentation for Time class 2014-09-14 17:36:10 +02:00
Alexander Bock 9b2a04a8c4 More work on Time class 
Fixed bool -> int conversion in SpiceManager
 2014-09-14 15:51:46 +02:00
Alexander Bock 0eeeb8efd6 More work on fixing script access to time 2014-09-13 19:25:33 +02:00
Alexander Bock 3afa0ecaa1 Added support for scripting 2014-09-13 18:25:14 +02:00
Alexander Bock b6246f6538 Renamed methods in SpiceManager 
Started change of Time class
 2014-09-13 18:02:39 +02:00
Alexander Bock 1101b656b8 Added missing change for the merge 2014-09-13 12:10:55 +02:00
Alexander Bock ce10dea96e Fixed compile errors, probably finished merge 2014-09-13 11:45:49 +02:00
Alexander Bock 954dbdce13 Merge branch 'origin/feature/ABuffer' into properties 2014-09-13 10:59:33 +02:00
Alexander Bock 4b8a17386f Updated ghoul version 2014-09-13 10:52:04 +02:00
Alexander Bock e13eafdbde Added more comments to main.cpp 2014-09-13 10:33:16 +02:00
Alexander Bock d659c11365 Make StringProperty a specialization rather than a subclass of TemplateProperty 2014-09-12 16:59:29 +02:00
michal c1c637efa7 minor fixes, please ref to previous commit 2014-09-10 14:35:44 -04:00
michal 686c7b0b9b final calibration + scaling fix. Looks good now. 2014-09-10 11:32:23 -04:00
michal 9c1319e298 added data 2014-09-07 16:23:12 -04:00
michal f0f3b08ab6 some cleanup 2014-09-07 16:19:13 -04:00
Alexander Bock cdfde82522 Added documentation for the PropertyDelegate class 2014-09-07 17:45:53 +02:00
Alexander Bock e5b61492e9 Fixed documentation in the inlined code of TemplateProperty as well 2014-09-07 17:20:04 +02:00
Alexander Bock 351c235312 Added documentation to TemplateProperty 
Fixed bug where listeners were not notified
 2014-09-07 17:11:12 +02:00
Alexander Bock 816a3a846f Removed a float vs double warning 2014-09-07 17:10:45 +02:00
Alexander Bock e16373cfcf Fixed a bug that causes the application to crash if no listener is installed for a Property 2014-09-07 17:10:33 +02:00
Alexander Bock fb24f06e5a Added doxygen files and fixed documentation errors 2014-09-07 16:59:51 +02:00