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
|
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
|
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 |
|
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 |
|
SamGondelman
|
32bec57cfe
|
Merge remote-tracking branch 'upstream/master' into NOverlays6
|
2019-01-02 09:53:29 -08:00 |
|
Jeff Clinton
|
bb27acf934
|
Merge pull request #14530 from SamGondelman/NOverlays4
Case 20134: Grid Entities
|
2019-01-02 09:12:34 -08:00 |
|
Jeff Clinton
|
032178673a
|
Merge pull request #14634 from SamGondelman/NOverlays5
Case 20200: Update EntityScriptingInterface to not find local entities (#2)
|
2019-01-02 09:00:56 -08:00 |
|
Thijs Wenker
|
20c169bd39
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2019-01-02 14:03:13 +01:00 |
|
Thijs Wenker
|
cb33a91a34
|
- rename functionality
- avatar packager works in tablet now
|
2018-12-29 03:31:56 +01:00 |
|
Adam Smith
|
833ad936c0
|
Merge pull request #14630 from jherico/fix/20284_master
Fix for Oculus reset view issue
|
2018-12-28 16:24:40 -08:00 |
|
John Conklin II
|
4f3dd390b5
|
Merge pull request #14625 from SamGondelman/deprecateDashed
Case 20392: Deprecated 3D Overlay dashed/isDashed
|
2018-12-28 10:16:27 -08:00 |
|
Thijs Wenker
|
1ec8aa8fa5
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2018-12-28 17:13:05 +01:00 |
|
Ryan Huffman
|
24aaeee5fd
|
Disable back button on avatar upload page
|
2018-12-27 22:55:54 -08:00 |
|
Ryan Huffman
|
8f70865cf7
|
Fix marketplace upload finishing before inventory item is valid
|
2018-12-27 21:02:56 -08:00 |
|
Ryan Huffman
|
83a60a541b
|
Fix styling and flow issues in avatar uploader
|
2018-12-27 18:53:07 -08:00 |
|
Ryan Huffman
|
c21d037800
|
Fix marketplace uploader not working with projects larger than 128MB
|
2018-12-27 17:51:27 -08:00 |
|
Brad Hefta-Gaub
|
440f517b88
|
Merge pull request #14602 from samcake/punk
Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera
|
2018-12-27 15:43:17 -08:00 |
|
Ryan Huffman
|
9e7f89e2b0
|
Update link text for avatar project files
|
2018-12-27 14:38:46 -08:00 |
|
Ryan Huffman
|
89b03a3cdc
|
Add info popup box for avatar project files
|
2018-12-27 14:30:44 -08:00 |
|
Thijs Wenker
|
656d96c725
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager
# Conflicts:
# interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml
|
2018-12-27 21:52:57 +01:00 |
|
Thijs Wenker
|
1a38abe230
|
- add jointIndexes to new
- attempt to fix OSX / linux build
- ability to actually load a recent project (previously was only able to load the top recent project)
|
2018-12-27 21:47:10 +01:00 |
|
Ryan Huffman
|
882975f01c
|
Update icons in avatar packager
|
2018-12-27 12:43:43 -08:00 |
|
Thijs Wenker
|
2f32458f72
|
recent projects
|
2018-12-27 19:52:56 +01:00 |
|
Thijs Wenker
|
b6359a6cb4
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager
|
2018-12-27 14:25:13 +01:00 |
|
Ryan Huffman
|
1da179dc04
|
Update avatar packager styling
|
2018-12-27 00:13:45 -08:00 |
|
Thijs Wenker
|
a1ef1b4447
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2018-12-24 16:48:40 +01:00 |
|
Ryan Huffman
|
8c56e35f69
|
Add granular status to avatar upload
|
2018-12-23 00:13:01 -08:00 |
|
Ryan Huffman
|
b717188ed0
|
Update avatar project styling
|
2018-12-22 21:57:09 -08:00 |
|
SamGondelman
|
b5a2642b6a
|
updated entityscriptinginterface API and related functions
(cherry picked from commit 6aac596698)
|
2018-12-22 00:55:10 -05:00 |
|
Ryan Huffman
|
9955de6288
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2018-12-21 11:43:49 -08:00 |
|
Ryan Huffman
|
748135eef9
|
Fix login-required size and projectFiles warning
|
2018-12-21 11:43:20 -08:00 |
|
Thijs Wenker
|
ad2d9bc79a
|
- fst read/write should work
- images are being copied into the correct directory
- scripts are added to fst upon project load
- modal overlay fix
|
2018-12-21 19:34:54 +01:00 |
|
Thijs Wenker
|
1da5b3fae2
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2018-12-21 19:20:16 +01:00 |
|
Ryan Huffman
|
7602da6f92
|
Add AvatarProjectUpload.qml
|
2018-12-21 08:16:18 -08:00 |
|
Thijs Wenker
|
ea901aa179
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2018-12-21 14:11:57 +01:00 |
|
Thijs Wenker
|
dab4a621a3
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2018-12-21 01:59:11 +01:00 |
|
Sam Gondelman
|
097d2d9503
|
Revert "Case 20200: Update EntityScriptingInterface to not find local entities"
|
2018-12-20 16:53:33 -08:00 |
|
Ryan Huffman
|
556f516be6
|
Update uploader screen
|
2018-12-20 16:30:08 -08:00 |
|