Ryan Huffman
|
9c96f7bd01
|
Add RalewayButton
|
2019-01-03 08:21:52 -08:00 |
|
Ryan Huffman
|
61ac9d0050
|
Update various styling in Avatar Packager
|
2019-01-02 16:47:09 -08: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 |
|
Thijs Wenker
|
cb33a91a34
|
- rename functionality
- avatar packager works in tablet now
|
2018-12-29 03:31:56 +01: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 |
|
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 |
|
sam gateau
|
26c9d7a94e
|
Merge branch 'master' of github.com:highfidelity/hifi into punk
|
2018-12-20 13:22:19 -08:00 |
|
Shannon Romano
|
21ec4e0c53
|
Merge pull request #14524 from SamGondelman/NOverlays3
Case 20132, Case 16928: First class Image Entities
|
2018-12-20 21:20:49 +00:00 |
|
sam gateau
|
49df69e609
|
Merge branch 'master' of github.com:highfidelity/hifi into punk
|
2018-12-20 13:17:02 -08:00 |
|
Shannon Romano
|
b6d1607acd
|
Merge pull request #14547 from SamGondelman/NOverlays5
Case 20200: Update EntityScriptingInterface to not find local entities
|
2018-12-20 19:10:22 +00:00 |
|
Thijs Wenker
|
79a9c82168
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2018-12-20 18:56:33 +01:00 |
|
Jeff Clinton
|
3d4311b7d4
|
Merge pull request #14613 from zfox23/MS20253_eventBridge
MS20253: Only emit screenChanged once screen has changed
|
2018-12-20 08:58:53 -08:00 |
|
Sam Gateau
|
8fba8062c3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-12-19 20:01:48 -08:00 |
|
Zach Fox
|
22c2954423
|
Merge pull request #14568 from zfox23/MS20187_itemTrash
Implement MS20187: Add trash can feature to Inventory
|
2018-12-19 18:19:29 -08:00 |
|
Zach Fox
|
b0ce3a54d5
|
Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash
|
2018-12-19 15:16:55 -08:00 |
|
Zach Fox
|
d0998174ff
|
Un-wear things when trashing them if worn
|
2018-12-19 15:16:48 -08:00 |
|
Zach Fox
|
46e00cf1b3
|
Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash
|
2018-12-19 15:03:36 -08:00 |
|
Wayne Chen
|
50d57e8b60
|
sending user to previous location on second launch
|
2018-12-19 12:37:08 -08:00 |
|
Ryan Huffman
|
202326dbac
|
Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager
|
2018-12-19 12:03:30 -08:00 |
|
Sam Gondelman
|
e890fc6980
|
Merge branch 'master' into NOverlays3
|
2018-12-19 11:37:10 -08:00 |
|
Ryan Huffman
|
c2aca64b11
|
Add start of opening uploaded avatar in inventory
|
2018-12-19 11:30:21 -08:00 |
|
Thijs Wenker
|
cb74313de8
|
create projects / style changes
|
2018-12-19 19:23:24 +01:00 |
|
Zach Fox
|
7fee0fc1e4
|
Fix MS20253: Only emit screenChanged once screen has changed
|
2018-12-19 09:50:52 -08:00 |
|
Zach Fox
|
116edcc224
|
I have no idea how this happened
|
2018-12-19 09:36:05 -08:00 |
|
sam gateau
|
9c436bc28c
|
Merge branch 'master' of github.com:highfidelity/hifi into punk
|
2018-12-19 09:31:41 -08:00 |
|