Commit Graph

20 Commits

Author SHA1 Message Date
Alexander Bock
ecdb05e98e Correctly compile if the sync module is compiled without libtorrent support 2018-12-04 09:02:54 -05:00
Alexander Bock
c7a96a6b59 Address clang tidy complaints
Update Ghoul repository
Update SGCT repository
2018-11-30 15:34:09 -05:00
Alexander Bock
9f1c4e847d Feature/globals (#690)
* Move global objects out of OpenSpaceEngine
 * General cleanup of main.cpp
 * Add default_joystick asset to all scenes
 * No longer suppress mouse interaction on slave nodes
 * Window delegate uses function pointers rather than subclassing
 * Fix for false overwriting of ImGUI configuration file
 * Change default color and tilt angle of fisheye rendering
 * Restructured performance manager
 * Simplify screenshot handling
2018-08-30 11:38:47 -04:00
Alexander Bock
4952f8f977 Code cleanup branch (#618)
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
2018-06-10 04:47:34 +00: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
Alexander Bock
9177f5f432 Enable clearing multiple keys with the same function call
Slightly speedup application close
2018-03-30 00:01:57 -04:00
Alexander Bock
9a00f38e09 Feature/jenkins warnings (#538)
* Remove warnings from Jenkins
 * Improve Jenkins behavior
2018-02-28 08:41:55 -05:00
Alexander Bock
f0a55b21ff Add implementation of pure URL synchronization from foreign sources (#533)
* Add implementation of pure URL synchronization from foreign sources
 * Added hash of concatenated URLs to the identifier
 * Make the identifier optional
 * Remove unused code
2018-02-26 21:11:07 -05:00
Alexander Bock
ee7e1b9b96 Fix with asset_helper
Initial cleanup of Sync module
2018-02-24 00:46:28 -05:00
Emil Axelsson
471c030567 Fix torrent bug and improve stability of asset loader 2018-02-08 13:28:41 +01:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
c9a3c68f19 Fix style guide issues
Update Ghoul repository
2017-12-29 19:18:06 +01:00
Emil Axelsson
75cf6dcf71 Asset work in progress 2017-12-15 13:21:10 +01:00
Emil Axelsson
e201dec907 Start work on TorrentSynchronization 2017-11-06 19:07:52 +01:00
Emil Axelsson
2313a275d3 Resource syncing infrastructure 2017-10-31 17:46:48 +01:00
Emil Axelsson
af8bec1441 Prepare for data sync 2017-09-14 20:16:51 +02:00
Emil Axelsson
6c36fa7bfd Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management
Conflicts:
	include/openspace/util/concurrentjobmanager.h
	include/openspace/util/concurrentjobmanager.inl
	include/openspace/util/concurrentqueue.h
	include/openspace/util/concurrentqueue.inl
	include/openspace/util/threadpool.h
	modules/globebrowsing/tile/tileloadjob.h
	modules/sync/syncmodule.cpp
	src/util/threadpool.cpp
2017-08-15 11:34:54 +02:00
Emil Axelsson
eed7041f1c Compile fixes after merge 2017-08-15 11:25:52 +02:00
Emil Axelsson
9491e920ad Work on asset loader and synchronization module 2017-07-21 15:36:09 +02:00
Emil Axelsson
9c3ca2228a Add stub for sync module 2017-07-20 17:07:39 +02:00