Bradley Austin Davis
408bb082d7
Merge fixes, OSX compile fixes
2015-07-22 13:24:47 -04:00
SamGondelman
4d3b08b5e3
modified sword.js to work with vive controllers
2015-07-20 14:52:49 -07:00
Anthony J. Thibault
56e7af081e
input plugin architecture, fixed sixense
2015-07-15 18:50:44 -07:00
Sam Gondelman
81efd99ae4
merge with hifi/plugins
2015-07-02 10:13:28 -07:00
Bradley Austin Davis
54bbc841e2
Working on mac compilability
2015-07-01 23:03:33 -07:00
Brad Davis
e421141ec5
experimenting with input plugins
2015-06-30 09:52:54 -07:00
Ryan Huffman
4df1bea4ec
Merge pull request #5167 from SamGondelman/hmdControls
...
hmdControls.js for movement when wearing an HMD
2015-06-24 14:40:31 -07:00
Brad Davis
3231bbba5a
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
2015-06-22 09:44:16 -07:00
bwent
c315bcec24
Expose mouseDoublePressEvents to js
2015-06-19 15:52:27 -07:00
Sam Gondelman
aab8161fa4
remove unused function
2015-06-18 18:57:04 -07:00
Brad Davis
48b27acc79
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
Sam Gondelman
f752534f7c
actionEvent signal, captureActions, began work on hmdControls.js
2015-06-18 09:52:36 -07:00
Brad Davis
ae1c9603b9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 15:13:04 -07:00
Sam Gondelman
0157997126
fix findDevice
2015-06-17 14:42:11 -07:00
Sam Gondelman
17322645f2
added mouselook script, reticle and icons need changes
2015-06-17 11:17:38 -07:00
Brad Davis
00d8fe75ab
Breaking up overlay into rendering and compositing classes
2015-06-13 17:36:08 -07:00
Sam Gondelman
b8b61e7c62
integrated joysticks with userinputmapper, enabling plug-in-and-play controllers and input mapping with js
2015-06-11 15:51:21 -07:00
Brad Hefta-Gaub
24fda9a733
Merge pull request #5085 from SamGondelman/master
...
Exposing Input Key Binding To JavaScript
2015-06-11 14:41:34 -07:00
David Rowe
01b1e9c4ed
Signal domain changes for those handled by ICE as well as not
2015-06-09 12:33:14 -07:00
Sam Gondelman
0769593ca8
added getters/setters for Inputs and InputChannels
2015-06-09 10:20:36 -07:00
Sam Gondelman
984d449bf9
exposed input key bindings to js to enable key remapping
2015-06-04 16:29:58 -07:00
Bradley Austin Davis
fc825f6632
Fixing the loading of local HTML so it works on both OSX and win32
2015-05-13 09:46:24 -07:00
Brad Davis
8c4f802dbf
Merge remote-tracking branch 'upstream/master' into web-entity
...
Conflicts:
libraries/entities/src/EntityItemProperties.h
libraries/entities/src/EntityTypes.h
2015-05-12 15:56:02 -07:00
ZappoMan
73428ec12d
add support to not displace very large clipboards on import
2015-05-11 14:21:58 -07:00
Brad Davis
302aa9db47
Removing access to the gl widget and display managers
2015-05-02 00:49:52 -07:00
Brad Davis
a96f69a673
Switching to a wrapper mechanism for VR menus
2015-04-25 16:20:15 -07:00
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
Ryan Huffman
547b0e5ee6
Update style of webview to only be set when 'fusion' exists
2015-04-24 13:42:03 -07:00
Brad Davis
1ff8c67576
More work on menus and some code cleanup
2015-04-24 12:54:11 -07:00
Ryan Huffman
df591f9ad7
Set style of webview
2015-04-24 11:49:33 -07:00
Brad Davis
a9d65f168b
Working on marketplace dialog
2015-04-23 14:23:11 -07:00
David Rowe
349cc3241d
Restore minimized windows to view
2015-04-01 18:59:34 -07:00
David Rowe
49de54de48
Use improved WebWindowClass for friends window
2015-04-01 18:58:59 -07:00
David Rowe
96e888864a
Merge branch 'master' into 20422
2015-04-01 14:56:48 -07:00
David Rowe
e519928320
Move friends window to own class
2015-04-01 11:38:32 -07:00
David Rowe
e06f28b7c5
Merge branch 'master' into 20422
...
Conflicts:
examples/users.js
interface/src/Application.cpp
2015-03-31 21:01:54 -07:00
ZappoMan
d68143675a
first simple pass at using marketplace windows in preferences
2015-03-31 16:24:27 -07:00
Philip Rosedale
5325478940
Merge pull request #4528 from ZappoMan/avatarUI
...
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
2015-03-30 21:31:22 -07:00
Andrew Meadows
2404fb126f
Merge pull request #4527 from sethalves/valgrind
...
Valgrind told me to do it
2015-03-30 11:56:17 -07:00
David Rowe
cbf2012bf5
Add menu items that set visibility
...
And synchronize visibility settings between Interface and users.js.
2015-03-29 18:35:56 -07:00
Seth Alves
986bc71e93
quiet compiler
2015-03-28 17:10:26 -07:00
David Rowe
be69c0b58f
Add add/remove friends menu item
...
This must display the dialog whether or not users.js is running. Both
C++ and JavaScript need to open or restore the same dialog, hence a new
dialog rather than using WebWindow with its JavaScript baggage.
2015-03-28 13:05:23 -07:00
ZappoMan
baa2f947e5
classifying FSTReader and moving ModelType into that class
2015-03-27 16:30:00 -07:00
David Rowe
90c1da2094
Merge branch 'master' into 20416
...
Conflicts:
examples/notifications.js
2015-03-27 12:13:29 -07:00
David Rowe
cb6abfb2e6
Display notification if domain connection refused
2015-03-23 12:05:56 -07:00
Ryan Huffman
d097b4409e
Add title to non-toolbar WebWindows
2015-03-17 10:40:51 -07:00
Ryan Huffman
1e1c60847b
Add WebWindow::getURL
2015-03-17 09:07:01 -07:00
Ryan Huffman
8088b01356
Add WebWindow::raise
2015-03-17 09:06:48 -07:00
Ryan Huffman
46f6c9f888
Add WebWindow::setURL
2015-03-17 09:06:31 -07:00
Ryan Huffman
9d5c0cf4e3
Add layout to WebWindowClass to that it maximizes the webview
2015-03-13 17:25:24 -07:00
