mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 21:18:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
5413ca7ddf92ee053735a5e647fd0422c21411b2
OpenSpace/modules
T
History
Johann Granström 5413ca7ddf Merge branch 'thesis/2020/software-integration' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration 
# Conflicts:
#	modules/softwareintegration/softwareintegrationmodule.cpp
2020-09-24 11:47:21 +02:00
..
atmosphere
Merge remote-tracking branch 'origin/master' into feature/openglstatecache
2020-09-04 14:02:17 +02:00
base
Merge remote-tracking branch 'origin/master' into feature/openglstatecache
2020-09-04 14:02:17 +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 remote-tracking branch 'origin/master' into feature/openglstatecache
2020-09-04 14:02:17 +02:00
fieldlines
Update the copyright header to 2020
2020-02-10 21:51:01 +01:00
fieldlinessequence
Make more use of temporary string objects in the TimeQuantizer
2020-08-19 18:26:11 +02: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
Merge remote-tracking branch 'origin/master' into feature/openglstatecache
2020-09-04 14:02:17 +02:00
globebrowsing
Various Xcode compile fixes
2020-09-14 10:38:46 +02:00
imgui
Merge remote-tracking branch 'origin/master' into feature/openglstatecache
2020-09-04 14:02:17 +02:00
iswa
Make more use of temporary string objects in the TimeQuantizer
2020-08-19 18:26:11 +02: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
Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).
2020-08-20 15:34:40 -04:00
server
Merge branch 'master' into feature/general-performance
2020-09-04 13:49:00 +02:00
softwareintegration
Merge branch 'thesis/2020/software-integration' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
2020-09-24 11:47:21 +02:00
space
Coding style adaptations
2020-08-25 13:47:03 +02:00
spacecraftinstruments
Merge branch 'master' into feature/general-performance
2020-09-04 13:49:00 +02:00
spout
Update the copyright header to 2020
2020-02-10 21:51:01 +01:00
sync
First commit
2020-08-30 22:00:13 +02:00
touch
Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).
2020-08-20 15:34:40 -04:00
toyvolume
Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet).
2020-08-20 15:34:40 -04:00
vislab
General code cleanup
2020-04-14 15:48:58 +02:00
volume
Make more use of temporary string objects in the TimeQuantizer
2020-08-19 18:26:11 +02:00
webbrowser
Update submodules
2020-09-01 01:18:17 +02:00
webgui
Coding style cleanup
2020-02-14 19:37:06 +01:00