Commit Graph

39 Commits

Author SHA1 Message Date
Michael Nilsson 3d3e59eabe solve merge conflict with develop 2016-04-20 16:38:41 -04:00
Michael Nilsson 07dfafeddb solve merge conflict with develop 2016-04-20 15:03:51 -04:00
Michael Nilsson 48a9aa3b40 add vscode dotfiles to ignor 2016-04-20 14:52:49 -04:00
Alexander Bock 5f69f995c3 Update gitignore for new NewHorizons texture 2016-04-20 14:28:47 +02:00
Michael Nilsson c0e3eed9e3 loading image cygnets from localhost 2016-04-19 09:54:18 -04:00
Alexander Bock c73404a1de Rename PlutoProjectionHybrid module to PlutoProjection
Remove outdated PlutoProjection module
2016-04-15 10:37:24 -04:00
Alexander Bock 588bc74a88 Enable subdirectories for modules
Move newhorizons scene modules into subdirectories
2016-04-15 09:52:08 -04:00
Alexander Bock dcf5507e1c Add the images of the plutoprojection into gitignore
Add a data directive to the plutoprojection that will download the New Horizons LORRI images
2016-04-14 21:17:19 -04:00
Sebastian Piwell c935ce6fe0 renamed module dataplane to iswa 2016-03-30 15:27:31 -04:00
Michael Nilsson 6034f7ee7e Merge branch 'feature/dataplane' of github.com:OpenSpace/OpenSpace-Development into feature/dataplane 2016-03-28 11:26:56 -04:00
Michael Nilsson fa477ae3b1 add pluto folders to ignore 2016-03-25 11:08:13 -04:00
Michael Nilsson d7e4a8b8e9 update gitignor with pluto texture folders 2016-03-24 16:48:04 -04:00
Sebastian Piwell c10dda95d8 Towards more general model scale and position 2016-03-24 16:38:56 -04:00
Sebastian Piwell 7712dd0190 Right scale and read from cdf file 2016-03-22 16:15:46 -04:00
Jonathas Costa f6b65ab8e0 Added entries for Windows thumbs files and Emacs backup files. 2016-03-16 09:15:31 -04:00
Michael Nilsson ec9261e1da fix function call to logmanager 2016-03-07 09:37:45 -05:00
piwell 87840bdb7f Linux fix 2016-03-04 15:06:41 -05:00
Alexander Bock 6653d67a3f Update Gitignore to include data files 2016-02-21 14:12:24 +01:00
Alexander Bock fc4a6b68fb Remove static version.h and replace by autogenerated file 2015-05-22 11:33:45 +02:00
Michal Marcinkowski cae39f2788 updates to the imagesequencing & renderableplanet projection classes mainly 2015-03-24 12:31:03 -04:00
Alexander Bock 24aadf83a3 Linux compile fix
Added Properties.txt to gitignore list
2015-02-23 14:06:08 +01:00
Alexander Bock e70b663dc3 Add log.html to the list of ignored files
Enable capability to disable on-screen info text
2014-12-11 18:09:19 +01:00
Alexander Bock b05c4cf30f Add capabilities to write out documentation of all Lua functions on startup 2014-11-29 14:03:49 +01:00
Alexander Bock 66ef5d9e3b Update openspace-data and gitignore list 2014-11-18 16:08:51 +01:00
Jonas Strandstedt a96e32badb Working OS X version 2014-10-31 15:37:03 +01:00
Jonas Strandstedt a8f3923659 Moved the lua command input to separete class
- Added functionality for keeping the input history
2014-10-22 13:04:55 +02:00
Alexander Bock 62e0844671 Add ABuffer/constants.hglsl to the ignore list 2014-10-06 13:44:21 +02:00
Alexander Bock cfcf0247be More cleanup of ConfigurationManager 2014-09-27 19:13:36 +02:00
Alexander Bock c48b35a7ce Added Doxygen configuration file 2014-09-14 18:37:30 +02:00
Jonas Strandstedt 114af3fb5b Added an OpenSpace ShaderCreator
- Global shader settings can now be added.
- ShaderCreator builds the shader and stores a generated shader file
with all included source.
- Small TransferFunction bugfix
2014-07-10 15:22:57 -04:00
Jonas Strandstedt 6419f34b5a ABuffer working with small issues
- Pointing to bugfixed Ghoul
- Pointing to Ghoul with Linux file callback
- Fixed interaction distance control bug when moving to close
- Distance control with mouse wheel added
- Kameleonwrapper normalization based on histogram
- ABuffer seems to work with small issues
2014-06-18 10:34:40 -04:00
Alexander Bock 98582a4131 Added kameleon as a subrepository 2014-05-14 00:45:48 +02:00
Alexander Bock 5e758b16d1 Misc work
Added ext/kameleon to .gitignore
moved renderableplanet to a subfolder
2014-05-05 12:41:41 +02:00
Hans-Christian Helltegen 658ae13d96 Added flare to OpenSpace 2014-03-19 16:41:12 -04:00
Jonas Strandstedt ee1ed6fa29 Updated with latest ghoul OpenCLCapabilitiesComponent 2014-03-05 15:05:29 -05:00
Hans-Christian Helltegen cb2cb177b3 Added a class for volume ray-casting and FBO class to ghoul. Also added a (probably tempoary) shader map to root dir with some shaders. Updated .gitignore for some common files 2014-02-26 23:38:33 +00:00
Jonas Strandstedt 470afe034b Fixed build and runtime errors and improved cross-platform compatibility 2014-02-19 10:17:32 -05:00
Alexander Bock 7a4983f2c9 adapt to new Ghoul version (p vs absPath macro)
added configurationmanager script
2014-01-16 14:56:50 +01:00
Alexander Bock 9885f52fd0 initial commit of transferred code from the old project 2014-01-04 18:24:33 +01:00