Commit graph

57884 commits

Author SHA1 Message Date
anshuman64
bcb819206b Merge pull request #11037 from sethalves/bug-camera-mode-mods
use Qt menu hotkeys to drive camera-mode changes
2017-07-27 09:44:53 -07:00
Anthony J. Thibault
8f5c41af2d changed _controllerPoseMap from unordered_map to map 2017-07-27 09:44:37 -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
rabelaiis
dd76c30de5 Make Xylophone mallets equipable, make the mallets provide haptic feedback, fix a closing bracket bug stopping the xylophone from working and clean up code according to coding standards 2017-07-27 17:31:30 +07:00
Chris Collins
ef67029837 Merge pull request #10912 from amvmoody/21374
WL 21374: Allow lights/particles to be dragged by icon
2017-07-26 22:07:36 -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
anshuman64
2e7f62cbb3 Merge pull request #11058 from nimisha20/patch-1
Update BUILD_WIN.md
2017-07-26 17:50:33 -07:00
anshuman64
560cccb0df Remove nmake troubleshooting step 2017-07-26 17:01:45 -07:00
anshuman64
081d8fbec4 More changes 2017-07-26 17:00:48 -07:00
Anthony J. Thibault
2a45c6d3dc Removed eigen dependency, fixed Debug Draw IK Chains
Also, clarified for special case for secondary shoulder joint look-at constraint.
2017-07-26 16:55:12 -07:00
nimisha20
c57660c82d Update BUILD_WIN.md 2017-07-26 16:52:00 -07:00
Stephen Birarda
c6e640eba8 Merge pull request #11052 from highfidelity/bug/2157
added additional collision types to asset browser and new model dialog
2017-07-26 16:51:52 -07:00
Zach Fox
8a7561d61b IT'S WORKING SOB SOB SOB 2017-07-26 16:35:55 -07:00
Zach Fox
39cb0bc357 WHYYYY DOESN'T THIS WORK 2017-07-26 16:14:35 -07:00
Seth Alves
9c9cfad4c4 use ctrl rather than alt to activate camera-mode shortcuts 2017-07-26 15:56:08 -07:00
Seth Alves
71023bcb1b Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods 2017-07-26 15:54:57 -07:00
Zach Fox
1336a59b6c Stupid bracket 2017-07-26 15:14:58 -07:00
Melissa Brown
e50422d5b9 Merge pull request #11034 from MrRoboman/21342-dart
added dart scripts
2017-07-26 15:10:58 -07:00
Zach Fox
17c7e38fce Bugfixes? 2017-07-26 15:02:52 -07:00
Zach Fox
bd5f7b85d8 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_renderMOde 2017-07-26 14:11:28 -07:00
Zach Fox
1e80736718 Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-26 14:11:03 -07:00
Zach Fox
3a05219c59 Closer still 2017-07-26 14:10:41 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
a960ea5ccb Linux build 2017-07-26 13:32:23 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Liv
256853f79b syntax and clarification on magic number 2 as half height 2017-07-26 13:28:52 -07:00
Liv
5bd6dac66c wrap text if longer than 1m text entity 2017-07-26 13:24:56 -07:00
Zach Fox
65c28ca821 Bugfixes 2017-07-26 13:17:51 -07:00
Zach Fox
62f6c10b2b Renaming things; bugfixes; improvements 2017-07-26 12:45:10 -07:00
Zach Fox
24ddbb4b22 Silly bug preventing the whole thing from working 2017-07-26 12:08:55 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
VRCat\VRKitten
635be3e2e9 Fixes for issues found with last Pull Request
1)  Does not give the message regarding not having permissions except for when first rezing the tool.
▶ Fixed - Added in a check for every time there is a collision between the parent-ator and another entity

2) Sound almost unhearable due to distortion
▶ Fixed -  Changed audio to 16 bit mono

3) The Parent-ator model rezzes pointing at the user's face. Would probably be better to add 180 to START_POSITION.y then normalize.
▶ Fixed - Added 180 to START_ROTATION (instead fo START_POSITION) and normalized

4) The Parent-ator model floats away. Would suggest increasing linear damping from the default. Maybe go to 0.9 or more.
▶ Fixed - Added damping of 0.9

5) The face normals are inverted on the three rings surrounding the barrel of the Parent-ator model.
▶ Fixed - Normals flipped

6) Also if the user taps an object then releases and re-equips with the Parent-ator it continues to display "tap the child" but will set the object tapped first as the child of the first other object tapped after re-equipping. So the messages change from Tap the child to the "Yay" success message.
▶ Fixed - Re-equiping now resets the parent-ator.

7) Parenting can be broken with this. On occasions the Parentator seems to get out of sequence. With a group of objects eventually one or more can get orphaned. In effect (occasionally ) a single first tap can produce the success message.
▶ Believed to be fixed - I was unable to really reproduce the problem but the fix for the previous item should fix this too, I believe.

8) There is an error in the description on line 7 of parentator.js
▶ Fixed - Changed reference to pingpong gun to parent-ator

9) Equipping can fail with a smaller than normal avatar as the offsets are hard coded rather than scaled relative to the user's scale.
▶ Fixed - I realized I was adding the entity with larger dimensions than the model normally had. I've scaled it down to where it should be and I think this has solved the issue.
2017-07-26 12:14:59 -06:00
VRCat\VRKitten
a1f2e786af Merge branch 'master' of https://github.com/highfidelity/hifi into 21391 2017-07-26 11:54:56 -06:00
utkarshgautamnyu
68770a9204 Removed conflicts 2017-07-26 10:23:37 -07:00
utkarshgautamnyu
71ddf1e7c1 Removed Compound Collision type 2017-07-26 10:20:17 -07:00
Burt Sloane
c777384d93 another comment removal 2017-07-26 10:00:19 -07:00
Burt Sloane
215fa7b816 removed extra comments 2017-07-26 09:34:46 -07:00
scromie@turnmeupgames.com
33ff5917be fix 2017-07-26 19:34:20 +03:00
Burt Sloane
246a5c9fa4 1 more 2017-07-26 08:59:48 -07:00
Brad Hefta-Gaub
4a3e3cf777 Merge pull request #11045 from huffman/fix/skybox-not-loading
Fix bug where skybox doesn't load and physics takes a long time to engage
2017-07-26 08:58:28 -07:00
Burt Sloane
d2975c79c9 add midi to 3 CMakeLists.txt for linking 2017-07-26 08:41:26 -07:00
Zach Fox
9020607ccf First pass 2017-07-25 17:54:46 -07:00
Burt Sloane
88838da6e5 cleaning up for mac and linux 2017-07-25 17:46:08 -07:00
utkarshgautamnyu
29e778323d Update AssetServer.qml 2017-07-25 17:24:06 -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
utkarshgautamnyu
e5ddded464 Moved Express/Custom install window just after EULA window 2017-07-25 16:16:15 -07:00
Zach Fox
7702bfceaa Big cleanup and preparation; Actually fix desktop tablet 2017-07-25 16:12:32 -07:00