MiladNazeri
258133f1db
Merge pull request #12335 from ctrlaltdavid/21736
...
Update Overlays circle3d JSDoc per recent code changes
2018-02-14 17:17:04 -08:00
samcake
1d3ae1b187
Work in progress to get the render items beeing tagged correctly for groupCulled
2018-02-13 17:50:01 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml
...
Migrating QML rendering off the main thread
2018-02-12 15:32:33 -08:00
John Conklin II
88094cae87
Merge pull request #12363 from zfox23/commerce_inspectionCertRedesign_v2
...
Commerce: Inspection Certificate Redesign (Fixed!)
2018-02-09 15:51:46 -08:00
Seth Alves
5e16623c81
allow overlay children to follow avatar from one domain to another
2018-02-08 17:17:04 -08:00
Bradley Austin Davis
023ee35b2e
Merge remote-tracking branch 'upstream/master' into threaded_qml
2018-02-08 17:16:36 -08:00
Zach Fox
a92e614aff
Bugfix.
2018-02-08 10:35:34 -08:00
Zach Fox
744f679b4e
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2
2018-02-08 09:51:35 -08:00
Zach Fox
f5e2e4f3d8
Comment change
2018-02-07 15:44:21 -08:00
Zach Fox
e01e88d4ae
This works, but is it correct?
2018-02-07 15:13:22 -08:00
Seth Alves
84f4453990
undo part of #12312
2018-02-07 13:32:30 -08:00
Brad Davis
7d5502eb92
Migrating QML rendering off the main thread
2018-02-06 11:53:09 -08:00
David Rowe
22b33c7391
Update Overlays circle3d JSDoc per recent code changes
2018-02-05 11:22:40 +13:00
Seth Alves
bdf6736a54
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-02-01 12:04:56 -08:00
Liv
6363ded74b
Merge pull request #12280 from misslivirose/feat/expose-identity-verification
...
Expose functionality to enable entity scripts to check ownership verification on avatar entities
2018-02-01 10:07:58 -08:00
Seth Alves
482be7ba4e
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-02-01 06:36:04 -08:00
vladest
bca903a6df
Fix build
2018-01-31 23:31:18 +01:00
vladest
2a5b3d97fb
AddressBar trigger implemented. Fixed warnings on non existing context properties. Fixed warnings about non notifyable property
2018-01-31 23:05:38 +01:00
Seth Alves
a49097789a
Revert "AddressBar trigger implemented. Fixed warnings on non existing contex…"
2018-01-31 13:32:19 -08:00
Seth Alves
acc5973813
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-31 12:22:50 -08:00
Seth Alves
0df4ae02fc
Merge pull request #12126 from vladest/addressbar_close_fix
...
AddressBar trigger implemented. Fixed warnings on non existing contex…
2018-01-31 11:26:05 -08:00
Seth Alves
64a46bf5df
merge from upstream
2018-01-31 10:43:41 -08:00
Liv Erickson
8b7c989508
move emit signals to wallet interface
2018-01-29 16:34:44 -08:00
Liv Erickson
ce8159340b
fix vs autoformatting
2018-01-29 15:51:09 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
Liv Erickson
634bc83ed5
fix elses
2018-01-29 12:54:52 -08:00
Liv Erickson
f8f76d6757
changing back to avatar only and making some changes to avoid multiple calls to dependency manager
2018-01-29 12:46:00 -08:00
Liv Erickson
20635acf27
moving logic to wallet, crashes currently
2018-01-26 17:13:39 -08:00
Sam Gateau
51dac04374
Introducing the tag in lieu of the vsisiblity mask
2018-01-26 02:59:43 -08:00
Sam Gateau
23b99f04cd
Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch
2018-01-25 18:33:37 -08:00
samcake
2f4e61888f
Making it work maybe
2018-01-25 16:57:35 -08:00
Liv Erickson
3a6f184278
make clear function is for avatar entities only, add error handling in non-client entity cases
2018-01-25 15:13:14 -08:00
Liv Erickson
7e5684c439
use signals
2018-01-25 15:04:12 -08:00
Brad Davis
ac94327ec7
Fix loading of the context overlay information icon
2018-01-25 12:44:55 -08:00
Liv Erickson
7ee5608992
initial first pass of exposing headless verification
2018-01-25 12:02:26 -08:00
samcake
ae6a95ec0d
fixing my bugs on vissibility
2018-01-24 18:07:35 -08:00
samcake
38242072e5
Merge branch 'cauterize-head-av-entities-1' of https://github.com/sethalves/hifi into seth-branch
2018-01-23 16:30:54 -08:00
Seth Alves
1cbc2e31cf
merge from upstream
2018-01-23 15:21:03 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
Sam Gateau
d38d13cbb9
Trying to address the overlays to not be visisble in 2nd camera
2018-01-21 23:47:45 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
Seth Alves
bce9b5f459
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 09:53:54 -08:00
Seth Alves
6aa389cad0
trying to now show overlays in mirrors
2018-01-19 09:53:41 -08:00
Brad Hefta-Gaub
f3dfad6c59
Merge pull request #12155 from ctrlaltdavid/21689
...
Remove unused "anchor" Overlays property
2018-01-18 15:04:41 -08:00
Seth Alves
7c32d3c536
flip logic back around
2018-01-18 13:49:17 -08:00
Seth Alves
fb974b0b9c
attempt to straighten out use of view-visibility masks
2018-01-18 10:09:23 -08:00
David Back
92c0fd4877
Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS
...
Merge Account & GlobalServices follow-up
2018-01-17 10:50:54 -08:00
David Rowe
5dca387055
Remove old, unused overlay panel code
2018-01-12 12:47:22 +13:00
David Rowe
9b0fb19cfa
Remove unused "anchor" Overlays property
2018-01-12 12:16:58 +13:00
