overte/interface/src/scripting
Bradley Austin Davis 7e60aee1bf Merge branch 'master' into plugins
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07: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 add support to not displace very large clipboards on import 2015-05-11 14:21:58 -07:00
ClipboardScriptingInterface.h add support to not displace very large clipboards on import 2015-05-11 14:21:58 -07:00
ControllerScriptingInterface.cpp Merge branch 'master' into plugins 2015-08-06 11:03:37 -07:00
ControllerScriptingInterface.h modified sword.js to work with vive controllers 2015-07-20 14:52:49 -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 Use improved WebWindowClass for friends window 2015-04-01 18:58:59 -07:00
GlobalServicesScriptingInterface.h Add menu items that set visibility 2015-03-29 18:35:56 -07:00
HMDScriptingInterface.cpp Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07:00
HMDScriptingInterface.h Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07: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 add support for Menu.menuExists() and menu.menuItemExists() 2014-05-31 13:24:07 -07:00
SettingsScriptingInterface.cpp Settings update 2015-02-03 12:27:30 -08:00
SettingsScriptingInterface.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
WebWindowClass.cpp Fix setting WebWindow's width and height 2015-07-24 10:43:24 -07:00
WebWindowClass.h Add ability to update title of WebWindow after it's created 2015-07-23 21:59:19 -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