Commit Graph

118 Commits

Author SHA1 Message Date
Jonathas Costa a797c2b6db Merged master into NewAtmosphere 2017-12-01 17:13:04 -05:00
Alexander Bock 38338725b9 Strict coding style adherence 2017-11-26 14:57:26 -05:00
Jonathas Costa 41dae755f5 Merged master. 2017-11-15 17:47:21 -05:00
Alexander Bock bbd019e8dd Jenkins build hotfix 2017-11-12 10:52:26 -05:00
Alexander Bock 76b26c0128 Change to different libTorrent version 2017-11-11 16:06:02 -05:00
Alexander Bock 6911a0cade Revert libtorrent back to an RC version 2017-11-11 15:41:57 -05:00
Alexander Bock 953d1581ae Update libTorrent repository 2017-11-10 09:47:37 -05:00
Jonathas Costa ac15a14602 Merged. 2017-11-09 14:02:01 -05:00
Alexander Bock b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Alexander Bock 80f5706049 Remove warnings on Clang 2017-11-07 09:19:45 -06:00
Emil Axelsson 81e81d04e4 Force Cmake flags for Libtorrent 2017-11-05 20:04:01 +01:00
Jonathas Costa 5b11eff966 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2017-10-29 11:51:26 -04:00
Alexander Bock 2bfbf82403 Fix Tully download
Guard against stray .data files
2017-10-19 23:56:16 -04:00
Jonathas Costa 55d71af9a4 Fixed double declaration of style variable. 2017-10-18 21:46:20 -04:00
Emil Axelsson 3307b3f3bc Update logo in Launcher 2017-10-18 17:12:30 +02:00
Emil Axelsson 7eb65c54be Guard against concurrent downloads of the same file 2017-10-18 16:57:38 +02:00
Emil Axelsson 1862b804a9 Use libtorrent as a git submodule. Support base library functions in Lua execution of the Launcher. 2017-10-18 14:47:01 +02:00
Emil Axelsson ed89587487 Remove libtorrent from repository 2017-10-17 14:20:55 +02:00
Alexander Bock c275b2f833 Feature/cmake cleanup (#381)
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Alexander Bock 9401579cc0 Jenkins compile fix by specifying compile settings for applications 2017-07-15 15:53:45 -04:00
Matthew Territo 2d1661679c Replace ${SGCT} token with ${CONFIG} in Launcher and OpenSpaceEngine. 2017-07-10 11:53:15 -06:00
Alexander Bock 24485d8032 Use icon for Launcher 2017-07-01 17:53:23 -04:00
eriksunden 0d05d30396 Feature/packaging (#333)
* Added proper CPACK structure and added generation of openspace.h header to add verisoning information in CMake.

* Packaging(ZIP on Windows, TGZ on UNIX) and installer creation(Windows Only via NSIS) is now working.

* Fixes for packing an archive on OSX.

* Add missing files in packaging
Add install setting to the globebrowsing module to copy required gdal_data
Update Credits

* Updated application icon
2017-07-01 14:04:37 -04:00
Matthew Territo 46179922b7 Remove if guard on libtorrent's find_package(Boost). Enable Boost multithreading. (#341) 2017-07-01 12:51:19 -04:00
Matthew Territo 17b0034384 Put _optionParser back into use. 2017-05-19 15:22:00 -06:00
Matthew Territo ade212665e Change tab to spaces 2017-05-19 12:15:39 -06:00
Matthew Territo ce83666ec0 Cleanup Launcher config comments, unecessary changes, etc. 2017-05-19 12:08:55 -06:00
Matthew Territo 08aea81e1e Merge commit 'd94940e6d2b0a5a8de390eee107d4dcf5e91ad72' into feature/launcherconfigs
* commit 'd94940e6d2b0a5a8de390eee107d4dcf5e91ad72':
  * cleaner coding to only select default checkbox for Launcher sync
  * When Launcher first starts only the default scene is selected.
2017-02-20 08:39:49 -07:00
Matthew Territo a6e3972fa9 Merge commit '30477f49f846c77193418f31653cb692bcdf58b2' into feature/launcherconfigs
* commit '30477f49f846c77193418f31653cb692bcdf58b2':
  * Launcher checkbox colors are green (not so bright) or grey (not red) * Changed "Cancel" button to "Exit"
2017-02-20 08:39:36 -07:00
Eric Myers d94940e6d2 * cleaner coding to only select default checkbox for Launcher sync 2017-02-19 18:37:06 -05:00
Eric Myers c104eeffc7 * When Launcher first starts only the default scene is selected. 2017-02-19 10:54:54 -05:00
Eric Myers 30477f49f8 * Launcher checkbox colors are green (not so bright) or grey (not red)
* Changed "Cancel" button to "Exit"
2017-02-19 09:13:45 -05:00
Matthew Territo fd7d9b5dbb Update LogManager singleton initialization 2017-02-16 12:18:36 -07:00
Matthew Territo e319f87350 Log level set via config file 2017-02-15 21:53:43 -07:00
Matthew Territo 895ad51e39 Add Launcher key to ConfigurationManager. Initial work. 2017-02-15 17:05:59 -07:00
Matthew Territo bb4d89cfdf Merge branch 'develop' into feature/launcherconfigs 2017-02-14 08:56:40 -07:00
Alexander Bock e3cfba8fec Merge commit '48e77f6106979c9d2b602534e6bccebcbb1aadad' into develop
# Conflicts:
#	apps/OpenSpace/main.cpp
2017-02-13 16:17:49 -05:00
noahdasanaike 48e77f6106 Modified launcher checkboxes to have clearly defined check-indicators; (#228)
green indicates a check, whereas red does not.
2017-02-13 22:12:35 +01:00
Matthew Territo fcbfeb86ee Merge branch 'develop' into feature/launcherconfigs 2017-02-13 08:27:39 -07:00
Alexander Bock ea485fd418 More include guard fixes 2017-02-09 22:20:17 -05:00
Matthew Territo 0414261e11 Start with Option Parser for Launcher 2017-02-09 16:43:38 -07:00
Alexander Bock 94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock aa2ac511ff Adapt to Ghoul changes of moving LogLevel out of LogManager 2016-12-14 22:59:22 +01:00
Alexander Bock 80d806d62c Remove nonfunctioning keyboard bindings 2016-12-09 10:34:11 +01:00
Alexander Bock fe436748bf Implementing Translation classes for Keplerian elements as well as two-line element formats (#172) 2016-12-02 15:05:49 +01:00
Alexander Bock e543163612 Updating Ghoul reference
Adapt to the API changes
2016-11-14 14:45:26 +01:00
Alexander Bock 3dbcd20de8 Require the Qt5 modules in the Launcher application 2016-08-26 19:32:28 +02:00
Alexander Bock 21e9599888 SyncWidget in Launcher must also compare base directory before removing duplicates (closing #126) 2016-08-18 17:33:08 +02:00
Alexander Bock bf4989d396 Changing request URL for the Launcher
Update gitignore file
2016-08-01 13:59:10 +02:00
Alexander Bock 81c18b2b62 Updated URLs in code or comments 2016-08-01 11:05:50 +02:00