ebf99b3d0d
Small changes in Imageplane color and AssetLoader
2018-01-01 09:52:44 -05:00
edc250deb8
Cleanup core script extensions
...
Cleanup default scripts
2017-12-31 23:26:38 -05:00
f5662b3fe4
Add function to asset Lua namespace that can check whether another asset exists
2017-12-31 19:41:56 -05:00
dcfef3557f
Update copyright header
2017-12-29 20:11:22 +01:00
c9a3c68f19
Fix style guide issues
...
Update Ghoul repository
2017-12-29 19:18:06 +01:00
1ddde4b6e1
Merge commit 'a9661f681e115ebed096f5d25343dc99aad0f33f' into feature/data-management
...
# Conflicts:
# data/scene/default.scene
# data/scene/digitaluniverse/abell/abell.mod
# data/scene/digitaluniverse/backgroundradiation/backgroundradiation.mod
# data/scene/digitaluniverse/constellations/constellations.mod
# data/scene/digitaluniverse/grids/grids.mod
# data/scene/digitaluniverse/quasars/quasars.mod
# data/scene/digitaluniverse/sloandss/sloandss.mod
# data/scene/digitaluniverse/tully/tully.data
# data/scene/digitaluniverse/tully/tully.mod
# data/scene/earth/earth.mod
# data/scene/grids/grids.mod
# data/scene/mars/mars.mod
# data/scene/milkyway/digitaluniverse/digitaluniverse.mod
# data/scene/moon/moon.mod
# data/scene/satellites/tle/geo.txt
# data/scene/satellites/tle/gps-ops.txt
# data/scene/satellites/tle/stations.txt
# modules/imgui/src/renderproperties.cpp
# modules/sync/ext/libtorrent
# openspace.cfg
# src/rendering/renderengine.cpp
2017-12-27 19:39:40 +01:00
fac3780ce9
Remove warnings on MacOS
2017-12-26 23:06:11 +01:00
59916bc0c1
Renaming path tokens
...
- ${BASE_PATH} -> ${BASE}
- ${OPENSPACE_DATA} -> ${DATA}
- Make use of new token ${WEB}
Enable Phobos and Deimos on default
Remove unused cdflist file
2017-12-26 20:49:17 +01:00
1079d67c9a
Have the documentation print out more information if an error occurs
...
Add other scene files (commented out) to the openspace.cfg
2017-12-25 09:10:22 +01:00
079627e4c1
Merge branch 'feature/data-management' of https://github.com/OpenSpace/OpenSpace into feature/data-management
2017-12-23 23:25:38 +01:00
2fad096a28
Add directory constant to asset table
2017-12-23 18:17:45 +01:00
a8ea93da17
Make regular settings default in RenderableGlobe and GDALWrapper
...
Fix spelling error in Asset
Wrap initializeGL in try/catch block to catch error
2017-12-23 16:31:17 +01:00
5139f7df4f
Slight improvement of error handling
...
- Do not try to reinitialize assets whose initialization failed.
- Fail gracefully when adding a scenegraphnode with a name that already exists
2017-12-23 10:17:08 +01:00
4b65e20570
Support loading of .asset and .scene files
...
Fix hardcoded paths to placeholder image add placeholder image to repository
Disable launcher in SyncWidget to keep it compiling until deletion
2017-12-23 08:08:12 +01:00
ca6263ed1e
Add support for absolute asset paths and explicit specification of .asset suffix.
2017-12-22 17:06:42 +01:00
2baa0cbb6d
Fix bug with assets changing state prematurely, while loading
2017-12-22 00:15:23 +01:00
abb22b4aaa
Small fix to fix state inconsistency bug
2017-12-21 10:10:55 +01:00
c763b7c30c
Fix state inconsistency bug in asset system
2017-12-20 12:13:18 +01:00
d328db7f4b
Code cleanup
2017-12-19 12:05:28 +01:00
09182c9274
Cleanup code
2017-12-19 11:48:30 +01:00
f7dc598f60
Small code cleanup
2017-12-19 11:17:56 +01:00
90243cf388
Improve loading screen
2017-12-18 15:00:57 +01:00
ff317d4b2f
Show loading screen when loading assets
2017-12-18 11:55:14 +01:00
fd550fc372
Fix compilation issues and bugs on windows
2017-12-18 10:22:42 +01:00
570a499a59
Fix bugs from merge
2017-12-17 18:58:24 +01:00
d4278f9adc
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-17 18:30:00 +01:00
df259f6d02
Multithreaded scene initialization
2017-12-17 17:34:46 +01:00
84dfbe7b80
Clean up asset related code
2017-12-16 12:51:46 +01:00
814de72bc2
Fix bugs in asset management
2017-12-15 18:51:22 +01:00
75cf6dcf71
Asset work in progress
2017-12-15 13:21:10 +01:00
eead4b7f25
Merged master into NewAtmosphere.
2017-12-14 15:55:27 -05:00
23a446cb2c
Update Ghoul repository
...
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
2017-12-13 21:55:29 -05:00
952f8e8e13
Merged master into NewAtmosphere.
2017-12-12 13:43:40 -05:00
2f2bba5094
Clear lua refs when unloading asset
2017-12-12 18:55:44 +01:00
1926b59f91
Thread safety in torrentclient. Add syncfile to torrentsync.
2017-12-12 18:36:09 +01:00
a774b7b5b2
Start implementing support for removing assets
2017-12-12 17:48:33 +01:00
d1305bee6b
Cleanup
2017-12-12 15:21:17 +01:00
1417db5ed7
Let assets control their own lifecycle
2017-12-12 14:55:30 +01:00
a631b7e0a3
Making most logger categories constexpr
2017-12-11 23:46:34 -05:00
2152c3ee88
Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere
...
# Conflicts:
# modules/imgui/src/renderproperties.cpp
2017-12-11 09:12:13 -05:00
e0504980ad
Initialize requested assets when they are ready
2017-12-11 11:12:39 +01:00
c9aedb084b
Add Lua functions to query keyboard bindings and remove individual keybinds
...
Add core script file that defines possibility of rebinding keyboard commands to a different key
Enable the execution of global customization scripts
Make `scene_helper.lua` a script automatically included in the ScriptScheduler
2017-12-08 14:58:18 -05:00
0396832ae5
Change notification mechanisms for assets
2017-12-08 17:36:45 +01:00
f3dfade201
Start adding support for removing assets
2017-12-08 16:02:45 +01:00
3968961434
Show resource sync progress in gui
2017-12-08 14:37:34 +01:00
9630e735db
An asset can only be considered synchronized when all required assets are synchronized
2017-12-07 11:07:15 +01:00
175d21de9a
Remove experimental code
2017-12-06 15:16:52 +01:00
79581c8556
Add lua function to set camera state without loading from file
2017-12-06 14:58:14 +01:00
d16efef3d9
Automatically initialize assets
2017-12-05 16:01:59 +01:00
a797c2b6db
Merged master into NewAtmosphere
2017-12-01 17:13:04 -05:00
Alexander Bock