Brad Davis
|
bd5af2b493
|
Working on android avatar rendering
|
2018-01-09 11:40:32 -08:00 |
|
Gabriel Calero
|
7fbd23f36b
|
Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr
|
2018-01-08 17:38:28 -03:00 |
|
Gabriel Calero
|
6050737e7c
|
Resolving comments in PR
|
2018-01-08 17:36:08 -03:00 |
|
Bradley Austin Davis
|
68cd768a65
|
Merge branch 'android' into android_render_pr
|
2018-01-08 12:49:52 -05:00 |
|
Lexx
|
85b54f82d8
|
revert sorting change mistake
|
2018-01-05 01:58:23 +00:00 |
|
Gabriel Calero
|
76b38bebad
|
Make Interface run in Android
|
2018-01-03 16:36:11 -03:00 |
|
Triplelexx
|
78a0175413
|
fix assetbrowser sorting case sensitivity
|
2017-12-29 23:16:12 +00:00 |
|
Clément Brisset
|
3b48833cc0
|
Merge pull request #11451 from huffman/feat/upload-user-event
Add uploading to asset server event
|
2017-10-10 11:03:33 -07:00 |
|
Ryan Huffman
|
9c120f1194
|
Update AssetMappingsScriptingInterface to not open file for activity event
|
2017-10-10 09:44:13 -07:00 |
|
Ryan Huffman
|
ff019d6195
|
Fix extension detection when tracking asset uploads
|
2017-09-28 13:56:49 -07:00 |
|
Ryan Huffman
|
97bf093cab
|
Fix ambiguous conversion in AssetMappingScriptingInterface
|
2017-09-28 08:16:54 -07:00 |
|
Atlante45
|
eb06c33187
|
Naming coding standard fix
|
2017-09-27 15:32:53 -07:00 |
|
Ryan Huffman
|
88810d28c1
|
Add activity logging for uploading_asset
|
2017-09-27 09:33:11 -07:00 |
|
Ryan Huffman
|
014a7bc9b0
|
Fix bytes downloaded stat tracking
|
2017-09-27 09:33:10 -07:00 |
|
Atlante45
|
acb0bf8d20
|
Asset Browser tweaks
|
2017-09-26 17:26:46 -07:00 |
|
Atlante45
|
8583be41ce
|
Don't refresh if not connected to the Asset Server
|
2017-09-21 18:57:09 -07:00 |
|
Atlante45
|
1a571d0991
|
Add Asset Server auto refresh
|
2017-09-21 14:41:59 -07:00 |
|
Atlante45
|
7d9daea0f6
|
Transmit baking errors to interface for display.
|
2017-09-13 09:54:54 -07:00 |
|
Stephen Birarda
|
55d44a8c8f
|
Merge pull request #11285 from Atlante45/feat/baking-enabled
Wire "Use baked" checkbox
|
2017-09-01 16:25:49 -07:00 |
|
Atlante45
|
a9cfc01df3
|
Set Baking Enabled API
|
2017-08-31 13:11:27 -07:00 |
|
Atlante45
|
764e5d2e4c
|
Move constant to central location
|
2017-08-31 13:08:18 -07:00 |
|
Atlante45
|
da2bede6fe
|
Hide .baked items from the Asset Browser
|
2017-08-31 13:08:18 -07:00 |
|
Atlante45
|
9e6502fe92
|
More UI work
|
2017-08-25 10:54:34 -07:00 |
|
Atlante45
|
28c9aa031c
|
Setup script model status
|
2017-08-25 10:54:34 -07:00 |
|
humbletim
|
3e0ef7d43a
|
make Assets.getMapping(path) actually return the mapping
|
2016-07-28 10:13:30 -04:00 |
|
Seth Alves
|
40e862cf9e
|
quiet gcc 5 warnings
|
2016-05-21 16:53:01 -07:00 |
|
Seth Alves
|
49566c8f26
|
fix memory leak in AssetMappingModel
|
2016-04-25 10:07:08 -07:00 |
|
Stephen Birarda
|
194226103c
|
refresh the Asset Browser when switching domains
|
2016-04-01 11:13:59 -07:00 |
|
Stephen Birarda
|
29cd487f84
|
fixes for styling and logging from CR
|
2016-03-15 14:38:08 -07:00 |
|
Atlante45
|
03efde5b3c
|
Change text in case of drag and drop.
|
2016-03-15 13:53:13 -07:00 |
|
Ryan Huffman
|
1b81b4f01b
|
Merge branch 'atp' of github.com:birarda/hifi into atp-upload
|
2016-03-15 10:19:20 -07:00 |
|
Ryan Huffman
|
7947bd7724
|
Fix message typo enter => entering
|
2016-03-15 10:11:53 -07:00 |
|
Atlante45
|
98851679c5
|
Remove unused AssetMappingItem
|
2016-03-15 09:14:22 -07:00 |
|
Ryan Huffman
|
4b6dd4636f
|
Merge branch 'atp' of github.com:birarda/hifi into atp-upload
|
2016-03-13 21:32:25 -07:00 |
|
Ryan Huffman
|
6c27bd9eb2
|
Update upload flow and make asset list dynamically sized
|
2016-03-13 21:04:07 -07:00 |
|
Stephen Birarda
|
e51aedeb35
|
fix error handling for diff request types
|
2016-03-11 11:36:52 -08:00 |
|
Stephen Birarda
|
625032f748
|
fix for add to world after upload name change
|
2016-03-10 17:10:49 -08:00 |
|
Stephen Birarda
|
979fda7c8b
|
add trimming for upload mapping
|
2016-03-10 16:57:39 -08:00 |
|
Stephen Birarda
|
96a112290f
|
use mapping for overwrite prompt
|
2016-03-10 16:56:22 -08:00 |
|
Atlante45
|
35f5ebb938
|
Don't allow folder overwrite
|
2016-03-10 16:44:39 -08:00 |
|
Ryan Huffman
|
ad0fb18d81
|
Add / to beginning of mapping on upload if missing
|
2016-03-10 16:02:41 -08:00 |
|
Ryan Huffman
|
2d4864ed33
|
Merge branch 'atp' of github.com:birarda/hifi into atp-more
|
2016-03-10 15:40:07 -08:00 |
|
Atlante45
|
a6ccfb1685
|
CR
|
2016-03-10 15:11:39 -08:00 |
|
Atlante45
|
63571a7c36
|
Make sure Upload is not clicked several times
|
2016-03-10 14:59:20 -08:00 |
|
Atlante45
|
548d826a4e
|
Couple bug fixes
|
2016-03-10 14:59:20 -08:00 |
|
Atlante45
|
7d7a683b18
|
Add uploadFile method that prompts the user
|
2016-03-10 14:59:20 -08:00 |
|