Matthew Territo b892642868 Merge commit '9f1c4e847d7c37e75f0e73d051c8f7c758f20147' into feature/websocketnavigation ...

* Update & cleanup WebsocketInputStates to be part of globals
* Update fmt library calls to handle non-standard objects (json, enum, etc.)

# Conflicts:
#	include/openspace/interaction/inputstate.h
#	src/interaction/inputstate.cpp

2018-09-06 18:54:40 -06:00

..

include

Disengaged Autopilot on disconnect

2018-08-29 11:11:11 -06:00

src

Merge commit '9f1c4e847d7c37e75f0e73d051c8f7c758f20147' into feature/websocketnavigation

2018-09-06 18:54:40 -06:00

CMakeLists.txt

Init FlightControllerTopic

2018-07-10 10:32:21 -06:00

include.cmake

Feature/thesis work merge (#566)

2018-03-20 09:30:59 +01:00

servermodule.cpp

Feature/globals (#690)

2018-08-30 11:38:47 -04:00

servermodule.h

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00