 Alexander Bock
|
616a115536
|
Adding a Lua function to manually enable/disable the frame synchronization
|
2016-09-24 14:55:20 +02:00 |
|
|
Alexander Bock
|
8cf39cdd29
|
Only enable syncing after the first frame due to high initialization load
|
2016-09-24 09:07:15 +02:00 |
|
|
Alexander Bock
|
e1b2877525
|
Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop
|
2016-09-23 23:25:17 +02:00 |
|
|
Alexander Bock
|
3dce9f0f21
|
Add DeprecationVerifier to the list of available verifiers
Add unit tests for DeprecationVerifier
|
2016-09-23 23:24:03 +02:00 |
|
|
Alexander Bock
|
fa136ecb99
|
Merge branch 'feature/synchronization' into develop
|
2016-09-22 17:58:05 +02:00 |
|
|
Alexander Bock
|
d8ca2965eb
|
Update the OpenSpace version for Kulturnatten
|
2016-09-22 10:28:24 +02:00 |
|
|
Alexander Bock
|
6938b59f00
|
Add application of blending and warping to the takeScreenshot function
|
2016-09-22 10:28:10 +02:00 |
|
|
Alexander Bock
|
8048a436d1
|
Include correct header in SyncEngine
|
2016-09-22 08:07:26 +02:00 |
|
|
Alexander Bock
|
6271c7d9f6
|
Fix a GCC compile error in SyncEngine
|
2016-09-22 08:05:31 +02:00 |
|
|
Alexander Bock
|
4e32b74b46
|
Potential GCC compile fix
|
2016-09-22 07:57:34 +02:00 |
|
|
Alexander Bock
|
6c50d4968c
|
Potential GCC compile fix
|
2016-09-21 23:17:50 +02:00 |
|
|
Alexander Bock
|
a400999c4b
|
Potential GCC compile fix
|
2016-09-21 23:11:59 +02:00 |
|
|
Alexander Bock
|
b83916ac3b
|
Potential GCC compile fix
|
2016-09-21 23:05:46 +02:00 |
|
|
Alexander Bock
|
5c84fd8919
|
Potential GCC compile fix
|
2016-09-21 22:52:39 +02:00 |
|
|
Alexander Bock
|
4c9f7a46c4
|
Potential GCC compile fix
|
2016-09-21 22:47:38 +02:00 |
|
|
Alexander Bock
|
2ed8042667
|
Add methods to disable synchronization during scene loading as the application will get killed by the sync timeout otherwise
|
2016-09-21 22:29:52 +02:00 |
|
|
Alexander Bock
|
a85356dcff
|
Add a commandline argument to override the cache directory
|
2016-09-21 22:10:59 +02:00 |
|
|
Alexander Bock
|
a45621948d
|
Making PerformanceMeasurement not crash when memory is deallocated
|
2016-09-21 09:07:22 +02:00 |
|
|
Alexander Bock
|
bc1366e79d
|
Use correct identifiers in OsirisRex data files
|
2016-09-20 21:23:58 +02:00 |
|
|
Alexander Bock
|
f15efdad6e
|
Add OsirisRex data file
|
2016-09-20 21:09:59 +02:00 |
|
|
Alexander Bock
|
57389755e7
|
Fix imaging for osiris rex
|
2016-09-20 20:02:47 +02:00 |
|
|
Alexander Bock
|
428f488bb6
|
Add documentation to Ephemeris classes
Remove unused "Reference" specification from mod files
Add osirisrex files to gitgnore
Make Ephemeris values into properties
|
2016-09-20 19:24:14 +02:00 |
|
|
Alexander Bock
|
329986c0c6
|
Merge branch 'develop' into feature/globebrowsing
Conflicts:
modules/base/scale/staticscale.cpp
modules/base/scale/staticscale.h
modules/globebrowsing/meshes/trianglesoup.h
modules/globebrowsing/tile/tiledataset.cpp
modules/newhorizons/shaders/renderableModelProjection_fs.glsl
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
src/scene/scenegraphnode.cpp
|
2016-09-20 15:52:01 +02:00 |
|
|
Alexander Bock
|
d3f7139f5e
|
Merge branch 'feature/globebrowsing' into syncing
Conflicts:
modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
openspace.cfg
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
|
2016-09-20 14:48:28 +02:00 |
|
|
Alexander Bock
|
b6a13fa097
|
Compile fix
|
2016-09-20 14:10:11 +02:00 |
|
|
Alexander Bock
|
077e737139
|
Merge remote-tracking branch 'origin/feature/osirisrex' into feature/globebrowsing
|
2016-09-20 13:25:41 +02:00 |
|
|
Alexander Bock
|
7235df2fe3
|
Place ScriptLog file in base directory
|
2016-09-20 10:12:53 +02:00 |
|
|
Alexander Bock
|
1b4b0f49b6
|
Update SGCT
|
2016-09-20 10:11:59 +02:00 |
|
|
Alexander Bock
|
6637ae2849
|
Update Ghoul
|
2016-09-19 22:45:45 +02:00 |
|
|
Alexander Bock
|
c44d37cd60
|
Merge branch 'feature/documentation' into develop
|
2016-09-19 14:19:26 +02:00 |
|
|
Alexander Bock
|
8867b3439f
|
Add central location for the core to register documentations
Add documentation to ScreenSpaceRenderable
Add documentation to Ephemeris
Add documentation to Rotation
|
2016-09-19 14:03:42 +02:00 |
|
|
Alexander Bock
|
d8f61e736a
|
Clean up gitignore file
|
2016-09-19 14:02:04 +02:00 |
|
|
Alexander Bock
|
85492405bd
|
Make use of referenced verifier for Renderables
Adapt HTML documentation generation
|
2016-09-19 11:24:37 +02:00 |
|
|
Alexander Bock
|
9b9f0ecce8
|
Add a ReferencingVerifier to the list of available verifiers
Require the Documentations identifier to be unique or empty
|
2016-09-19 10:32:14 +02:00 |
|
|
Alexander Bock
|
0a13d5430f
|
Make DocumentationEngine into a singleton object
Add documentation to DocumentationEngine
Add unique identifier to Documentation class (and enforce in DocumentationEngine)
|
2016-09-19 09:31:34 +02:00 |
|
|
Alexander Bock
|
29c989ab82
|
Add documentation to the documentation and verifier classes
Add static const member variable to the DocumentationEntry class for Wildcards
|
2016-09-18 20:47:41 +02:00 |
|
|
Alexander Bock
|
4e7035a18d
|
Renaming Offence to Offense
Renaming TestResult::offenders to TestResult::offenses
|
2016-09-18 15:31:12 +02:00 |
|
|
Alexander Bock
|
57701fb5a6
|
Adding information to the Result that specifies the offending reason in addition to the offending key
|
2016-09-18 15:13:34 +02:00 |
|
|
Erik Broberg
|
7f393a3270
|
Inject SyncBuffer into SyncEngine. Add Doxygen comments for SyncEngine and SyncData
|
2016-09-16 20:32:29 -04:00 |
|
|
Erik Broberg
|
dd304fee31
|
Make ScriptEngine implement Syncable interface
|
2016-09-16 15:40:29 -04:00 |
|
|
Erik Broberg
|
0cd40512dd
|
Generalize Syncable interface and use mutex locks for SyncData
|
2016-09-16 12:21:19 -04:00 |
|
|
Alexander Bock
|
a25a9b4a2d
|
Add the ability to the FactoryManager to write documentation about all registered classes
Enable this feature on default in openspace.cfg
Move all generated documentations into a documentation folder
Adapt gitignore accordingly
|
2016-09-16 17:37:02 +02:00 |
|
|
Alexander Bock
|
2c164a1098
|
Remove Documentation.html
|
2016-09-16 17:01:05 +02:00 |
|
|
Alexander Bock
|
2fa6471e98
|
Allow Documentations to be exhaustive to not allow extra dictionaries
|
2016-09-16 16:53:50 +02:00 |
|
|
Alexander Bock
|
24e5146a8e
|
Updating HTML generation for general documentation
|
2016-09-16 12:24:47 +02:00 |
|
|
Alexander Bock
|
17a65e3816
|
Writing general Documentation as HTML
Add HTML to gitignore
Set default documentation to HTML
|
2016-09-16 11:56:15 +02:00 |
|
|
Alexander Bock
|
7f0e0aafcc
|
Writing property documentation as html
|
2016-09-16 11:39:26 +02:00 |
|
|
Alexander Bock
|
76f1c7166a
|
Add HTML output to keybindings
|
2016-09-16 11:27:59 +02:00 |
|
|
Alexander Bock
|
022bf46313
|
Outputting HTML for the LuaScripting
|
2016-09-16 11:16:08 +02:00 |
|
|
Alexander Bock
|
b03661b755
|
Fix spelling in verifier comments
|
2016-09-16 11:15:48 +02:00 |
|