mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-07 12:00:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,988 Commits 84 Branches 48 Tags
583663db22595825617c7504b5c6fdc8a34a4051
Commit Graph

2988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Nilsson 583663db22 solve merge conflict 2016-06-29 16:52:48 -04:00
Michael Nilsson eb4e2bb08a actually fix thread blocking issue + changeRange fix in Histogram + unused function cleanup 2016-06-29 16:52:04 -04:00
Michael Nilsson 636fdf2394 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-29 10:17:08 -04:00
Sebastian Piwell de7ba80f83 Correct time for keybinding 2016-06-29 10:16:56 -04:00
Michael Nilsson 25b341cc6a fix for blocking call to fetchFile in DownloadManager 2016-06-29 10:15:00 -04:00
Sebastian Piwell accca7dad8 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-29 09:22:47 -04:00
Sebastian Piwell ac1707929c Globebrowsing linux compile fix 2016-06-29 09:22:37 -04:00
Michael Nilsson 8afefd77d3 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-28 18:08:03 -04:00
Michael Nilsson f9738d8356 move call to calculateFilterValues to DataCygnet 2016-06-28 18:07:51 -04:00
Michael Nilsson e8bbb9e0c5 fix for generation of equalizer in histogram 2016-06-28 17:57:29 -04:00
Sebastian Piwell fbc3d4b01d Stop all mouse states 2016-06-28 15:46:40 -04:00
Sebastian Piwell b15f88df26 Better IswaGui 2016-06-28 15:42:54 -04:00
Sebastian Piwell e78da43c6e Moved stop function from header 2016-06-28 15:08:57 -04:00
Sebastian Piwell d2fccb6d1b Save and Load camera position 2016-06-28 15:03:00 -04:00
Sebastian Piwell a9ac7ab65b Linux and rotation fix 2016-06-28 14:19:19 -04:00
Kalle Bladin fcaee68424 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-27 20:18:02 -04:00
Kalle Bladin ce72f57183 Minimum camera height above surface is now configurable. 2016-06-27 18:46:35 -04:00
Erik Broberg 21c67e3199 Enable real time monitoring of StatsCollector data 2016-06-27 18:08:26 -04:00
Michael Nilsson 1efb30bf7a Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-27 17:39:22 -04:00
Michael Nilsson 2907910499 add comments and removed unnesesary code 2016-06-27 17:39:13 -04:00
Michael Nilsson 5d8e21267f solve merge conflict and linux fix 2016-06-27 17:37:58 -04:00
Erik Broberg 6522a0f64a Added clarifying comments to DebugRenderer header file 2016-06-27 16:54:56 -04:00
Kalle Bladin 9d8932218f Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-27 16:17:22 -04:00
Kalle Bladin 627f00faba Generalize tile fetching to consider datasets without overviews. 2016-06-27 16:17:10 -04:00
Erik Broberg 7d80598166 Add Mars Viking MDIM21 dataset config 2016-06-27 13:44:08 -04:00
Sebastian Piwell 2bd884facf Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-27 13:21:28 -04:00
Michael Nilsson d8565460c2 add group name to cygnet name in gui again 2016-06-27 13:27:29 -04:00
Sebastian Piwell fe4ba636cc Group name in cynget name again 2016-06-27 13:21:23 -04:00
Sebastian Piwell 0664cba722 Save build data for better histograms 2016-06-27 11:56:22 -04:00
Michael Nilsson 74df9be099 fieldline lua table creation logic moved to luacygnetconverter 2016-06-27 11:54:46 -04:00
Michael Nilsson 78ee734b56 create luacygnetconverter 2016-06-27 09:40:40 -04:00
Alexander Bock 8886eeec9d Compile fix for when globebrowsing is not available 2016-06-26 03:38:42 +02:00
Erik Broberg 6843b37a3d Add D3 javascript visualization of chunk statistics generated by StatsCollector 2016-06-24 16:35:35 -04:00
Erik Broberg b9f3b03af3 Fix bug causing StatsCollector to crash during dump to file if a StatsCollection is empty 2016-06-24 14:51:25 -04:00
Michael Nilsson a0d11ada41 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-24 14:18:14 -04:00
Michael Nilsson 53c2534df6 refactor iswamanager 2016-06-24 14:18:00 -04:00
Erik Broberg b5c85184da Restructure StatsCollectors to keep track of both integers and doubles 2016-06-24 13:52:30 -04:00
Erik Broberg 064c9a5722 Add templated stats collector to store structured data in tables 2016-06-24 11:45:36 -04:00
Sebastian Piwell 5c5e668f49 Moved some files 2016-06-24 09:45:43 -04:00
Alexander Bock 74ff3eddbd Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop 2016-06-24 10:56:57 +02:00
Alexander Bock 9705c33c16 Disable default module setting for galaxy, globebrowsing, and multiresvolume 
Update Ghoul repository
 2016-06-24 10:55:49 +02:00
Erik Broberg 0c935e5b59 Use current - instead of maximum - chunk level height tiles in ground collision test 2016-06-23 20:23:08 -04:00
Erik Broberg e59dd7a391 Enable finding a ChunkNode in ChunkNode tree based on a Geodetic2 point 2016-06-23 20:16:47 -04:00
Erik Broberg a6baa5107a Add test if GeodeticPatch contains a Geodetic2 2016-06-23 20:02:24 -04:00
wundahlful b32262390c Updated Ghoul version for cppformat changes 2016-06-23 16:00:26 -06:00
wundahlful 4954dda561 Updating deprecated cppformat/format.h to fmt/format.h 
The warning in cppformat's version throws a fatal error in the VS compiler
 2016-06-23 15:32:10 -06:00
Sebastian Piwell 320b7efa43 Linux compile fix 2016-06-23 15:38:58 -04:00
Michael Nilsson 16618e4f48 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-23 11:27:12 -04:00
Michael Nilsson 65daa4223b add const to iswamanager functions and another fix for filter 2016-06-23 11:26:57 -04:00
Sebastian Piwell 11cbfcf949 Merge branch 'develop' into feature/iSWA 2016-06-23 11:22:39 -04:00