Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-13 02:59:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/interface/src/scripting
History
Brad Davis fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
2015-04-24 18:02:12 -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 Update pasteEntities to use vec3 2015-03-05 13:52:30 -08:00
ClipboardScriptingInterface.h Update pasteEntities to use vec3 2015-03-05 13:52:30 -08:00
ControllerScriptingInterface.cpp quiet compiler 2015-03-28 17:10:26 -07:00
ControllerScriptingInterface.h add angularVelocity to controller 2015-02-24 11:21:04 -08: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 Fix warnings 2015-02-18 19:24:29 +01:00
HMDScriptingInterface.h HUD LookAt positions could be NULL now if whenever they're out of range 2015-02-12 22:55:44 +01:00
JoystickScriptingInterface.cpp fix joystick pick 2014-12-09 20:03:00 -08:00
JoystickScriptingInterface.h Add joystickWithName for PrioVR 2014-10-10 18:03: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 More work on menus and some code cleanup 2015-04-24 12:54:11 -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 Update style of webview to only be set when 'fusion' exists 2015-04-24 13:42:03 -07:00
WebWindowClass.h Use improved WebWindowClass for friends window 2015-04-01 18:58:59 -07:00
WindowScriptingInterface.cpp More work on menus and some code cleanup 2015-04-24 12:54:11 -07:00
WindowScriptingInterface.h Display notification if domain connection refused 2015-03-23 12:05:56 -07:00