Dante Ruiz
|
0fa2a71d0f
|
actually fix requested changes
|
2018-07-16 11:35:53 -07:00 |
|
Dante Ruiz
|
d81420542c
|
making PR requests
|
2018-07-16 11:00:27 -07:00 |
|
Dante Ruiz
|
47eb7a0899
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab-and-flickering
|
2018-07-16 10:04:42 -07:00 |
|
Qliemillar
|
511b297be5
|
Merge pull request #13597 from dback2/entityListDeleteSpamFix
Fix entity list refresh when entity deleted
|
2018-07-16 09:49:25 -06:00 |
|
David Back
|
c225c3deca
|
Merge pull request #13608 from dback2/alignSelectionToGridFix
Fix aligning selection to grid
|
2018-07-13 13:33:26 -07:00 |
|
David Back
|
0a738e36a8
|
Merge pull request #13569 from dback2/hmdHandlesInBoundingBox
Only clamp edit handles in HMD when outside bounding box
|
2018-07-13 10:55:54 -07:00 |
|
unknown
|
151f948b26
|
prints
|
2018-07-12 19:26:20 -07:00 |
|
unknown
|
acae4df3c3
|
fix align to selection to grid
|
2018-07-12 19:23:06 -07:00 |
|
Alexander Ivash
|
437f49ac22
|
16683 Avatar App - Add to Favorites Button Not Working
|
2018-07-13 03:01:02 +03:00 |
|
unknown
|
306a77c039
|
fix delete event
|
2018-07-12 12:46:18 -07:00 |
|
Zach Fox
|
ee08ef981d
|
Slightly increase linear damping
|
2018-07-11 10:44:24 -07:00 |
|
Zach Fox
|
6218f80387
|
MS14743 again: More bandaids for preventing Snappy printouts from falling thru floor
|
2018-07-11 10:07:02 -07:00 |
|
Zach Fox
|
2fad55e5d0
|
Prevent PAL from re-enabling ContextOverlayInterface when it's not supposed to
|
2018-07-10 15:56:13 -07:00 |
|
David Back
|
7a7b9730ee
|
only clamp handles in hmd outside bounding box
|
2018-07-09 15:36:22 -07:00 |
|
John Conklin II
|
81f5631ce9
|
Merge pull request #13386 from ElderOrb/FB13949
AvatarApp
|
2018-07-09 15:20:18 -07:00 |
|
John Conklin II
|
25406fa464
|
Merge pull request #13495 from thoys/feat/create/native-windows
Create App: Native windows
|
2018-07-09 14:25:13 -07:00 |
|
David Back
|
8f1ad8e367
|
Merge pull request #13538 from dback2/editHandleMacFix
Edit handle undefined event fix
|
2018-07-09 12:08:18 -07:00 |
|
John Conklin II
|
79b2858220
|
Merge pull request #13543 from ctrlaltdavid/M16392
Create snap-to-grid and translation fixes
|
2018-07-09 11:39:26 -07:00 |
|
David Back
|
d4f43a56f2
|
Merge pull request #13556 from dback2/deselectInput
Change deselecting entities to Ctrl + D and prevent W/A/S/D/E/Q movements with Ctrl
|
2018-07-09 10:40:33 -07:00 |
|
David Back
|
17220b9360
|
Merge pull request #13549 from dback2/parentChildCopy
Re-parent entities after duplicating and duplicate children with parents
|
2018-07-09 10:06:18 -07:00 |
|
Thijs Wenker
|
b1884b0841
|
CR fixes
|
2018-07-09 16:38:53 +02:00 |
|
David Back
|
3bcc727d47
|
check controller triggered in checkControllerMove
|
2018-07-06 18:57:32 -07:00 |
|
David Back
|
f33fae30ed
|
Merge branch 'editHandleMacFix' of github.com:dback2/hifi into editHandleMacFix
|
2018-07-06 18:56:09 -07:00 |
|
David Back
|
d04c2eaf73
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleMacFix
|
2018-07-06 18:01:16 -07:00 |
|
David Back
|
f815ad1ddd
|
tabs
|
2018-07-06 17:02:41 -07:00 |
|
David Back
|
c271e1aae4
|
fix triggering at non-web overlays
|
2018-07-06 17:02:29 -07:00 |
|
Alexander Ivash
|
7feb9910c9
|
use rotation degrees instead of quaternions for comparison
re-query entity properties after editing it to get actual changes
|
2018-07-07 02:36:19 +03:00 |
|
Alexander Ivash
|
168584169c
|
do not close avatarapp on hiding tablet
|
2018-07-07 02:36:19 +03:00 |
|
Alexander Ivash
|
19f37246a6
|
capitalize avatarapp name in toolbar/tablet icons
|
2018-07-07 02:36:19 +03:00 |
|
David Back
|
a546d8b279
|
tabs
|
2018-07-06 15:48:53 -07:00 |
|
Dante Ruiz
|
ae03dcb57a
|
fix parent grab dropping and cullig flickering
|
2018-07-06 15:42:21 -07:00 |
|
David Back
|
33e170315c
|
recurse on children of children
|
2018-07-06 15:39:18 -07:00 |
|
David Back
|
a415d1eb37
|
Merge branch 'master' of https://github.com/highfidelity/hifi into parentChildCopy
|
2018-07-06 14:32:17 -07:00 |
|
John Conklin II
|
6e13b0e141
|
Merge pull request #13453 from gcalero/web_overlay_android
Support web3d overlays in android
|
2018-07-06 13:02:56 -07:00 |
|
Thijs Wenker
|
eea95161ab
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows
|
2018-07-06 20:06:50 +02:00 |
|
Alexander Ivash
|
67fb8af87c
|
update avatarapp on avatar switch
|
2018-07-06 21:00:56 +03:00 |
|
Alexander Ivash
|
8021434984
|
remove debug tracing
|
2018-07-06 21:00:56 +03:00 |
|
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 |
|