druiz17
8eabf46a30
Merge pull request #11165 from 1P-Cusack/FogBugz/Case_6491_Part1
...
[Case 6491] Part 1 of entitySelectionTool clean up
2017-08-16 13:05:27 -07:00
Atlante45
17c1fb8c36
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-08-16 12:50:03 -07:00
LaShonda Hopper
cc2ff565ac
[Case 6491] Ran lint on entitySelectionTool.js (details below).
...
Prior Issue Count: 35
Current Issue Count: 3
Resolved:
* 17 used out of scope issues.
* 11 already defined issues.
* 2 missing semicolon issues.
* 1 implicit comparison against null issue.
* 1 readability warning.
Remaining Issues as of this commit:
* scripts/system/libraries/entitySelectionTool.js: line 17, col 1, Read only.
** HIFI_PUBLIC_BUCKET assignment
* scripts/system/libraries/entitySelectionTool.js: line 19, col 1, Read only.
** SPACE_WORLD assignment
* scripts/system/libraries/entitySelectionTool.js: line 30, col 1, Read only.
** SelectionManager assignment
One notable item was a chunk of code from makeStretchTool's onMove
function which wasn't in scope of the vars being utilized.
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-08-16 15:21:30 -04:00
Chris Collins
6f18d1a8b7
Merge pull request #11193 from highfidelity/RC-51
...
Beta Release 51 - Includes up to Developer Release 7008
2017-08-16 11:56:38 -07:00
Zach Fox
4cf6f2d8b8
Merge pull request #11188 from davidkelly/dk/makeMeSomeKeys
...
Wallet needs some keys
2017-08-16 10:56:34 -07:00
David Kelly
73e943daaf
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys
2017-08-16 10:13:08 -07:00
Brad Hefta-Gaub
714027d2e2
Merge pull request #11196 from hyperlogic/bug-fix/avatar-capsule-issues
...
Fix for incorrectly sized avatar capsule collision
2017-08-16 09:58:39 -07:00
Zach Fox
c024bd2d83
Merge pull request #11195 from zfox23/commerce_securityImage1
...
Commerce: First pass at security images (NOT FINAL)
2017-08-16 09:57:55 -07:00
SamGondelman
86cc938a47
Merge remote-tracking branch 'upstream/master' into sharks
2017-08-16 09:54:12 -07:00
Seth Alves
58a63a14fb
Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1
2017-08-16 09:14:10 -07:00
Seth Alves
91f2e2b773
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-16 09:13:54 -07:00
Seth Alves
a0231898e6
Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1
2017-08-16 09:13:45 -07:00
Olivier Prat
9691c957e4
Merge branch 'master' of git://github.com/highfidelity/hifi into fadeinvertfix
2017-08-16 09:41:49 +02:00
Liv
36ff82db6b
Merge pull request #11056 from misslivirose/feat/domain-setup
...
[Protocol Change] Allow specified users/groups to replace domain content from within Interface
2017-08-15 20:29:25 -07:00
Anthony J. Thibault
aef19c6f97
Rig: Use a registry to prevent use after free crashes/corruption
...
Create a global registry to hold all the currently active Rig instances.
Use this registry and it's mutex to prevent accessing the rig after it has already been destroyed,
or is in the process of being destroyed on the main thread.
2017-08-15 18:28:51 -07:00
Seth Alves
9f0109881e
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-15 18:05:23 -07:00
Seth Alves
572930b30f
Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1
2017-08-15 18:05:09 -07:00
Seth Alves
243cffb98d
oops
2017-08-15 18:05:06 -07:00
SamGondelman
a641fb7a7f
rename qvector findRayIntersection to avoid script conflicts
2017-08-15 18:03:52 -07:00
Seth Alves
3082c357f9
cloning sort-of works... cloning an equipable doesn't
2017-08-15 17:54:04 -07:00
Anthony J. Thibault
e9b8e5431d
Fix for incorrectly scaled bounding volumes when switching avatars
...
Make sure to explicitly set the _geometryToRigTransform in Rig::initJointStates().
This should fix small bounding volume when switching from the Gamebot avatar (which has 0.008 scaling)
to another avatar (which ususally have 0.01 scaling).
2017-08-15 17:26:51 -07:00
Zach Fox
2fa1bd25a8
Clipping and mipping!
2017-08-15 16:45:46 -07:00
Zach Fox
984a5aea2c
You can now spawn infinite copies of items you've previously purchased
2017-08-15 16:32:23 -07:00
Zach Fox
5c157a7397
Move security image to top left
2017-08-15 16:24:14 -07:00
Zach Fox
ccf2d71036
V1 done
2017-08-15 16:11:34 -07:00
Zach Fox
29a9ae28e9
Fixes
2017-08-15 15:36:28 -07:00
Liv
1ae4a5c019
remove class from function call
2017-08-15 15:30:43 -07:00
Zach Fox
d376630bde
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_securityImage1
2017-08-15 15:03:02 -07:00
Zach Fox
768eb7f91c
Getting closer
2017-08-15 15:02:28 -07:00
Seth Alves
4bfbab294d
near-trigger works?
2017-08-15 14:53:58 -07:00
Seth Alves
03977334a0
near-trigger works?
2017-08-15 14:50:39 -07:00
Seth Alves
3b61e8518f
near-trigger works? equip calls its entity methods now
2017-08-15 14:46:48 -07:00
Seth Alves
ddca25672f
trying to get near-triggering working
2017-08-15 14:14:28 -07:00
Liv
aea5f170f2
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-08-15 13:58:22 -07:00
Liv
49eab847fd
Refactor handleOctreeFileReplacement, style changes, align with handler for other file types
2017-08-15 13:58:02 -07:00
Liv
c0fa446b75
Remove domain management scripting interface
2017-08-15 13:49:13 -07:00
Anthony J. Thibault
f46198c2fd
Simplified/Improved avatar capsule calculation
...
IK is no longer performed during capsule calculation, This fixes an issue with the mannequin avatar in the marketplace.
Specifically, it was causing the hips to rise during IK which would result in an incorrectly sized and offset capsule.
2017-08-15 13:48:10 -07:00
Zach Fox
b7282cc776
Lots of fixes
2017-08-15 13:46:20 -07:00
Anthony Thibault
342f8acff5
Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision
...
Improve avatar hand vs body collision
2017-08-15 13:43:21 -07:00
SamGondelman
9bb7e66859
separate raypickscriptinginterface, cleanup
2017-08-15 13:36:41 -07:00
Seth Alves
1d24523be9
equip drop gesture works
2017-08-15 13:09:17 -07:00
Zach Fox
528d2072f9
Bugfixes and improvements
2017-08-15 12:14:32 -07:00
Seth Alves
e6ac07d43d
equipping mostly works
2017-08-15 11:45:45 -07:00
Anthony J. Thibault
6e0ddadb29
Fix for array size.
2017-08-15 11:45:22 -07:00
David Kelly
0f7db74ef1
missed a couple warnings
2017-08-15 11:44:15 -07:00
Dante Ruiz
84738f51c2
fixed tab issue
2017-08-15 11:21:43 -07:00
Dante Ruiz
3a8856fae6
fix selection issue for TreeView.qml
2017-08-15 11:21:34 -07:00
Anthony J. Thibault
04006a9f76
code review feedback
2017-08-15 11:19:41 -07:00
Zach Fox
bddce9328b
V1
2017-08-15 11:08:03 -07:00
Seth Alves
b2d7eefc97
equip highlight works now
2017-08-15 10:30:47 -07:00
