Anthony J. Thibault
|
98bbe887b9
|
Merge branch 'master' into feature/secondary-pose-support
|
2017-08-04 16:11:13 -07:00 |
|
Dante Ruiz
|
9be60ee658
|
made more requested changes
|
2017-08-04 17:57:53 +01:00 |
|
Dante Ruiz
|
b72ac63662
|
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
|
2017-08-04 17:19:06 +01:00 |
|
vladest
|
9058a8e2ca
|
Cleanup top menu on menu reinstantiation
|
2017-08-04 16:36:00 +02:00 |
|
vladest
|
b049b0f415
|
Merge conflicts
|
2017-08-03 19:43:42 +02:00 |
|
Dante Ruiz
|
1e1ddf2941
|
making requested changes
|
2017-08-02 22:22:55 +01:00 |
|
druiz17
|
6680be2a03
|
Merge pull request #11103 from vladest/fix_toolbar_apps_switch
Fix toolbar apps switch
|
2017-08-02 12:59:31 -07:00 |
|
vladest
|
7d361c69c2
|
Audio mic bar show only rectangle on mouse over
|
2017-08-02 19:52:47 +02:00 |
|
vladest
|
4330e31212
|
Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create
|
2017-08-02 16:32:09 +02:00 |
|
Dante Ruiz
|
51652482a4
|
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
|
2017-08-01 20:51:56 +01:00 |
|
Anthony J. Thibault
|
2383933252
|
Merge branch 'master' into feature/secondary-pose-support
|
2017-07-31 10:55:40 -07:00 |
|
vladest
|
e30e0b1a5f
|
Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption
|
2017-07-31 16:45:21 +02:00 |
|
utkarshgautamnyu
|
f407bf6f5a
|
Merge pull request #11064 from highfidelity/bug/6513
Enabled multiple selection and deletion in Asset Browser
|
2017-07-28 09:46:34 -07:00 |
|
Anthony J. Thibault
|
6c2b6674bb
|
load and save shoulderConfig to settings.
|
2017-07-27 17:33:54 -07:00 |
|
utkarshgautamnyu
|
1beec26003
|
Update TabletAssetServer.qml
|
2017-07-27 15:55:55 -07:00 |
|
utkarshgautamnyu
|
4680911264
|
Enabled multiple selection and multiple deletion in asset browser
|
2017-07-27 14:47:30 -07:00 |
|
Anthony J. Thibault
|
78c6564174
|
Merge branch 'master' into feature/secondary-pose-support
|
2017-07-27 09:09:32 -07:00 |
|
Anthony J. Thibault
|
8dc9714282
|
Pass armCircumference and shoulderWidth to qml.
|
2017-07-27 09:08:34 -07:00 |
|
utkarshgautamnyu
|
71ddf1e7c1
|
Removed Compound Collision type
|
2017-07-26 10:20:17 -07:00 |
|
utkarshgautamnyu
|
24f4468fd5
|
added additional collision types to asset browser in tablet mode
|
2017-07-25 17:12:13 -07:00 |
|
utkarshgautamnyu
|
65192aa620
|
added additional collision types to asset browser and new model dialog
|
2017-07-25 17:12:13 -07:00 |
|
Anthony J. Thibault
|
572213daaf
|
Added shoulder config to Controller Settings UI
All offset values in Controller Settings UI are now in cm.
|
2017-07-25 17:05:07 -07:00 |
|
Andrew Meadows
|
9d1fba3a3b
|
Merge pull request #10821 from ctrlaltdavid/21418
Don't execute body of controllers' plugin update methods if not enabled
|
2017-07-25 08:51:17 -07:00 |
|
Ryan Huffman
|
9421e6ebb6
|
Merge pull request #11029 from cain-kilgore/dominant-hands
WL 21453 - Add a "Dominant Hand" setting
|
2017-07-25 08:01:31 -07:00 |
|
Cain Kilgore
|
f9204a7034
|
Now it should appear..
|
2017-07-25 09:03:47 +01:00 |
|
Stephen Birarda
|
26be7e1a01
|
Merge pull request #10999 from birarda/bug/html-path-on-mac-build
fix create tab load on OS X
|
2017-07-24 10:12:40 -07:00 |
|
Dante Ruiz
|
95299244cf
|
fixed running scripts popup
|
2017-07-22 00:24:24 +01:00 |
|
Dante Ruiz
|
7bf3f45e39
|
finished the locked default scripts
|
2017-07-21 23:32:25 +01:00 |
|
Dante Ruiz
|
625b7e535a
|
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
|
2017-07-21 17:20:03 +01:00 |
|
Dante Ruiz
|
3c862c34b2
|
disable reload default scripts by default
|
2017-07-20 21:15:00 +01:00 |
|
Stephen Birarda
|
3936ee93f0
|
use default scripts path in EditTabView to fix load on OS X
|
2017-07-19 16:34:04 -07:00 |
|
utkarshgautamnyu
|
ce5ff23e70
|
made changes to size of content to dosplay 'choose file' button
|
2017-07-19 16:15:34 -07:00 |
|
Chris Collins
|
e99683fdcf
|
Merge pull request #10985 from jherico/audio_deadlock
Trying to resolve QML / Audio deadlocks
|
2017-07-18 12:40:03 -07:00 |
|
Brad Davis
|
aab56cf2a9
|
Trying to resolve QML / Audio deadlocks
|
2017-07-17 16:21:28 -07:00 |
|
Dante Ruiz
|
93d1725b3c
|
make cursor position change based on mouse click position
|
2017-07-14 19:30:35 +01:00 |
|
Zach Fox
|
a9197509d8
|
Merge pull request #10965 from CainFoool/avatar-scaler
WL 21422 - Add a scale slider for avatar size
|
2017-07-14 10:30:33 -07:00 |
|
Cain Kilgore
|
f91a8c0f53
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler
|
2017-07-13 21:25:39 +01:00 |
|
Cain Kilgore
|
247e7b8bed
|
indentation!!!
|
2017-07-13 19:25:31 +01:00 |
|
Cain Kilgore
|
43782a29c7
|
Avatar Scaler - WIP
|
2017-07-12 22:04:58 +01:00 |
|
Zach Fox
|
d786820670
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-07-11 16:16:37 -07:00 |
|
Zach Fox
|
ea62ef165c
|
Fix image container background
|
2017-07-10 16:13:45 -07:00 |
|
Zach Fox
|
4a74522884
|
Ensure tablet button shows up; protections for controller mapping
|
2017-07-10 15:16:16 -07:00 |
|
David Kelly
|
b87d69b15d
|
Insure spectator camera preview is up when reopening tablet
|
2017-07-10 13:16:08 -07:00 |
|
Dante Ruiz
|
89a072cfee
|
fixed hmd keyboard for goto
|
2017-07-10 19:05:07 +01:00 |
|
David Kelly
|
1c9c36a8c8
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview
|
2017-07-10 10:22:31 -07:00 |
|
David Kelly
|
4843b91f47
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-07-10 09:50:17 -07:00 |
|
druiz17
|
6e44c95d53
|
Merge pull request #10906 from druiz17/audio-qml-fix
Made the output audio listview dynamically change height base on content size
|
2017-07-07 16:48:15 -07:00 |
|
Zach Fox
|
dbb48cd1aa
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-07-07 16:03:04 -07:00 |
|
Zach Fox
|
e222753aac
|
Merge pull request #10911 from zfox23/PAL_adminFix2
Set admin status even if QML can't find user in PAL
|
2017-07-07 10:24:53 -07:00 |
|
Seth Alves
|
fc8b7c7cc5
|
Merge pull request #10904 from druiz17/window-root-spam
fixed log spamming from windowRoot.qml in toolbar mode
|
2017-07-07 07:17:08 -07:00 |
|
Zach Fox
|
ee9cdaff90
|
Set admin status even if QML can't find user in PAL
|
2017-07-06 23:26:40 -07:00 |
|
David Kelly
|
b41c470064
|
first cut, still stereo
|
2017-07-06 15:59:24 -07:00 |
|
Dante Ruiz
|
1ac415aa14
|
dynamic listview height
|
2017-07-06 23:50:32 +01:00 |
|
druiz17
|
b4182fe7ac
|
Merge pull request #10899 from druiz17/calibration-update-2.0
Updates to the Calibration UI
|
2017-07-06 14:24:45 -07:00 |
|
Dante Ruiz
|
b0130896d1
|
fixed spamming from windowRoot.qml
|
2017-07-06 22:01:08 +01:00 |
|
Dante Ruiz
|
1fcb3b32d6
|
fixed letter cap
|
2017-07-06 20:55:19 +01:00 |
|
Seth Alves
|
0374d24b15
|
Merge pull request #10901 from druiz17/goto-keyboard-fix
Fixed the keyboard not showing up for goto in HMD mode
|
2017-07-06 12:46:13 -07:00 |
|
Dante Ruiz
|
2d876377d5
|
keyboard know disappears when you click of the address line
|
2017-07-06 20:04:44 +01:00 |
|
Dante Ruiz
|
de5802418f
|
fixed some keybaord logic
|
2017-07-06 19:27:48 +01:00 |
|
Dante Ruiz
|
4e3dba1767
|
goto HMD keyboard fix
|
2017-07-06 19:12:52 +01:00 |
|
Dante Ruiz
|
9e4b5693c7
|
fixed merge conflicts
|
2017-07-06 18:49:46 +01:00 |
|
Dante Ruiz
|
6e1f9d275c
|
chnaged default head offset
|
2017-07-06 17:54:06 +01:00 |
|
Dante Ruiz
|
258c21838e
|
finished calibration-ui updates
|
2017-07-06 17:32:40 +01:00 |
|
David Rowe
|
cfd155c198
|
Merge branch 'master' into 21418
|
2017-07-06 16:56:10 +12:00 |
|
Dante Ruiz
|
6c15dffb9d
|
added new glyph
|
2017-07-06 00:45:59 +01:00 |
|
Zach Fox
|
39bdc20b4f
|
On checkbox language change
|
2017-07-05 16:13:36 -07:00 |
|
Zach Fox
|
0af53bb4a5
|
Instructions and cool static :)
|
2017-07-05 14:46:59 -07:00 |
|
Zach Fox
|
aea5779ed6
|
When a display texture isn't set, show preview instructions
|
2017-07-05 14:46:58 -07:00 |
|
Zach Fox
|
44cb48b17d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-07-05 09:59:57 -07:00 |
|
David Kelly
|
373bd0cc8a
|
aspect ratio preserved upon blitting, minor qml tweak, warnings fixed
|
2017-07-03 14:23:23 -07:00 |
|
David Kelly
|
5f015ec77f
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
|
2017-07-03 13:57:25 -07:00 |
|
Zach Fox
|
9411c2e732
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-07-03 10:24:02 -07:00 |
|
Dante Ruiz
|
063984f573
|
Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update
|
2017-07-03 16:44:47 +01:00 |
|
David Kelly
|
073eae39b2
|
timer now resumes when visible again
|
2017-06-30 18:44:32 -07:00 |
|
Dante Ruiz
|
6f30cb1825
|
Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop
|
2017-07-01 00:48:49 +01:00 |
|
Dante Ruiz
|
51792769b5
|
finished vive in desktop mode
|
2017-07-01 00:48:36 +01:00 |
|
David Rowe
|
07697c5083
|
Merge branch 'master' into 21418
# Conflicts:
# interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
# interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
Removed stray "Vive Controller Picks" configuration item which no longer exists.
|
2017-07-01 11:19:00 +12:00 |
|
Brad Davis
|
31d2c9980e
|
Merge pull request #10797 from ctrlaltdavid/21396
Make Leap Motion a plugin
|
2017-06-30 14:37:23 -07:00 |
|
Dante Ruiz
|
a7e4dc1473
|
clean up code
|
2017-06-28 23:51:00 +01:00 |
|
David Rowe
|
be0e1a75a4
|
User-friendly SDL2 controller name
|
2017-06-29 10:03:58 +12:00 |
|
Dante Ruiz
|
a2df2f8472
|
added user activity status
|
2017-06-28 19:52:19 +01:00 |
|
David Kelly
|
b73102d063
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
|
2017-06-28 08:57:04 -07:00 |
|
Zach Fox
|
5d8d2fd83e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-06-27 16:47:44 -07:00 |
|
Ryan Huffman
|
209a4f33b5
|
Merge pull request #10784 from huffman/feat/pal-replicated
Disable silence + ban buttons for replicated users
|
2017-06-26 12:50:23 -07:00 |
|
Brad Hefta-Gaub
|
6314a8d273
|
Merge pull request #10782 from vladest/fix_browse_black
Make background with default color. Fix few warnings
|
2017-06-26 09:50:09 -07:00 |
|
David Rowe
|
72d712ac76
|
Add "enabled" setting for Sixense; bail in update if note enabled
|
2017-06-26 16:43:06 +12:00 |
|
David Rowe
|
31714675c3
|
Remove unused Sixense preference and associated methods
|
2017-06-26 16:14:57 +12:00 |
|
David Rowe
|
361bc1ce03
|
Add "enabled" setting for SDL2 joystick; bail in update if not enabled
|
2017-06-26 16:00:18 +12:00 |
|
Ryan Huffman
|
b56cfa56c7
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated
|
2017-06-23 14:23:20 -07:00 |
|
David Rowe
|
6e266dfbac
|
Merge branch 'master' into 21396
|
2017-06-24 09:19:12 +12:00 |
|
Brad Davis
|
d50c448151
|
Fix heap corruption coming out of running scripts dialog
|
2017-06-22 19:15:58 -07:00 |
|
Zach Fox
|
a1dfbc91da
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-06-22 10:27:52 -07:00 |
|
Vladyslav Stelmakhovskyi
|
30714d5d25
|
Make background with default color. Fix few warnings
|
2017-06-22 16:47:40 +02:00 |
|
David Rowe
|
6ff8aed5e3
|
Merge branch 'master' into 21396
|
2017-06-22 23:54:15 +12:00 |
|
Seth Alves
|
c70365d04a
|
Merge pull request #10729 from druiz17/hand-pucks
Hand pucks and Calibration UI
|
2017-06-21 18:10:15 -07:00 |
|
Zach Fox
|
af3c249ae5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-06-21 17:16:10 -07:00 |
|
Dante Ruiz
|
c4699e00ca
|
added hand offsets
|
2017-06-21 23:10:08 +01:00 |
|
Brad Hefta-Gaub
|
88a4f5c576
|
Merge pull request #10766 from humbletim/sort-running-scripts
Sort Running Scripts... list alphabetically
|
2017-06-21 13:08:47 -07:00 |
|
Ryan Huffman
|
0e7ddfd29f
|
Disable silence/ban buttons in PAL if avatar is replicated
|
2017-06-21 09:49:16 -07:00 |
|
Dante Ruiz
|
729065749f
|
fixed merge conficts
|
2017-06-21 16:59:53 +01:00 |
|