Commit graph

6075 commits

Author SHA1 Message Date
Alexander Ivash
5990d2725a disallow to scale avatar with controllers 2018-07-06 21:00:55 +03:00
Alexander Ivash
58de136dfa fix MARKETPLACES_INJECT_SCRIPT_URL, apply it on opening avatar info 2018-07-06 21:00:55 +03:00
Alexander Ivash
dbf1aa779a reflect changes in grabbed wearable position/rotation in UI 2018-07-06 21:00:55 +03:00
Alexander Ivash
cc151d6187 Change the name of the app from “AvatarApp” to “Avatar”. 2018-07-06 21:00:54 +03:00
Alexander Ivash
b445cc6105 allow changing avatar scale without saving; revert on cancel 2018-07-06 21:00:54 +03:00
Alexander Ivash
73ec34825b add proper application icon 2018-07-06 21:00:54 +03:00
Alexander Ivash
764dc6d156 add link to 'external avatar' dialog 2018-07-06 21:00:53 +03:00
Alexander Ivash
91e1714b0e external avatars support 2018-07-06 21:00:53 +03:00
Alexander Ivash
3ac44376b2 bind Settings page to a backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
1cc086f9c6 cleanup and bugfixing 2018-07-06 21:00:53 +03:00
Alexander Ivash
74bfea59cc reply => data 2018-07-06 21:00:53 +03:00
Alexander Ivash
bcb373618f navigation to market / my purchases from message dialog links 2018-07-06 21:00:53 +03:00
Alexander Ivash
4ce8e29d97 navigate to BodyMart / AvatarIsland on 'get avatars' / 'get wearables' 2018-07-06 21:00:53 +03:00
Alexander Ivash
3baa1a588f bound 'displayName' to backend, adjust font 2018-07-06 21:00:53 +03:00
Alexander Ivash
10f2fe5fe6 implement adding bookmark
improve comparision of attachments/wearables
2018-07-06 21:00:53 +03:00
Alexander Ivash
c3f0cb67a6 fix for inability to ajuste wearables after cancelling changes 2018-07-06 21:00:53 +03:00
Alexander Ivash
512e72d6d1 integrate deleting favorite avatars with backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
51c8248463 introduce reverting avatar wearables on cancel 2018-07-06 21:00:53 +03:00
Alexander Ivash
9914a1d523 AdjustWearables: implement deleting/refreshing wearables/wearable 2018-07-06 21:00:52 +03:00
Alexander Ivash
b6769f9678 avatar selection & wearables adjustments work-on-progress 2018-07-06 21:00:52 +03:00
Alexander Ivash
4fa72eab6d show real wearables from avatar in combobox 2018-07-06 21:00:52 +03:00
Alexander Ivash
5007c259bb query real avatar favorites (but use fake urls for now) 2018-07-06 21:00:52 +03:00
Alexander Ivash
1ddfc87396 wip on avatarapp 2018-07-06 21:00:51 +03:00
John Conklin II
dfa0b96a93
Merge pull request #13546 from sethalves/fix-display-controller-buttons
keep buttons from drifing away from in-world display of controllers
2018-07-05 13:09:07 -07:00
Seth Alves
73071df857 when displaying the in-world controller model, make buttons and joysticks be children of the base controller model, rather than children of the avatar 2018-07-05 10:07:49 -07:00
Zach Fox
01c4b57d11
Merge pull request #13539 from zfox23/MS16413_snapPrintFall
Implement MS16413: Improve angularVelocity of printed Snaps
2018-07-05 09:50:06 -07:00
Thijs Wenker
446b82abd6
Merge pull request #13410 from dback2/editHandleToggleFix
Fix toggling edit handles between local/world space
2018-07-04 00:23:21 +02:00
Zach Fox
6efb895708 Implement MS16413: Improve angularVelocity of printed Snaps 2018-07-03 13:43:04 -07:00
Seth Alves
62ec693280
Merge pull request #13526 from wayne-chen/fixStillOnlySnap-case-15860
fixing still only snap in snap app
2018-07-03 11:36:25 -07:00
Wayne Chen
2bbc5b6137 remove ray pick print statement - it bloats the debug window 2018-07-03 09:11:57 -07:00
Wayne Chen
aefa52b4c9 fixing still only snap in snap app 2018-07-02 17:00:31 -07:00
John Conklin II
94ab0c71b2
Merge pull request #13040 from 1P-Cusack/BugFix_EntityListException_20180427
[BugFix] EntityList UncaughtException in that.sendUpdate
2018-07-02 12:35:20 -07:00
John Conklin II
d9a3676c7c
Merge pull request #13493 from alexiamandeville/sittingUpdate
Resolving issue where VR input for movement stops emotes
2018-07-02 12:30:50 -07:00
David Back
e1de226aae change toggle input to t 2018-07-02 11:11:02 -07:00
David Back
122b385dd3 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-07-02 10:57:47 -07:00
David Back
fd4a8fdd83 fix color NaN check 2018-06-29 15:33:55 -07:00
David Back
328bf37f64 Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix 2018-06-29 10:34:17 -07:00
David Back
6f0ac32344 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-06-28 17:32:18 -07:00
David Back
7b9341954f Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-06-28 12:10:42 -07:00
Zach Fox
2d27de12bd Fix MS14743: Change SNAP prints such that they don't fall through the floor 2018-06-28 12:06:31 -07:00
John Conklin II
138342ba91
Merge pull request #13485 from zfox23/MS16257_clearOverlay
Implement MS16257: Remove 'clear overlay when moving' setting and code
2018-06-28 09:31:04 -07:00
David Back
e74d30ce22 fix color fallbacks 2018-06-27 17:43:41 -07:00
Alexia Mandeville
8228afb378 Resolving issue where VR input for movement stops emotes 2018-06-27 17:15:54 -07:00
David Back
dd09ec1656 Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix 2018-06-27 16:32:21 -07:00
John Conklin II
e9d2797573
Merge pull request #13472 from alexiamandeville/sittingUpdate69
Restoring Emote app to stable build state, adding sit and love emotes
2018-06-27 16:00:53 -07:00
Zach Fox
cfc8c0fb09 Implement MS16257: Remove 'clear overlay when moving' setting and code 2018-06-27 14:07:04 -07:00
Alexia Mandeville
0f25ab7376
Fixing error from typo 2018-06-27 13:30:10 -07:00
David Back
2cdda23169 more robustness for optional properties 2018-06-27 13:05:39 -07:00
John Conklin II
2da3192c33
Merge pull request #13402 from ctrlaltdavid/21895
Make desktop left and right mouse button actions independent
2018-06-27 12:46:11 -07:00
Zach Fox
bdeb22703c
Merge pull request #13474 from zfox23/MS16235_handshakeParticles
Fix MS16235: Set previously-buggy Handshake particle properties to 0
2018-06-27 12:16:48 -07:00