howard-stearns
87e54482dd
check pictures only for the domains that have someone in them, but use all
...
domains when filtering (occupied or no, picture or no).
Also, make darn sure we use default picture if no data.
2016-07-15 14:30:28 -07:00
howard-stearns
6fb2cedfe0
card default image: settable, use to start, and reset when needed
2016-07-15 13:42:31 -07:00
Brad Hefta-Gaub
574aaa9f28
Merge pull request #8248 from jherico/edit_toolbar
...
Migrate edit.js toolbar to the new toolbar API
2016-07-15 12:42:13 -07:00
howard-stearns
99e229467b
Don't show the word "suggesions" when there aren't any.
2016-07-15 11:49:21 -07:00
howard-stearns
8faa961c8d
all domains, not just the 'active' ones, which turns out to be defined as
...
having at least one person in it.
2016-07-15 11:41:00 -07:00
howard-stearns
e974bad8f0
Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions
2016-07-15 10:36:19 -07:00
howard-stearns
ce99146733
filter by typing
2016-07-15 10:27:52 -07:00
Brad Davis
43e045c22a
Restore mouseover events for items in windows
2016-07-14 17:40:05 -07:00
Brad Davis
a6d71f508e
Fix edit toolbar button vanishing, persistent edit button
2016-07-14 17:40:04 -07:00
Brad Davis
fdcbf71623
Remove fade effect from toolbar buttons
2016-07-14 17:40:02 -07:00
howard-stearns
1c2d13d1ee
Don't show where you are now.
2016-07-14 15:38:22 -07:00
howard-stearns
3132cca482
prototype
2016-07-14 14:49:03 -07:00
Brad Davis
8d5b60a266
Simulate LTClick/RTClick for Oculus Touch and Hydra controllers
2016-07-14 12:30:17 -07:00
Brad Davis
cdffb453c6
Trigger 'nav select' on the new trigger click signal, not any trigger value
2016-07-14 12:07:38 -07:00
Brad Davis
656da16c4d
Remove highlight animation duration on menus
2016-07-14 10:30:36 -07:00
Brad Davis
091e798267
Make hand pointer lasers 'click' on fully pressing and clicking the vive controller
2016-07-14 10:30:35 -07:00
James B. Pollack
aacddcf66d
fix pop ups
2016-07-13 15:02:51 -07:00
James B. Pollack
c3c9c0cb10
update so HTML5 media apis work again
2016-07-13 14:37:41 -07:00
Brad Davis
6336362d40
Fixing decoration inflation
2016-07-12 17:23:13 -07:00
Brad Davis
f2220288fb
Expand frame decoration when mouse is over a window in HMD mode
2016-07-12 16:40:53 -07:00
Brad Hefta-Gaub
c4dba51337
Merge pull request #8226 from jherico/2d_glow
...
Add glow to UI hand lasers and termination points
2016-07-12 16:21:19 -07:00
Brad Hefta-Gaub
b8d79ec263
Merge pull request #8179 from SamGondelman/snapshotFix3
...
Various snapshot improvements
2016-07-12 15:28:51 -07:00
Brad Davis
6242816f68
Adding glow to hand lasers
2016-07-12 10:10:01 -07:00
James B. Pollack
27f70e9d52
finish merge
2016-07-11 15:13:25 -07:00
Brad Hefta-Gaub
bcee128de0
Merge pull request #6959 from Triplelexx/20769
...
CR for Job #20769 - Touchscreen camera input for Interface
2016-07-11 14:24:52 -07:00
Brad Davis
829a871d6f
Merge pull request #8208 from SamGondelman/qmlFixes
...
Fixed issues in Browser.qml and UpdateDialog.qml
2016-07-07 19:51:37 -07:00
SamGondelman
99fc472d77
fixed errors in Browser.qml and UpdateDialog.qml
2016-07-07 14:06:57 -07:00
Brad Davis
23700dc90f
Ensure newly shown windows are popped to the top of the zorder
2016-07-07 13:16:59 -07:00
Ryan Huffman
d2fedee656
Add missing loading images for Asset Browser
2016-07-07 10:22:52 -07:00
Brad Hefta-Gaub
abcd1e0062
Merge pull request #8164 from SamGondelman/macHMDPreview
...
Added Mac preview image if VSync is enabled
2016-07-07 09:01:40 -07:00
SamGondelman
d05a27e0e6
embed image locally
2016-07-06 17:27:53 -07:00
SamGondelman
b3513b543c
fixed snapshot path setting
2016-07-05 18:23:59 -07:00
James B. Pollack
ac99ec04d0
Merge remote-tracking branch 'upstream/master' into viveteleporter
2016-07-05 10:28:07 -07:00
Ryan Downe Karpf
7eb07cba4c
Merge pull request #8171 from jherico/qml_fixes
...
Keyboard focus polish for Vive UI
2016-07-01 16:20:36 -07:00
howard-stearns
1ad9cfde99
make hud button participate in buttonState just like other toolbar
...
chicklets
2016-07-01 13:54:00 -07:00
howard-stearns
71c44f4f93
Merge branch 'master' of https://github.com/highfidelity/hifi into button-state
2016-07-01 13:05:32 -07:00
howard-stearns
02cc6cc567
hover states
2016-07-01 12:18:26 -07:00
SamGondelman
218b26b521
removed snapshot share dialog, ctrl s shouldn't leave you moving
2016-07-01 10:58:55 -07:00
Sam Gondelman
af67d814eb
Merge pull request #8163 from ctrlaltdavid/20981
...
distinguish between file name and directory as prompt in file chooser
2016-07-01 10:39:32 -07:00
howard-stearns
43c7fd1e27
New art.
2016-07-01 10:34:13 -07:00
James B. Pollack
0c60d87d3b
fix some touch mappings
2016-07-01 10:32:37 -07:00
howard-stearns
125f6d8b63
Merge branch 'master' of https://github.com/highfidelity/hifi into button-state
2016-06-30 16:49:19 -07:00
James B. Pollack
3b57fd1faf
Merge pull request #8173 from SamGondelman/snapshotFix2
...
Fix snapshot dialog rendering
2016-06-30 16:48:43 -07:00
howard-stearns
f03f5f3e68
new icons
2016-06-30 16:47:10 -07:00
howard-stearns
b22844dc97
Merge branch 'master' of https://github.com/highfidelity/hifi into button-state
2016-06-30 16:24:36 -07:00
howard-stearns
ff55644fe8
stateful hud toolbar buttons
2016-06-30 16:24:11 -07:00
SamGondelman
69ffd63ba7
fix snapshot sharing window
2016-06-30 15:42:48 -07:00
Brad Davis
167cb72a0e
Don't auto-focus the filter field in running scripts
2016-06-30 15:18:59 -07:00
Brad Davis
ce54f1b1d1
Improve desktop 'unfocus' functionality
2016-06-30 15:18:14 -07:00
Brad Davis
86f8b57841
Highlight controls based on activeFocus, not focus
2016-06-30 15:16:28 -07:00
David Rowe
759b3065fc
Distinguish between file name and directory as prompt in file chooser
2016-06-30 20:48:19 +12:00
Brad Davis
5a9be817df
PR comments
2016-06-29 10:28:55 -07:00
Triplelexx
97e90ed798
TouchscreenDevice DPI scaling now handled via JSON mapping
...
do the arbitrary scaling in the mapping file
2016-06-29 03:45:54 +01:00
Brad Davis
962f9d5f22
Don't update the shown state of the tool window when it's already invisible
2016-06-28 18:10:06 -07:00
Triplelexx
efdee523fb
coding standard fix and renaming
2016-06-28 17:57:38 +01:00
Triplelexx
19b6a04175
indentation causing some issue
...
is this resolved? Hard to tell.
2016-06-27 23:33:12 +01:00
howard-stearns
68be819ea2
fix crash when hmd context menu triggers a modal
2016-06-27 14:07:13 -07:00
Triplelexx
ab52fc5b3c
json indentation fix
2016-06-27 21:42:32 +01:00
Brad Davis
f90a351400
Don't reposition windows prior to selecting the initial display plugin
2016-06-24 16:31:24 -07:00
Triplelexx
fd4d9761ce
merge master and resolve conflicts
...
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
2016-06-24 03:34:39 +01:00
howard-stearns
baa9139881
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 17:02:23 -07:00
Brad Davis
f3bad3a63b
Don't trigger keyboard on revealing the overlay layer
2016-06-21 16:04:06 -07:00
howard-stearns
8421931c56
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 14:47:45 -07:00
Brad Davis
0bc4beeffd
Fix initial toolbar positioning
2016-06-20 17:09:30 -07:00
Brad Davis
37e9f66639
Additional toolbar work
2016-06-20 15:41:21 -07:00
Bradley Austin Davis
ec615caa80
Support toolbar API
2016-06-17 13:06:42 -07:00
Bradley Austin Davis
33e9caa636
Simplify overlay conductor, menu interation
2016-06-15 17:24:39 -07:00
Bradley Austin Davis
bc838ac0b4
Fix vive json
2016-06-15 11:41:28 -07:00
Bradley Austin Davis
0b0977f362
Support keyboard suppresion, control suppresion while in keyboard mode
2016-06-15 10:48:48 -07:00
Bradley Austin Davis
71bf9384ce
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-15 10:45:51 -07:00
David Rowe
3c2b98b15a
Let user choose an existing file in the file save dialog
2016-06-15 11:28:38 +12:00
Brad Hefta-Gaub
1c391e626f
Merge pull request #8054 from ctrlaltdavid/20957
...
fix model export continued
2016-06-14 10:57:25 -07:00
Bradley Austin Davis
175dbb8924
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-14 09:48:56 -07:00
Brad Hefta-Gaub
7da29daf9d
Merge pull request #8036 from ctrlaltdavid/20955
...
Fix image2d overlay color property
2016-06-13 19:21:59 -07:00
Brad Davis
0ddee876c3
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-13 13:03:46 -07:00
David Rowe
098432152d
Merge branch 'master' into 20957
2016-06-13 16:16:12 +12:00
David Rowe
f7578f084f
Fix buttons on warning message box when can't export a file
2016-06-13 15:21:59 +12:00
David Rowe
546699da03
When choosing a directory default selection to default directory
2016-06-13 15:06:10 +12:00
David Rowe
d74f1c8b5d
Fix default directory for Settings directory preference fields
2016-06-13 14:51:14 +12:00
Brad Hefta-Gaub
92909af52c
Merge pull request #8044 from ctrlaltdavid/20957
...
fix model export
2016-06-12 19:43:51 -07:00
Brad Davis
472a3540d7
Merge remote-tracking branch 'upstream/master' into vive-ui
...
Conflicts:
scripts/system/controllers/handControllerGrab.js
2016-06-10 10:43:09 -07:00
David Rowe
5352bd4b76
Fix height of Load Defaults button
2016-06-09 17:15:17 +12:00
David Rowe
cf6945b403
Fix selecting directory directly from dropdown
2016-06-09 17:11:00 +12:00
David Rowe
4176940e24
Don't highlight first drive in table when choose "This PC" from dropdown
2016-06-09 17:02:43 +12:00
David Rowe
d346d4c731
When choosing a directory make the dropdown update the path value
2016-06-09 16:41:51 +12:00
David Rowe
b4543cc579
Unhighlight directory in table when type filename to save
2016-06-09 16:29:15 +12:00
David Rowe
3780b18cc0
Fix a QML error
2016-06-09 15:15:32 +12:00
David Rowe
0ef13e6c01
Fix action button label to be "Save" when saving a file
2016-06-09 15:15:31 +12:00
David Rowe
4ae018400d
Give table focus after using dropdown
2016-06-09 15:15:30 +12:00
David Rowe
358355cfbf
Clear file selection and disabled Open button when change directory
2016-06-09 15:15:29 +12:00
Brad Hefta-Gaub
fc5214c938
Merge pull request #8033 from SamGondelman/xboxFix
...
Game pads work after falling asleep and being reactivated
2016-06-08 16:27:26 -07:00
Brad Hefta-Gaub
69ae33ad9a
Merge pull request #7997 from SamGondelman/touchFixes
...
Corrected Oculus Touch coordinate system so that hands track properly
2016-06-08 15:39:17 -07:00
Brad Davis
0565d3aea1
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-08 14:59:58 -07:00
Howard Stearns
bf48099286
Merge pull request #8032 from jherico/pin-button
...
Add a constant hud toggle button to the UI
2016-06-08 10:33:11 -07:00
Brad Hefta-Gaub
d0e946c907
Merge pull request #8034 from ctrlaltdavid/20953
...
fix colors of buttons in Asset Browser dialog
2016-06-08 07:47:34 -07:00
Brad Davis
ca6e86e767
Merge remote-tracking branch 'upstream/master' into vive-ui
...
Conflicts:
interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-06-07 21:51:47 -07:00
David Rowe
f9d6a7ba8d
Fix image2d overlay color property
2016-06-08 14:04:02 +12:00
SamGondelman
2c1d20bd1a
removed _deviceCounts, cache joystick available inputs, added deadzone to gamepad thumbsticks
2016-06-07 17:12:24 -07:00
Brad Hefta-Gaub
9a0076d4f1
Merge pull request #8028 from ctrlaltdavid/20949
...
add "Load Defaults" button to Running Scripts dialog
2016-06-07 17:09:29 -07:00
Brad Hefta-Gaub
6603289de9
Merge pull request #8029 from SamGondelman/constantTurn
...
Fixed constant turn of 22.5 degrees in comfort mode
2016-06-07 17:09:07 -07:00
David Rowe
a87483dfff
Fix colors of buttons in Asset Browser dialog
2016-06-08 10:55:14 +12:00
Brad Davis
ba61491ee6
PR feedback
2016-06-07 15:33:00 -07:00
Brad Davis
b9ee0c087e
Add a constant hud toggle button to the UI
2016-06-07 13:45:23 -07:00
SamGondelman
509f889c0d
fixed constant turn of 22.5 degrees
2016-06-06 18:40:12 -07:00
David Rowe
b6af46cac9
Add "Load Defaults" button to Running Scripts dialog
...
And rename "Stop All" to "Remove All".
2016-06-07 11:30:07 +12:00
SamGondelman
2367cb1995
fixing input mapping for vive/touch grip button/trigger, script needs fixing
2016-06-03 15:07:21 -07:00
Brad Davis
4e49f3f942
Fix browser and update dialogs
2016-06-02 19:54:25 -07:00
Brad Davis
e9b359feb1
Make QML overlays disappear, use fade for non-window types
2016-06-02 19:15:19 -07:00
Brad Davis
ed5d904b3d
Hide overlays when driving
2016-06-02 17:24:26 -07:00
Brad Davis
8c13ff4ee1
Pinned UI support
2016-06-02 17:24:25 -07:00
Brad Davis
068a462901
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-02 17:20:23 -07:00
SamGondelman
8b76af531b
made touch hand orientation more comfortable, fixed all the touch key mappings, exposed capacitive touch keys for use later
2016-06-02 16:52:17 -07:00
David Rowe
b65938b631
Adjust default and minimum sizes
2016-06-01 16:23:26 +12:00
David Rowe
c4aed1ce06
Remove "Open Folder" button
2016-06-01 16:16:08 +12:00
David Rowe
4da1c0ac4d
Click on blank part of dialog to deselect item
2016-06-01 14:25:07 +12:00
David Rowe
eddfe4847a
Select nothing by default when navigate up/down directory structure
2016-06-01 14:22:54 +12:00
howard-stearns
c2858f847b
Partition vive trackpad by center, x, and y (not just center v outer).
2016-05-31 16:57:23 -07:00
David Rowe
437607998f
Adjust minimum size of file browser dialog to keep all buttons visible
2016-05-30 14:20:13 +12:00
David Rowe
fd467caf86
Add "Open Folder" button to file browser dialog
2016-05-30 14:19:25 +12:00
Howard Stearns
8e6853bec6
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-hand-controllers-after-input-changes
2016-05-25 18:54:29 -07:00
David Rowe
9ec6b77460
Make file browser dialog movable
2016-05-25 13:49:01 +12:00
David Rowe
1c4eed640f
Fix up file browser resize handle and outlining
2016-05-25 13:10:26 +12:00
David Rowe
66a90cc3f8
Make file browser dialog resizable
2016-05-25 11:31:39 +12:00
howard-stearns
a3f1ece978
Do button mapping in C++ and simplify vive.json accordingly. Vive and
...
Hydra now use PrimaryThumb and SecondaryThumb. Fix warnings for Neuron.
2016-05-24 16:10:12 -07:00
howard-stearns
6b606759aa
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-hand-controllers-after-input-changes
2016-05-24 11:31:20 -07:00
howard-stearns
fdcd667d3c
Fix hand controller pointer after input changes.
2016-05-23 13:33:42 -07:00
David Rowe
504516b627
Merge branch 'master' into 20917
2016-05-24 08:03:54 +12:00
David Rowe
099a675a18
Remove extra logging
2016-05-24 08:03:29 +12:00
Brad Hefta-Gaub
ac49feda22
Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS
...
Conflicts:
libraries/entities/src/EntityEditPacketSender.h
2016-05-21 09:23:45 -07:00
David Rowe
5a27d656c5
Potential OSX fix plus extra logging
2016-05-21 13:03:58 +12:00
Brad Davis
07562f72af
Doing a pass over the input plugins and controller code
2016-05-20 14:50:23 -07:00
Brad Hefta-Gaub
00bd3b2e8a
remove more dead code
2016-05-20 13:43:08 -07:00
David Rowe
17b3101ca5
Merge branch 'master' into 20917
2016-05-20 18:50:01 +12:00
David Rowe
b2bbf72be2
Replace drive drop-down plus text field with a paths drop-down
2016-05-20 18:48:51 +12:00
David Rowe
11aeaba114
Capitalize drive letter of chosen file
2016-05-20 11:32:14 +12:00
David Rowe
dac043a52d
Provide navigation up to the PC level to display drives in table
2016-05-20 10:49:38 +12:00
David Rowe
41311bc3df
Finish decoupling FolderListModel
2016-05-19 17:13:07 +12:00
David Rowe
585467094c
Sort files case-insensitively, directories first
2016-05-19 14:16:00 +12:00
David Rowe
862a88cf29
Insert an intermediary ListModel suitable for sorting and drives
2016-05-19 11:29:21 +12:00
David Rowe
551c669883
Move FolderListModel to be stand-alone
2016-05-19 09:24:15 +12:00
David Rowe
e1d885004f
Fix carat in drop-down boxes
2016-05-18 13:59:13 +12:00
David Rowe
17d41dd7b9
HiFi glyphs font file update with fixed up/down carats
...
Update QML and HTML spinboxes accordingly.
2016-05-18 13:25:11 +12:00
David Rowe
e0483585b8
Consistently capitalize drive letter for Windows
2016-05-17 14:43:49 +12:00
David Rowe
1fc3d9229c
Fix initial drive change and go-up not working properly on first screen
2016-05-17 10:51:42 +12:00
Atlante45
38f74c1843
Remove the last of the glow level
2016-05-14 14:49:31 -07:00
David Rowe
14c733cd6e
Make columns sortable
2016-05-14 17:19:18 +12:00
David Rowe
c21087ad87
Add icon to title
2016-05-14 13:04:18 +12:00
David Rowe
3b34b908d7
Tweak level-up and home buttons
2016-05-13 17:39:15 +12:00
David Rowe
8f214a6b14
Merge branch 'master' into 99997
2016-05-12 17:50:34 +12:00
David Rowe
7be33a8584
Don't show header or dates and sizes when choosing a directory
2016-05-12 17:25:44 +12:00