Commit graph

928 commits

Author SHA1 Message Date
David Rowe
2cc3ed6287 List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
David Rowe
08dc9b133f Docs to JSDoc review 2018-04-26 21:10:28 +12:00
milad nazeri
23d07fa292 fixed spacing issue 2018-04-24 13:14:55 -07:00
milad nazeri
1121fe8da0 fix tabs 2018-04-23 21:47:53 -07:00
milad nazeri
4ac06fe99f Updating previous jsdocs 2018-04-22 22:22:33 -07:00
milad nazeri
e9b9c05b5d removed cruft 2018-04-22 08:51:47 -07:00
David Rowe
a8501a7ac6 Remove old Leap Motion code 2017-06-15 14:45:40 +12:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Brad Davis
2b43a1989f Moving face and eye trackers out of interface 2017-04-28 23:28:17 -07:00
Brad Davis
5e1bc0d908 Remove faceshift 2017-04-28 16:34:54 -07:00
Seth Alves
05c135b9d8 uuid keys for overlays appears to work 2017-02-16 21:22:23 -08:00
Seth Alves
c1e41311fc working toward using uuids for overlay IDs 2017-02-16 17:18:09 -08:00
Seth Alves
ccaf7379fc missed some more due to conditional compilation 2016-08-18 10:31:53 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Brad Hefta-Gaub
927fe97359 migrate callers of QMessageBox::warning() to OffscreenUi::warning() 2016-01-05 10:17:16 -08:00
Atlante45
d3224bfde3 More warning fixes 2015-12-11 16:03:44 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Brad Davis
2cea593fbd Remove RealSense & MIDI 2015-12-03 11:00:01 -08:00
EdgarPironti
603405ad61 Do not merge - Spacemouse 2015-11-02 23:29:15 -08:00
Seth Alves
310a5c9bfb don't initialize SMI sdk unless we need it 2015-11-02 13:42:12 -08:00
Brad Davis
c4e82a85d9 Remove DeviceProxy in favor of InputDevice 2015-10-29 09:32:56 -07:00
Brad Davis
4a1df286fd Cleanup of enums and JS names 2015-10-21 15:57:37 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
2015-10-20 10:20:28 -07:00
Brad Davis
0063f9ae1d Merging old and new controller interfaces 2015-10-14 15:16:54 -07:00
Brad Hefta-Gaub
37f530f97f first cut at wiring up devices and inputs to JS 2015-10-09 16:15:29 -07:00
Thijs Wenker
6e52fcb857 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
2015-10-07 03:11:24 +02:00
Atlante45
775994f9d0 Fix for 3DConnection 2015-10-06 13:57:49 -07:00
Atlante45
e9b7125894 Misc cleanup 2015-10-06 13:56:26 -07:00
Atlante45
cf3b33a96b Replace Application::getInstance() with qApp 2015-10-06 13:56:19 -07:00
Thijs Wenker
f6afb4cb02 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
2015-10-06 19:56:22 +02:00
Brad Hefta-Gaub
2eaeb26b2a fix GetVersionEx warning 2015-09-24 09:14:51 -07:00
Brad Hefta-Gaub
e99ad75a28 more warnings fixes 2015-09-22 18:01:39 -07:00
Brad Davis
d7a850d7be Merge pull request #5638 from MarcelEdward/hifi-3DConnexion-cmake-fix
Hifi 3 d connexion cmake fix
2015-09-14 18:53:39 -07:00
MarcelEdward
64a8f7ebb4 Update 3DConnexionClient.h 2015-09-15 00:30:11 +02:00
David Rowe
fdcfa9657c Rework and clarify stopping an existing DDE process 2015-09-09 21:06:50 -07:00
David Rowe
01d7e68dbb Terminate DDE earlier during shut-down and always at start-up 2015-09-09 11:29:57 -07:00
Brad Davis
b7237fb5ca Fixing build problem with 3d connexion 2015-08-23 09:32:58 -07:00
Seth Alves
296a6b1cb8 re-enabled ctrlaltdavid's eye calibration code 2015-08-17 12:20:46 -07:00
David Rowe
7298fa7e2c Log successful start of eye tracker streaming 2015-08-12 15:22:24 -07:00
David Rowe
9fe1aaf182 Disable saving / loading eye tracker calibrations so can use old SDK 2015-08-12 15:21:06 -07:00
David Rowe
e6473fc8b9 Merge branch 'master' into 20639
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.h
	tests/ui/src/main.cpp
2015-08-11 12:34:28 -07:00
David Rowe
f7dc5480b7 Fix #include path for OSX/Linux 2015-08-10 20:20:51 -07:00
David Rowe
8b326414ac Start eye tracker streaming such that don't block Interface
Start method is called in a separate thread.
2015-08-10 19:19:29 -07:00
David Rowe
81d8edae5f Add missing 5 point calibration 2015-08-10 13:23:14 -07:00
David Rowe
e7beb544f6 Log successfully loading eye tracker calibration 2015-08-10 13:22:46 -07:00
David Rowe
658434e020 Automatically save and restore eye tracker calibration
Automatically saves and restores just a single calibration so that user
doesn't have to manually save or load, which isn't very convenient to do
with an HMD on.
2015-08-10 13:20:42 -07:00
David Rowe
4f3c4a5312 Tidy up handling of eye tracker streaming 2015-08-10 12:52:47 -07:00
David Rowe
ea03067a02 When eye tracking data is lot for > N seconds handle as "not tracking"
Revert to default look-at behaviour and saccades until tracking resumes.
2015-08-07 12:23:43 -07:00
David Rowe
e2bf5cad3e Resume eye tracking at start-up if was running at shut-down 2015-08-07 11:59:11 -07:00
David Rowe
738c5658fa Guard against NaNs in eye tracker look-at position 2015-08-06 20:46:51 -07:00