Commit graph

64 commits

Author SHA1 Message Date
Ryan Huffman
0d2ae4f3a4 Merge branch 'atp' of github.com:birarda/hifi into atp-model 2016-03-09 16:33:53 -08:00
Ryan Huffman
f23057b1c0 Add renaming to Asset qml 2016-03-09 16:29:17 -08:00
Ryan Huffman
f5497aa1e7 Add new AssetMappingsScriptingInterface and add mappings model 2016-03-09 14:53:04 -08:00
Atlante45
6bd7afc7b3 Confirm overrides 2016-03-09 14:19:28 -08:00
Ryan Huffman
4da4fd889a Add AssetMappingModel 2016-03-09 14:03:56 -08:00
Atlante45
5a0beec1f5 Replace old drag&drop with new UI 2016-03-09 11:47:31 -08:00
Atlante45
380480d4ee Add a couple more dialogs 2016-03-08 18:19:26 -08:00
Atlante45
169af80bc0 Add a couple dialogs 2016-03-08 17:11:54 -08:00
Atlante45
028c7ab6ba Add text box 2016-03-08 17:11:54 -08:00
Atlante45
254e04c4b7 UI change 2016-03-08 17:11:54 -08:00
Atlante45
0bed46d43a Fix typos and file browser directory 2016-03-08 13:24:36 -08:00
Atlante45
74fb1aab55 Add file dialog 2016-03-08 13:15:04 -08:00
Atlante45
e32fd4524c Start wiring UI 2016-03-08 13:13:45 -08:00
Atlante45
ded449072f Rename window 2016-03-08 13:13:45 -08:00
Renamed from interface/resources/qml/AssetsManager.qml (Browse further)