72ba616414
Merge branch 'develop' into feature/remote_redesign
...
Conflicts:
modules/base/shaders/path_fs.glsl
2015-07-07 20:31:01 +02:00
52146a79a6
Remove old script messages for changing the origin and the coordinate system
...
Adapt the onscreen-gui to use the new property mechanism
Adapt the Timeline GUI to use the new property mechanism
2015-07-07 18:52:09 +02:00
2f801a4171
adding a password check when changing hosts
2015-07-07 15:29:56 +02:00
405aa70352
Refix Devil vs FreeImage
...
Fix the downloading detection of filenames in Launcher
2015-07-07 14:48:20 +02:00
326f42f224
changed it so the buffer is completely flushed if there are messages queued when send function is called
2015-07-07 14:05:09 +02:00
b75743a0ba
stability fix to ensure socket isn't shutdown when first message has not yet been queued
2015-07-07 13:37:23 +02:00
414e8d1182
renaming function for sending
...
minor bugfix
2015-07-07 13:23:32 +02:00
9cdc9c30d2
code cleanup and optimisation in the way threads are handled
2015-07-07 12:49:48 +02:00
9100be55eb
Merge branch 'feature/remote_redesign' of openspace.itn.liu.se:/openspace into feature/remote_redesign
...
# By Alexander Bock
# Via Alexander Bock
* 'feature/remote_redesign' of openspace.itn.liu.se:/openspace:
Fixing one more memory leak that leaked a StaticEphemeris per ScenegraphNode
Fixing a memory bug in SpiceManager
Update to use new Ghoul version
Remove extra " characters when a StringProperty is set by a string
2015-07-07 08:21:15 +02:00
2a0787386e
adding a forced time jump to trigger recomputation of trails when an init message is received
2015-07-07 08:21:10 +02:00
bacb1a46f9
Fixing one more memory leak that leaked a StaticEphemeris per ScenegraphNode
2015-07-06 23:42:04 +02:00
19540a6f21
Fixing a memory bug in SpiceManager
2015-07-06 22:47:55 +02:00
74fb051246
Remove extra " characters when a StringProperty is set by a string
2015-07-06 19:40:20 +02:00
8f76f8adc6
modified return value of toString method of string properties. It can now be used in scripts
2015-07-06 19:10:56 +02:00
987af4fb76
removing more obsolete functions
2015-07-06 18:55:49 +02:00
8efbf8e3da
removing LUA script from .inl file
2015-07-06 18:49:52 +02:00
bf14a2bcc2
Merge branch 'feature/remote_redesign' of openspace.itn.liu.se:/openspace into feature/remote_redesign
...
* 'feature/remote_redesign' of openspace.itn.liu.se:/openspace:
Fixing proper decoding of initialization messages
2015-07-06 18:49:21 +02:00
b0eef21a2c
removing obsolete functions and lua scripts
2015-07-06 18:49:17 +02:00
07a3c6fb0c
Fixing proper decoding of initialization messages
2015-07-06 18:44:47 +02:00
5d8383d91f
Allowing PropertyOwners to have an empty name (pulling their properties and subowners into the owners namespace
2015-07-06 18:30:26 +02:00
174129be5e
Merge commit '5c45815b9c509cbf98d1f3c7ad1e6035c4962a81' into feature/remote_redesign
2015-07-06 16:50:35 +02:00
1de7a76cde
Making changing the coordinate system a property in InteractionHandler
2015-07-06 16:14:49 +02:00
bb32699f70
commenting out older version of script sharing
2015-07-06 15:57:51 +02:00
678362eee2
Add a global propertyowner namespace to which the InteractionHandler is added, removing the need for the earlier hack
2015-07-06 15:55:42 +02:00
5c45815b9c
Prefer FreeImage to DevIL as DevIL has issues on Mac
2015-07-06 15:16:21 +02:00
0345cb2d28
Fix downloadmanager on Mac
2015-07-06 15:16:02 +02:00
36db7c37bf
minor fix
2015-07-06 15:09:08 +02:00
0550ffd0db
recommit of previous fix
2015-07-06 15:06:48 +02:00
f01278be60
test
2015-07-06 14:56:02 +02:00
fa765b9ded
Introducting hack to make Interactionhandler properties be settable by scripts
2015-07-06 14:50:55 +02:00
51bab14dcc
adding initialization messages functionality
2015-07-06 14:06:54 +02:00
446aa544b8
Making origin a property
2015-07-06 13:10:59 +02:00
16437856b4
fixes to matrix/vector property toString methods
2015-07-06 12:50:04 +02:00
e8809ac84c
changes to syncing of scripts for properties
2015-07-06 11:28:15 +02:00
34412b7a8b
more work on communication protocol
2015-07-06 10:00:07 +02:00
d76e18d9ee
more work on scripting synchronization and state saving
2015-07-05 17:21:23 +02:00
47b40e23d0
Merge branch 'develop' into feature/remote_redesign
...
* develop:
Renamed getLua, setLua, getString, and setString methods to add "Value" to the end of the method name Added documentation for getString/setString methods
Enable Properties to be set by strings
Add a button to the SyncWidget to allow it to be closed
Updated to new Ghoul version
Make multithreaded download a toggle
Correctly Set the CMAKE_PREFIX_PATH for Qt on Mac
Add commandline argument to OpenSpaceEngine to override scene file Make scene file selectable in Launcher, using the configurationfile value as default
Non-Windows compile fix
Include stylesheet in main file
Add stylesheets and general improvements
2015-07-05 16:43:38 +02:00
b53efe4f0e
changed how time keyframes are used
2015-07-05 16:41:38 +02:00
03994b2758
Renamed getLua, setLua, getString, and setString methods to add "Value" to the end of the method name
...
Added documentation for getString/setString methods
2015-07-05 16:37:03 +02:00
75a64e770f
Enable Properties to be set by strings
2015-07-05 16:23:48 +02:00
93e4a9b526
redesigning the communication protocol and message types.
...
also added time keyframes which are sent on a per-frame basis
2015-07-05 16:09:57 +02:00
df3688f04a
Make multithreaded download a toggle
2015-07-04 22:03:54 +02:00
c375f18dac
Add commandline argument to OpenSpaceEngine to override scene file
...
Make scene file selectable in Launcher, using the configurationfile value as default
2015-07-04 21:21:27 +02:00
003a438602
Removed while loops from path_vs that caused driver issues with big w values
...
Removed error that caused the postDraw method not to be called on slave nodes
2015-07-04 15:41:43 +02:00
a9824dabc1
Merge branch 'develop' into feature/remote
2015-07-03 16:18:59 +02:00
0cd9e6b687
script execution is no longer bound by mutexes
2015-07-03 16:17:48 +02:00
41dd524d38
changes to how mutex protection of camera works.
...
moved mutex locking of camera variables into camera class and changed where locks occur inte interaction handler to avoid deadlocks
2015-07-03 15:30:34 +02:00
8c2b5bb199
Tons of stability improvements to threading of parallel connection.
...
changed name of variables and functions to reflect more what they do.
removed obsolete functions.
parallel connection is no longer in contact with main thread unless to be deleted
2015-07-03 14:43:48 +02:00
304a328cde
Let TimelineView handle multiple instances of Labelparser and HongkangParsers
2015-07-03 00:00:48 +02:00
19af895752
changed it so parallel connection scripts are only run ont he master mode.
2015-07-02 17:28:04 +02:00
Alexander Bock