mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 01:30:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
Files
b78d1dd033151ce9daeccd24e7ac1d97635612be
OpenSpace/modules
History
Alexander Bock b78d1dd033 Merge branch 'master' into feature/memory-allocations 
# Conflicts:
#	include/openspace/scene/scenegraphnode.h
#	modules/imgui/include/gui.h
2020-08-05 19:06:04 +02:00
..
atmosphere
Coding style fixes
2020-07-07 13:18:41 +02:00
base
Merge branch 'master' into feature/memory-allocations
2020-08-05 19:06:04 +02:00
cefwebgui
Update SGCT to not require the specification of projection planes if 3D rendering in not required
2020-06-23 15:18:25 +02:00
debugging
Update the copyright header to 2020
2020-02-10 21:51:01 +01:00
digitaluniverse
Merge pull request #1240 from OpenSpace/issue/1196
2020-07-13 12:23:33 +02:00
fieldlines
Update the copyright header to 2020
2020-02-10 21:51:01 +01:00
fieldlinessequence
Coding style cleanup
2020-02-14 19:37:06 +01:00
fitsfilereader
Fix issue with constellation art that left merge conflict annotations behind
2020-07-09 13:01:32 +02:00
gaia
Update gaia filtering scripts with functioning renderables
2020-06-16 16:15:36 +02:00
galaxy
Removing warnings
2020-04-14 22:32:26 +02:00
globebrowsing
Merge branch 'master' into feature/memory-allocations
2020-08-05 19:06:04 +02:00
imgui
Merge branch 'master' into feature/memory-allocations
2020-08-05 19:06:04 +02:00
iswa
Coding style cleanup
2020-02-14 19:37:06 +01:00
kameleon
Coding style cleanup
2020-02-14 19:37:06 +01:00
kameleonvolume
Coding style cleanup
2020-02-14 19:37:06 +01:00
multiresvolume
Coding style cleanup
2020-02-14 19:37:06 +01:00
server
Next step towards enabling a managed memory version of templatefactory
2020-08-04 21:56:39 +02:00
space
Merge branch 'master' into feature/memory-allocations
2020-08-05 19:06:04 +02:00
spacecraftinstruments
Next step towards enabling a managed memory version of templatefactory
2020-08-04 21:56:39 +02:00
spout
Update the copyright header to 2020
2020-02-10 21:51:01 +01:00
sync
Working version that still bypasses memorypools
2020-08-04 11:43:16 +02:00
touch
Use opacity instead of transparency in TouchMarker
2020-07-08 15:54:12 +02:00
toyvolume
Mixed cleanup
2020-07-10 11:25:26 +02:00
vislab
General code cleanup
2020-04-14 15:48:58 +02:00
volume
Linux fixes clang (#1216)
2020-06-25 18:55:20 -04:00
webbrowser
Linux fixes clang (#1216)
2020-06-25 18:55:20 -04:00
webgui
Coding style cleanup
2020-02-14 19:37:06 +01:00