overte-HifiExperiments/interface/src/scripting
Thijs Wenker 953ff6caa7 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation
Conflicts:
	interface/src/Application.cpp
	interface/src/scripting/HMDScriptingInterface.h
	libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h
2015-10-06 20:06:29 +02:00
..
AccountScriptingInterface.cpp remove unused variable 2014-06-17 23:54:55 +02:00
AccountScriptingInterface.h remove unused parameter in AccountScriptingInterface::updateBalance 2014-06-17 23:51:02 +02:00
AudioDeviceScriptingInterface.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-28 13:13:32 -08:00
AudioDeviceScriptingInterface.h Merge branch 'master' into 20276 2015-01-27 19:08:40 -08:00
ClipboardScriptingInterface.cpp Fix ClipboardScriptingInterface to call methods on main app thread 2015-09-28 15:05:48 -07:00
ClipboardScriptingInterface.h add support to not displace very large clipboards on import 2015-05-11 14:21:58 -07:00
ControllerScriptingInterface.cpp cleanup controller interface, add getActionNames() and getDeviceNames() 2015-08-24 15:35:55 -07:00
ControllerScriptingInterface.h cleanup controller interface, add getActionNames() and getDeviceNames() 2015-08-24 15:35:55 -07:00
DesktopScriptingInterface.cpp Add Desktop object to JavaScript with width and height properties 2015-08-25 16:13:36 -07:00
DesktopScriptingInterface.h Add Desktop object to JavaScript with width and height properties 2015-08-25 16:13:36 -07:00
DialogsManagerScriptingInterface.cpp Add toggle event for address bar. 2015-07-31 11:26:04 -07:00
DialogsManagerScriptingInterface.h Add toggle event for address bar. 2015-07-31 11:26:04 -07:00
GlobalServicesScriptingInterface.cpp remove renderingInWorldInterface signals 2015-09-18 09:49:57 -07:00
GlobalServicesScriptingInterface.h Add menu items that set visibility 2015-03-29 18:35:56 -07:00
HMDScriptingInterface.cpp Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 2015-10-06 20:06:29 +02:00
HMDScriptingInterface.h Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 2015-10-06 20:06:29 +02:00
LocationScriptingInterface.cpp update lobby for new places API 2015-01-14 18:18:26 -08:00
LocationScriptingInterface.h handle location set/get in AddressManager, handle set to address map 2014-10-28 10:35:56 -07:00
MenuScriptingInterface.cpp Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
MenuScriptingInterface.h
SettingsScriptingInterface.cpp Settings update 2015-02-03 12:27:30 -08:00
SettingsScriptingInterface.h
WebWindowClass.cpp Auto refresh entities list upon display of Entities tab 2015-08-27 13:32:00 -07:00
WebWindowClass.h Auto refresh entities list upon display of Entities tab 2015-08-27 13:32:00 -07:00
WindowScriptingInterface.cpp Signal domain changes for those handled by ICE as well as not 2015-06-09 12:33:14 -07:00
WindowScriptingInterface.h Display notification if domain connection refused 2015-03-23 12:05:56 -07:00