David Back
|
d9e229d38e
|
remove add Grid entity button, fix color
|
2019-01-07 18:20:20 -08:00 |
|
David Back
|
90e2feb977
|
replace placeholder icon with real icon from Alan
|
2019-01-07 18:20:20 -08:00 |
|
David Back
|
e0e9a7de15
|
tabs
|
2019-01-07 18:20:20 -08:00 |
|
David Back
|
9013eee352
|
add grid entities to create - icons pending
|
2019-01-07 18:20:19 -08:00 |
|
SamGondelman
|
62dbca6ce7
|
fix export entities
|
2019-01-07 14:08:52 -08:00 |
|
Shannon Romano
|
963bbbad19
|
Merge pull request #14661 from danteruiz/grabbing-web-entites
allow mouse pointer to pick against collidable entities
|
2019-01-07 10:24:48 -08:00 |
|
Dante Ruiz
|
4b99a795dd
|
code review changes
|
2019-01-07 09:09:35 -08:00 |
|
Jeff Clinton
|
75d26dc45f
|
Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption
Add menu checkbox to toggle collisions with other avatars
|
2019-01-07 08:58:09 -08:00 |
|
Dante Ruiz
|
0dc5e7743f
|
allow mouse pointer to pick against collidable entities
|
2019-01-04 17:49:38 -08:00 |
|
luiscuenca
|
2a367509cd
|
Fix warnings
|
2019-01-04 18:02:18 -07:00 |
|
Shannon Romano
|
4e5d275768
|
Merge pull request #14632 from thoys/feat/avatarTools/avatarPackager
MS19925: Avatar Packager
|
2019-01-04 16:22:06 -08:00 |
|
luiscuenca
|
d630fe9dbd
|
Add menu checkbox to toggle collisions with other avatars
|
2019-01-04 16:38:48 -07:00 |
|
Thijs Wenker
|
b0db81b861
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2019-01-05 00:01:25 +01:00 |
|
Thijs Wenker
|
94146ab997
|
CR fixes
|
2019-01-04 23:59:22 +01:00 |
|
Ryan Huffman
|
7433870c2f
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2019-01-04 14:43:46 -08:00 |
|
Thijs Wenker
|
5d40e1e480
|
- CR/style fixes
- Moved the old Avatar Packager tool to Developer -> Avatar -> ..
|
2019-01-04 23:39:04 +01:00 |
|
Shannon Romano
|
9855e9bee8
|
Merge pull request #14650 from NissimHadar/20301-addPlatformInfo
Case 20301 - add platform info
|
2019-01-04 14:37:17 -08:00 |
|
Ryan Huffman
|
63172ec87b
|
Fix marketplace item update failing on submitted items
|
2019-01-04 14:21:10 -08:00 |
|
Thijs Wenker
|
b105607cb2
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2019-01-04 21:13:29 +01:00 |
|
Thijs Wenker
|
a3f72a7a08
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2019-01-04 21:10:35 +01:00 |
|
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 |
|
Jamil Akram
|
2c247bc3df
|
Merge pull request #14592 from huffman/fix/myavatar-collisions
Fix MyAvatar::collisionWithEntity not firing
|
2019-01-04 09:43:29 -08:00 |
|
Ryan Huffman
|
c2ceeb3d76
|
Apply AvatarPackager code review cleanup
|
2019-01-04 09:41:31 -08:00 |
|
Shannon Romano
|
bdac7fe298
|
Merge pull request #14647 from hyperlogic/feature/improve-eye-look-at-interest-calculation
Update eye look at interest calculation
|
2019-01-04 09:16:53 -08:00 |
|
Ryan Huffman
|
f27ee1767c
|
Fix rename not working correctly in AvatarPackager
|
2019-01-04 08:43:43 -08:00 |
|
Thijs Wenker
|
8625037285
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2019-01-04 15:29:07 +01:00 |
|
Antonina Savinova
|
4414579a6e
|
Merge pull request #14591 from Atlante45/feat/stats
Fix network stats to use low-level values
|
2019-01-03 16:54:03 -08:00 |
|
Jamil Akram
|
486a4b6e75
|
Merge pull request #14646 from hyperlogic/bug-fix/drop-after-delay-drop-down-width
Make the Out of Range Strategy drop down wider
|
2019-01-03 16:32:13 -08:00 |
|
Anthony Thibault
|
7e68f539d3
|
Only use the camera position for lookAt in first person.
|
2019-01-03 15:27:44 -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 |
|
Anthony Thibault
|
fa137f0586
|
Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation
|
2019-01-03 13:19:11 -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 |
|
Ryan Huffman
|
c13badcbc8
|
Fix project rename focus and create project not initializing
|
2019-01-03 10:20:13 -08:00 |
|
Clement
|
f163bbc0d5
|
Sample connections stats every seconds
|
2019-01-03 10:04:38 -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
|
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
|
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 |
|
Anthony Thibault
|
006bd8f939
|
Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation
|
2019-01-02 16:58:10 -08:00 |
|