mukulHF
780644fa38
Update TabletRunningScripts.qml
2017-08-07 11:37:27 -07:00
mukulHF
fadc19d8bb
Update RunningScripts.qml
2017-08-07 11:36:37 -07:00
mukulHF
cf7b2ba547
Update LetterboxMessage.qml
2017-08-07 11:35:42 -07:00
mukulHF
3ca2bc0571
Update DesktopLetterboxMessage.qml
2017-08-07 11:35:27 -07:00
mukulHF
e9f268ff26
Update LetterboxMessage.qml
2017-08-07 10:01:50 -07:00
mukulHF
4382f22622
Update DesktopLetterboxMessage.qml
2017-08-07 10:01:26 -07:00
vladest
3a013bf86e
Remove snap to item. Add caching for scrolling speedup
2017-08-05 13:28:08 +02:00
mukulHF
1ce1e29368
Update DesktopLetterboxMessage.qml
2017-08-04 17:44:43 -07:00
mukulHF
7aad4af533
Update LetterboxMessage.qml
2017-08-04 17:44:16 -07:00
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
anshuman64
83e50f894a
Merge pull request #11106 from seefo/tracked-objects
...
Added Vive pucks as an input channel and added new puck-attach script
2017-08-03 17:03:45 -07:00
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07: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
seefo
106b0ad8bb
Added Vive pucks as an input channel
2017-08-02 13:08:43 -07: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
David Kelly
b371c875c4
undo tab mapping to bring up tablet, for now
2017-07-31 14:46:26 -07:00
David Kelly
bd7c4b3b26
Merge remote-tracking branch 'upstream/master' into context-overlays
2017-07-31 13:14:53 -07: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
Olivier Prat
490aad2a06
Merged from master
2017-07-31 12:00:35 +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
a6a4bd5923
Update AssetServer.qml
2017-07-27 15:55:30 -07:00
utkarshgautamnyu
07fc9a6dc3
Indentation fixes
2017-07-27 14:53:49 -07:00
utkarshgautamnyu
4680911264
Enabled multiple selection and multiple deletion in asset browser
2017-07-27 14:47:30 -07:00
Brad Hefta-Gaub
9b3be6d164
Merge pull request #10808 from humbletim/21400
...
WL 21400 -- Setting that lets you switch from cursor to reticle
2017-07-27 13:16:58 -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
Chris Collins
853101fcbc
Merge pull request #10928 from 1P-Cusack/21362
...
Add point and thumb up gestures to the Vive.
2017-07-26 22:07:14 -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
1P-Cusack
9e25c3b7d8
Renaming 'not' route to 'logicalNot'.
...
Build was failing on non-windows platforms because 'not' is a reserved
word in C++ (which Visual Studio happily ignores).
2017-07-25 14:47:34 -04:00
Zach Fox
40038ce54b
Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays
2017-07-25 09:33: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
Cain Kilgore
2f857a6d1a
Forgot a file
2017-07-25 06:05:06 +01:00
Cain Kilgore
280a7a7e42
Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning
2017-07-25 01:48:55 +01:00
Anthony J. Thibault
33a1d6e225
Merge branch 'master' into feature/secondary-pose-support
2017-07-24 17:27:33 -07:00
Anthony J. Thibault
9f6641ed10
Shoulder puck calibration work in progress
...
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
2017-07-24 17:22:48 -07:00
Cain Kilgore
84609f27e3
Final Change - They're now Radio Boxes.
2017-07-24 23:53:03 +01:00
Cain Kilgore
9c152ddc6f
Ticking left will keep it on left, not right
2017-07-24 22:30:43 +01:00
humbletim
de6975b227
add missing cursor-*.pngs
2017-07-24 17:16:13 -04:00
Cain Kilgore
e6fd85f45a
Some code cleanup
2017-07-24 19:02:40 +01:00
Cain Kilgore
42742ba1f9
Changed the Return to a String "left/right" instead.
2017-07-24 18:31:16 +01:00
Brad Hefta-Gaub
0ba8d43522
Merge pull request #10994 from vladest/avatar_default_speeds
...
Change default mouse speeds for avatar
2017-07-24 10:13:27 -07: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
Cain Kilgore
a4cf27402d
Tabs and Cleanup of Code
2017-07-24 06:27:14 +01:00
Cain Kilgore
630922dd95
Dominant Hands Branch Initial Commit
...
Adds a new option in the Avatar Basics section of the Avatar Settings.
API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()
Defaults to false (Right Hand). Will return True if set to Left Hand.
2017-07-24 06:18:24 +01: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
vladest
615a3c52e4
Ooops..
2017-07-21 21:26:33 +02:00
Zach Fox
a346e5ccf6
New inspect icon
2017-07-21 11:56:06 -07:00
Zach Fox
a800f6c05a
No magic numbers; Move (i) based on laser hand; Tablet to Tab key
2017-07-21 11:48:19 -07: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
vladest
33a8ab2d58
Adjusted according discussion in PR
2017-07-21 18:18:23 +02:00
Olivier Prat
7bc7b1eabc
Merge branch 'master' of git://github.com/highfidelity/hifi into fade2
2017-07-21 09:27:30 +02: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
1P-Cusack
7319998df9
Move ThumbUp gesture detection into json map file.
2017-07-17 10:58:30 -04:00
Olivier Prat
9e9c0aff65
Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape
2017-07-17 09:59:59 +02: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
Andrew Meadows
9584035aa4
Merge pull request #10886 from 1P-Cusack/21420
...
[Worklist #21420 ] Implement Create button disabled state (details below).
2017-07-14 10:06:45 -07:00
Olivier Prat
82da9fb537
Merge branch 'master' of git://github.com/highfidelity/hifi into fade
2017-07-14 17:28:35 +02:00
Cain Kilgore
c60c8c7b13
Missed two tabs..
2017-07-14 00:59:25 +01:00
Cain Kilgore
4f8d958831
Some code cleaning, added comment for reasoning of specifying min and max in the qml
2017-07-14 00:56:42 +01:00
Cain Kilgore
d74c834f12
Fixed colour scheming and changed to a reload icon
2017-07-13 22:40:37 +01:00
Cain Kilgore
60300f5d7b
changed to icon (hopefully)
2017-07-13 22:06:44 +01: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
092725ad1a
a thing
2017-07-13 19:24:30 +01:00
Cain Kilgore
5329c1ce42
Fixed Indentation, removed old debug code
2017-07-13 19:23:28 +01:00
Cain Kilgore
521babb6bd
Avatar Scaler - should be PR Ready.
2017-07-13 19:18:51 +01:00
Anthony J. Thibault
22d8adcb99
Better shoulder/arm puck calibration.
2017-07-13 10:39:48 -07:00
Zach Fox
dc1b4b5324
New icons
2017-07-12 16:48:04 -07:00
Cain Kilgore
43782a29c7
Avatar Scaler - WIP
2017-07-12 22:04:58 +01:00
Olivier Prat
2f9885870b
First merge with Sam's fader branch with custom pipeline support in shape plumber
2017-07-12 17:29:21 +02:00
1P-Cusack
2cd10fd459
Move 'index point' logic into json config file.
2017-07-12 11:08:50 -04: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
1P-Cusack
f5ccf508c9
Fixing braces dropped in merge conflict edit.
2017-07-10 14:11:04 -04: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
