Seth Alves
86a1bc75c9
Merge pull request #11897 from Delanir/Gizmos
...
IPD Secondary Task List: edit.js arrow orientation: Yaw, Pitch, Roll tools
2017-12-08 07:09:09 -08:00
Seth Alves
dfbd6bcd8d
Merge pull request #11933 from druiz17/fix-far-to-equip
...
fix far grab to equip transition
2017-12-08 07:04:54 -08:00
Seth Alves
a6a45bc359
Merge pull request #11936 from ElderOrb/FB10108
...
10108 marketplace category cannot scroll
2017-12-08 07:02:15 -08:00
Seth Alves
eda63e5758
Merge pull request #11919 from ElderOrb/FB9706
...
9706 Editing Attachments Results In Attachments Window Scrolling To Top
2017-12-08 07:01:00 -08:00
Sam Gateau
013d2e808d
Adding the hovering from the mouse from the debugHighlight.js
2017-12-08 03:53:56 -08:00
Sam Gateau
d07cde3ecb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 19:20:25 -08:00
MandatoryMania
f1808ee126
Merge pull request #11943 from MandatoryMania/returnToMarketplace
...
return to main mktplace page from rez page
2017-12-07 19:14:37 -08:00
Howard Stearns
d9ee42d379
Merge pull request #11949 from davidkelly/dk/fixForGnomesAndMore
...
Fix certificate hash
2017-12-07 18:55:59 -08:00
samcake
4c1dea2b30
Remove uneeded files
2017-12-07 17:54:14 -08:00
samcake
7a9d77fed4
return a legit selectedItemsList js object as long as the list exist, only void if the list name is unknown
2017-12-07 17:53:30 -08:00
samcake
ace8e153c2
making sure the ID of an object in the Selection list is unique and more refined debugging
2017-12-07 17:45:40 -08:00
David Kelly
42b509639b
Fix certificate hash
2017-12-07 17:22:00 -08:00
Anthony J. Thibault
542af47e9e
Fix for hand controller avatar scaling.
...
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
and also when the skeleton is no longer valid. These hooks are used to cache the unscaled eye height of the avatar.
2017-12-07 17:08:13 -08:00
Andrew Meadows
ed231fa4a1
Merge pull request #11894 from hyperlogic/bug-fix/flying
...
Improvements to HMD flying
2017-12-07 16:31:33 -08:00
Andrew Meadows
4691a98509
Merge pull request #11865 from hyperlogic/feature/domain-limited-height
...
domain uses min/max avatar height instead of min/max scale
2017-12-07 16:29:15 -08:00
Dante Ruiz
0286f4646a
Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval
2017-12-07 16:19:03 -08:00
samcake
298b9be0c2
Reinstall highlight debug tool
2017-12-07 16:13:32 -08:00
samcake
65f22f498a
remove previous version of debug highlight
2017-12-07 16:09:06 -08:00
samcake
6148458aeb
Workable state, need final clean up and testing
2017-12-07 16:04:08 -08:00
H Q
4ce784291c
Provides a nice alert in case of insufficient funds to make a purchase
2017-12-07 15:13:01 -08:00
Sam Gondelman
e7d7e9abb8
Merge pull request #11947 from ctrlaltdavid/21634
...
Move mouse and hover slots out of Overlays API
2017-12-07 14:47:01 -08:00
Zach Fox
4b3c61178c
Merge pull request #11944 from zfox23/commerce_dontSendEmptyPublicKeys
...
Don't send commerce requests to backend if cached public keys is empty
2017-12-07 14:31:09 -08:00
Sam Gondelman
b05e1f8a32
Merge pull request #11847 from SamGondelman/overlayFlash
...
Cleanup Web3DOverlay and tablet home button
2017-12-07 14:06:56 -08:00
David Rowe
fd38b89f35
Move mouse and hover slots out of Overlays API
2017-12-08 10:58:52 +13:00
Dante Ruiz
4110295677
Merge branch 'master' of github.com:highfidelity/hifi into fix-far-to-equip
2017-12-07 13:42:26 -08:00
Atlante45
d6ac0dc3c2
CR - indentation
2017-12-07 12:54:34 -08:00
Atlante45
4fd83ddd0e
Reduce Image memory usage by moving the data
2017-12-07 12:54:34 -08:00
Nissim Hadar
0894d30358
Merge branch 'master' into QtImageCompare
2017-12-07 11:36:27 -08:00
Nissim Hadar
bcf3afd758
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-12-07 11:35:57 -08:00
Nissim Hadar
5806605439
Reformatting per coding standard.
2017-12-07 11:34:56 -08:00
H Q
72ed3b077d
Addressed PR change requests
2017-12-07 11:28:40 -08:00
Andrew Meadows
813c4fa38a
Merge pull request #11915 from druiz17/fix-collision-mask-for-children
...
If hold actions are added to entity update the collision mask for the children aswell
2017-12-07 11:16:50 -08:00
Nissim Hadar
8c1a4e058e
Changed format (to 5 digits).
...
Changed threshold.
2017-12-07 10:58:28 -08:00
Ryan Huffman
4dd08d93f4
Cleanup dead code and unused var in BakerCLI
2017-12-07 10:54:39 -08:00
Ryan Huffman
94a58a2471
Remove baking dependency from assignment-client
2017-12-07 10:53:23 -08:00
Anthony J. Thibault
47b52238d9
code review feedback
2017-12-07 10:49:23 -08:00
Anthony J. Thibault
68ad27a38d
Merge branch 'master' into bug-fix/flying
2017-12-07 10:28:13 -08:00
Anthony J. Thibault
b5ffda6911
const fix
2017-12-07 10:09:09 -08:00
Anthony J. Thibault
095bedcd3f
code review feedback
2017-12-07 10:08:18 -08:00
Anthony J. Thibault
fbcecbfc89
Merge branch 'master' into feature/domain-limited-height
2017-12-07 10:01:33 -08:00
Zach Fox
21077da41a
Don't send requests to backend if cached public keys is empty
2017-12-07 09:48:06 -08:00
Sam Gondelman
99c52f8602
coding standards
2017-12-07 09:38:14 -08:00
Brad Hefta-Gaub
4f8a2ea4be
Merge pull request #11934 from ctrlaltdavid/21630
...
Fix cloned 3D overlays' dimensions
2017-12-07 09:24:01 -08:00
Brad Hefta-Gaub
a0457d2b5e
Merge pull request #11856 from AndrewMeadows/sort-and-throttle-avatars
...
Use PrioritySortUtil for avatar updates from avatar-mixer
2017-12-07 09:22:52 -08:00
Brad Hefta-Gaub
88ed15aaaa
Merge pull request #11942 from ctrlaltdavid/21633
...
Fix image overlay's subImage property's width and height support
2017-12-07 09:19:43 -08:00
Brad Hefta-Gaub
b91909011a
Merge pull request #11914 from 1P-Cusack/FogBugz/Case_7049
...
[Case 7049]: Remove unused fields and checkboxes from Edit.js
2017-12-07 09:18:26 -08:00
Brad Hefta-Gaub
ac3bd5042f
Merge pull request #11890 from dback2/mirrorissues3
...
Secondary camera frame buffer / texture fixes
2017-12-07 09:17:27 -08:00
samcake
5f85e8e2cb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 08:48:12 -08:00
Sam Gateau
0245a7005d
Adding the query of a particular selection content
2017-12-06 22:44:58 -08:00
samcake
5500a6d11c
More to come
2017-12-06 18:02:30 -08:00
