Commit Graph

66 Commits

Author SHA1 Message Date
Alexander Bock
bcf92804b6 Updating Ghoul repository
Updating SGCT repository
Removing compiler warnings
2017-03-10 09:32:16 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock
c880ee421a Make OpenSpaceModule able to report their version number 2016-10-29 23:13:37 +02:00
Emil Axelsson
b448b0ec5e Move all network namespace members into the openspace namespace 2016-09-30 14:13:36 +02:00
Emil Axelsson
4f61479190 Move network status into parallel connection class 2016-09-30 13:36:35 +02:00
Emil Axelsson
0230acb005 Merge branch 'feature/parallelconnection' into develop
Conflicts:
	src/interaction/interactionhandler.cpp
2016-09-30 11:01:37 +02:00
Emil Axelsson
e8f9d4b37b clean up time sync 2016-09-23 00:31:47 +02:00
Emil Axelsson
cd325686ad Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp
2016-09-22 19:33:05 +02:00
Emil Axelsson
112fe7fc54 synchronize time over parallel connection 2016-09-22 18:42:19 +02:00
Emil Axelsson
fa8eee5386 sync camera movement over parallel connection 2016-09-19 14:49:57 +02:00
Emil Axelsson
13610b390d distinguish between local and remote scripting 2016-09-16 14:53:20 +02:00
Emil Axelsson
41fafcb5df begin refactor parallel connection 2016-09-08 18:04:06 +02:00
Erik Broberg
9196ec2f50 Remove local, shared, synced versions of Time. Keep one source of true 2016-09-03 19:45:58 -04:00
Alexander Bock
65ddeba70c Add SGCT as submodule
Fix compile errors in ParallelConnection using __WIN32__ macro instead of WIN32
2016-07-20 14:31:30 +02:00
Alexander Bock
f7f8f279de Move the LuaLibrary definition into its own file 2016-07-18 12:40:29 +02:00
Kalle Bladin
45e7c41690 Update camera to use double precition. 2016-06-05 21:27:20 -04:00
Alexander Bock
906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock
cf517f5309 Replacing CMake-based version setting with C++-based version
Adding function to OpenSpace that returns the license header
2016-04-14 10:27:59 -04:00
Michael Nilsson
2ca5d52fa3 fix for linux 2016-03-28 11:25:04 -04:00
Alexander Bock
877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Alexander Bock
e26f1d41a4 Updated Ghoul version
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Alexander Bock
293faf8ca9 Adopted cleaned up fontrendering code 2015-11-23 20:18:38 -05:00
Alexander Bock
a59ed82ec5 Linux compile fix 2015-07-16 14:39:51 +02:00
Alexander Bock
5fcc8792a2 Updated OpenSpace Version
Rename capitalized include to non-capitalized
2015-07-16 14:32:09 +02:00
Joakim Kilby
2f801a4171 adding a password check when changing hosts 2015-07-07 15:29:56 +02:00
Joakim Kilby
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
Joakim Kilby
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
Joakim Kilby
414e8d1182 renaming function for sending
minor bugfix
2015-07-07 13:23:32 +02:00
Joakim Kilby
9cdc9c30d2 code cleanup and optimisation in the way threads are handled 2015-07-07 12:49:48 +02:00
Joakim Kilby
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
Joakim Kilby
987af4fb76 removing more obsolete functions 2015-07-06 18:55:49 +02:00
Joakim Kilby
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
Joakim Kilby
b0eef21a2c removing obsolete functions and lua scripts 2015-07-06 18:49:17 +02:00
Joakim Kilby
07a3c6fb0c Fixing proper decoding of initialization messages 2015-07-06 18:44:47 +02:00
Joakim Kilby
36db7c37bf minor fix 2015-07-06 15:09:08 +02:00
Joakim Kilby
0550ffd0db recommit of previous fix 2015-07-06 15:06:48 +02:00
Joakim Kilby
f01278be60 test 2015-07-06 14:56:02 +02:00
Joakim Kilby
51bab14dcc adding initialization messages functionality 2015-07-06 14:06:54 +02:00
Joakim Kilby
e8809ac84c changes to syncing of scripts for properties 2015-07-06 11:28:15 +02:00
Joakim Kilby
34412b7a8b more work on communication protocol 2015-07-06 10:00:07 +02:00
Joakim Kilby
d76e18d9ee more work on scripting synchronization and state saving 2015-07-05 17:21:23 +02:00
Joakim Kilby
b53efe4f0e changed how time keyframes are used 2015-07-05 16:41:38 +02:00
Joakim Kilby
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
Joakim Kilby
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
Joakim Kilby
2bd2270434 fixed compile issue on mac 2015-07-02 17:10:43 +02:00
Joakim Kilby
6f3b534969 minor bugfixes 2015-07-02 15:07:28 +02:00
Joakim Kilby
c11c0eb81f changed time scripts to not include "" in them.
moved thread deletion to prevent deadlock
2015-07-02 14:48:17 +02:00
Joakim Kilby
cb9bd514f6 added message type saying if initialisation is done and lua function + script
added current time and current delta time to initialisation scripts
2015-07-02 14:01:54 +02:00
Joakim Kilby
19c7022220 added current time sync 2015-07-02 12:25:44 +02:00
Joakim Kilby
532e2b1004 even more fixes to thread safety, fixed an issue on Mac where logging kept going after connection was lost 2015-07-01 14:31:45 +02:00