Ryan Huffman
|
51ce19e026
|
Fix modified const var in MarketplaceItemUploader
|
2019-01-04 12:08:23 -08:00 |
|
Ryan Huffman
|
6d5b9a88e4
|
Remove dead code in AvatarUploadStatusItem
|
2019-01-04 11:29:07 -08:00 |
|
Ryan Huffman
|
b680e9c52a
|
Update avatar packager with CR feedback
|
2019-01-04 09:59:17 -08:00 |
|
Ryan Huffman
|
f38a469e65
|
Update avatar packager to force focus on inventory when opened
|
2019-01-04 09:55:21 -08:00 |
|
Ryan Huffman
|
c2ceeb3d76
|
Apply AvatarPackager code review cleanup
|
2019-01-04 09:41:31 -08:00 |
|
Ryan Huffman
|
f27ee1767c
|
Fix rename not working correctly in AvatarPackager
|
2019-01-04 08:43:43 -08:00 |
|
Ryan Huffman
|
93f53cf43d
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2019-01-03 14:18:40 -08:00 |
|
Ryan Huffman
|
847496048f
|
Fix waiting-for-inventory sticking around on avatar uploader
|
2019-01-03 13:51:45 -08:00 |
|
Ryan Huffman
|
7ca7e0f234
|
Revert unintended changes in avatar packager
|
2019-01-03 13:45:00 -08:00 |
|
Thijs Wenker
|
c95da0a595
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
# Conflicts:
# interface/src/Application.cpp
|
2019-01-03 22:17:54 +01:00 |
|
Thijs Wenker
|
68521e11a7
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
# Conflicts:
# interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
# interface/resources/qml/hifi/avatarPackager/InfoBox.qml
|
2019-01-03 22:13:04 +01:00 |
|
Thijs Wenker
|
ecc578c2dd
|
- error messages
- style changes
|
2019-01-03 22:00:22 +01:00 |
|
Ryan Huffman
|
7953507cb8
|
Update avatar project rename to have audio and highlighting
|
2019-01-03 11:59:16 -08:00 |
|
John Conklin II
|
3fa1acbf87
|
Merge pull request #14472 from sethalves/grab-traits
use Traits system for grabbing
|
2019-01-03 11:23:11 -08:00 |
|
Ryan Huffman
|
c13badcbc8
|
Fix project rename focus and create project not initializing
|
2019-01-03 10:20:13 -08:00 |
|
Thijs Wenker
|
37d00d9519
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2019-01-03 18:18:07 +01:00 |
|
Ryan Huffman
|
9c96f7bd01
|
Add RalewayButton
|
2019-01-03 08:21:52 -08:00 |
|
Seth Alves
|
b2f25629eb
|
don't allow scaling of others' equipped entities
|
2019-01-03 08:19:18 -08:00 |
|
Seth Alves
|
ad1235ce94
|
also bump entity protocol version
|
2019-01-03 08:19:13 -08:00 |
|
Seth Alves
|
a7515a4bde
|
include owningAvatarID in entityPropertyFlagsFromScriptValue
|
2019-01-03 08:18:34 -08:00 |
|
Seth Alves
|
306c54c060
|
fix code that allows adjusting of own avatar entities while forbidding adjusting those of others
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
3ccbd0bc7b
|
disable positionand velocity script edits on grabbed entities
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
bf46960dc3
|
fix timing on startNearGrab entity-method call for cloned entities. Don't allow grabbing of other's equipped or worn entities
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
3c0243419b
|
trying again on avatar-entity grab releases
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
54a5805b5c
|
add final edit when dropping an avatar-entity. don't allow grabbing of other's avatar entities
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
05a80ae0e4
|
don't bootstrap with a traits-based grab
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
9bf9e379a3
|
fix far-grab initial rotation and entity-method call
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
613f290226
|
don't attempt to grab other's avatar-entities
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
895e8cdba1
|
fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
bc5079e5d7
|
fix flawed logic in updateEntityQueryAACubeWorker
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
38cc2205ec
|
dimensions is a simulation restricted change
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
0967a94557
|
get grabbing and scaling to get along better
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
905af34564
|
disable traits-based grabbing by default
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
6a547d042c
|
port over PR-14276
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
1c1e648b8b
|
port over PR-14429
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
9900040ece
|
enable trait-based grabbing by default
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
70b68294ff
|
port over PR-14464
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
6f25c59a0c
|
turn-off nearEntityGrab when scaleEntity is active
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
fc128b49de
|
don't crash when releasing an entity that has expired
|
2019-01-03 08:17:52 -08:00 |
|
Seth Alves
|
78aff6e95c
|
grab js api; send grab information through trait system
|
2019-01-03 08:17:52 -08:00 |
|
Thijs Wenker
|
a035a2f639
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2019-01-03 11:09:27 +01:00 |
|
Thijs Wenker
|
725a14ce80
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2019-01-03 11:06:19 +01:00 |
|
Sam Gondelman
|
aeafb3c9a7
|
Merge pull request #14569 from SamGondelman/NOverlays6
Case 20281: Add missing Text Entity properties
|
2019-01-02 18:07:37 -08:00 |
|
Ryan Huffman
|
61ac9d0050
|
Update various styling in Avatar Packager
|
2019-01-02 16:47:09 -08:00 |
|
Thijs Wenker
|
cb91a4bc6d
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2019-01-03 00:10:22 +01:00 |
|
Ryan Huffman
|
41effbf862
|
Remove unused variable in MarketplaceItemUploader.cpp
|
2019-01-02 15:01:00 -08:00 |
|
Ryan Huffman
|
d29233872e
|
Remove avatar packager from Android builds
|
2019-01-02 14:59:47 -08:00 |
|
Antonina Savinova
|
4838a9107a
|
Merge pull request #14624 from davidkelly/dk/17207
ACs don't need to call into flagtimeForConnecitonStep
|
2019-01-02 13:41:30 -08:00 |
|
Ryan Huffman
|
f3d2d7c95b
|
Merge pull request #14638 from huffman/fix/entity-list-text-mb
Fix texture MB column not sorting correctly in entity list
|
2019-01-02 13:32:05 -08:00 |
|
Jeff Clinton
|
d5ef7ba175
|
Merge pull request #14610 from roxanneskelly/Case20106
Case 20106-AC agents spawned with -n don't come back
|
2019-01-02 11:07:40 -08:00 |
|