Commit Graph

2828 Commits

Author SHA1 Message Date
Jonathan Fransson 89530d6428 merge 2019-05-30 10:19:49 -06:00
Elon 79cd779057 Fail to initialize asset, debris, satellites_shared:184 2019-05-30 10:18:50 -06:00
Elon 47f8e3e82a loop debris elements 2019-05-30 10:18:08 -06:00
Jonathan Fransson cdab5707d4 push latest 2019-05-30 10:17:33 -06:00
Elon 2d6ca18ec3 started building on a new renderable from scratch 2019-05-30 10:16:31 -06:00
Jonathan Fransson 1aeee50c2a initializeGL stuff 2019-05-30 10:14:30 -06:00
Jonathan Fransson 01fefeca23 work on renderablesatellites 2019-05-30 10:14:30 -06:00
Jonathan Fransson 52174666fc work on renderablesatellites 2019-05-30 10:13:25 -06:00
Elon 371eb4eec5 correcting errors 2019-05-30 10:13:25 -06:00
Jonathan Fransson 842dda11d7 working on renderableSatellites 2019-05-30 10:12:58 -06:00
Elon 5682d31772 appearance 2019-05-30 10:09:50 -06:00
Jonathan Fransson b27b035cf8 merge 2019-05-30 10:09:49 -06:00
Elon 1a2867772a some code to test 1 sgn, more renderables 2019-05-30 10:08:24 -06:00
Jonathan Fransson b497797cf1 working on renderableSatellites 2019-05-30 10:02:14 -06:00
Elon 7586d15027 correcting errors 2019-05-30 10:01:28 -06:00
Jonathan Fransson 02cf344a22 merge 2019-05-30 10:01:28 -06:00
Elon a38635b2f0 appearance 2019-05-30 10:00:16 -06:00
Elon 5abb86c392 some code to test 1 sgn, more renderables 2019-05-30 09:57:34 -06:00
Emil Axelsson 53e07d90e1 Feature/documentation topic (#822)
- Implement documentation topic that can be used to query documentation using the network API.
- Implement a way to pass arguments to lua scripts using json (rather than formatting entire lua string clientside)
- Implement ability to attach callback to lua script executions
- Implement abillity to transport return values from lua scripts back to network API clients.
- Do not initialize server interface on slave nodes.
- Implement Dictionary -> json converter using nlohmann json library
2019-04-03 10:30:28 +02:00
Jonathas Costa 9325e7fac3 Fixed unforms problems when eclipses are activated. (#797)
* Fixed unforms problems when eclipses are activated.
2019-03-24 13:21:07 +01:00
Emil Axelsson 55979fa2c8 Feature/statistics (#810)
* Add statistics options for dashboarditemframerate
2019-03-24 13:09:31 +01:00
Alexander Bock bb3db7ada7 Feature/jenkins fix (#816)
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
2019-03-24 11:19:39 +01:00
Gene Payne 63c1ac89fb Changes to touch module to allow it to build with or without webbrowser module enabled (#808) 2019-03-07 11:15:45 +01:00
Emil Axelsson b5eb41e27f Guard against potential nullpointer dereferencing 2019-02-22 17:58:08 +01:00
Gene Payne c44290fe1f Feature/touch web gui support (#798)
* Added touch support for web GUI

* Code cleanup after master merge, no functionality changes

* Fixed alignment of function arguments
2019-02-21 07:35:47 -07:00
Emil Axelsson 738a5900d4 Patch imgui to work with new anchor and aim structure 2019-02-20 10:26:09 +01:00
Emil Axelsson 2e71eaa4cb Feature/anchor and aim (#799)
Introduce the ability to navigate using an anchor and aim.
Example use: Set spacecraft as anchor and planet as aim to always look down at a planet, while followin the spacecraft in its orbit.
2019-02-19 18:46:58 +01:00
Emil Axelsson 075625c223 Prevent file handles to leak into nodejs server application 2019-02-13 17:08:29 +01:00
Emil Axelsson f60371bdbc Pass on modifier keys to CEF for mouse events (#790)
* Update sgct
* Pass on modifier keys to CEF for mouse events
2019-02-04 15:14:51 +01:00
Emil Axelsson 59b1f2b741 GaiaStars: Fix bug with setting shader option from dictionary 2019-01-31 13:33:19 +01:00
Alexander Bock 99a43747e1 Update cfitsio to fix Jenkins 2019-01-24 16:02:58 +01:00
Alexander Bock 7fefaca345 Feature/jenkins (#788)
* Update Jenkinsfile
* Fix compilation for OSX
* Update SGCT to fix Jenkins compile issue on Ubuntu
* Make OSX Jenkins build not quiet
* Only build OpenSpace target on Mac
2019-01-23 10:17:15 -05:00
Emil Axelsson 8b396b6028 Fix gui scale bug 2019-01-22 10:53:26 +01:00
Emil Axelsson c3cc53f08d Make it possible to rescale web gui 2019-01-19 19:16:56 -05:00
Alexander Bock c7639adb15 Remove warnings in Clang 2019-01-19 14:49:31 +01:00
Emil Axelsson 0c6b5e95c6 Introduce ability to configure ports etc for external applications. (#785)
Introduce ability to configure ports etc for external applications, including webgui
2019-01-04 10:23:28 +01:00
Alexander Bock 8d64020601 Add new translation that uses longitude/latitude to compute translation on a RenderableGlobe 2018-12-04 11:24:35 -05:00
Alexander Bock ecdb05e98e Correctly compile if the sync module is compiled without libtorrent support 2018-12-04 09:02:54 -05:00
Alexander Bock 6b011d117c Make CMake scream less 2018-12-03 14:29:14 -05:00
Alexander Bock 36d0f71913 Only set CEF settings to OpenSpaceTest if OpenSpace is compiled with tests (closes #778)
Do not disable RTTI on CEF targets
Do not for Unicode on CEF targets
More graceful handling of torrent classes in Sync module
2018-12-03 14:00:08 -05:00
Alexander Bock 203db2357e Compile fix for touch module
Compile fix for AbfferRenderer
2018-12-03 09:55:13 -05:00
Alexander Bock 06b20d2fe8 Fix GUI Json creation error 2018-11-30 20:09:00 -05:00
Alexander Bock c7a96a6b59 Address clang tidy complaints
Update Ghoul repository
Update SGCT repository
2018-11-30 15:34:09 -05:00
Matthew Territo aa89a63f74 Fix GAIA module compile for macOS (missing #include <string>) 2018-11-29 17:18:32 -08:00
Emil Axelsson 42b7203f0c Add lua helper function to create custom focus nodes on globes (bookmarks) 2018-11-22 13:51:52 +01:00
Emil Axelsson 45e687a23e Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-11-22 12:40:30 +01:00
Emil Axelsson 89b68d43d8 Add Opacity property for RenderableTimeVaryingVolume 2018-11-22 12:39:08 +01:00
Emil Axelsson b6d3a4a8ea Fix volume rendering depth sorting issue 2018-11-22 12:37:11 +01:00
Alexander Bock 65195975bb Add display showing the number of active layers
Automatically disable last layer if number of texture units is exhausted
Closes #427
2018-11-21 17:32:51 -05:00
Alexander Bock d9b2c3ca96 Don't crash if TileProvider cannot be created (closes #464) 2018-11-21 15:21:40 -05:00