Ryan Huffman
|
ef8c66c1be
|
Remove commented out code
|
2016-03-10 14:18:09 -08:00 |
|
Ryan Huffman
|
71bc937533
|
Remove copy URL button
|
2016-03-10 13:56:54 -08:00 |
|
Ryan Huffman
|
273acc6a7e
|
Add context menu to asset manager
|
2016-03-10 13:55:36 -08:00 |
|
Ryan Huffman
|
0df05d273d
|
Implement addToWorld in asset window
|
2016-03-10 10:25:51 -08:00 |
|
Ryan Huffman
|
3e5e2eef17
|
Add mapping sorting, copying, and isKnownMapping
|
2016-03-10 08:18:32 -08:00 |
|
Ryan Huffman
|
dd52dd69d9
|
Fix rename mapping
|
2016-03-09 16:50:37 -08:00 |
|
Ryan Huffman
|
232bfc9061
|
Cleanup AssetServer qml
|
2016-03-09 16:44:31 -08:00 |
|
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 |
|
Stephen Birarda
|
57ea51d244
|
Merge pull request #84 from Atlante45/feat/atp
Replace old drag&drop with new UI
|
2016-03-09 14:26:49 -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 |
|
Ryan Huffman
|
fd5a5dd8f4
|
Add QJSEngine compatible AssetMappingScriptInterface
|
2016-03-09 14:03:25 -08:00 |
|
Stephen Birarda
|
2e9ee4f8a7
|
Merge branch 'atp' of github.com:birarda/hifi into atp
|
2016-03-09 12:16:59 -08:00 |
|
Stephen Birarda
|
9a2b2b4c16
|
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
|
2016-03-09 12:16:46 -08:00 |
|
Atlante45
|
5a0beec1f5
|
Replace old drag&drop with new UI
|
2016-03-09 11:47:31 -08:00 |
|
Brad Davis
|
80fdef4348
|
Ensure the heartbeat has a valid value before the thread starts
|
2016-03-09 10:53:01 -08:00 |
|
Brad Hefta-Gaub
|
5862181e70
|
Merge pull request #7288 from jherico/watchdog
Add a watchdog thread to trigger a crash on detecting a deadlock
|
2016-03-09 09:18:48 -08:00 |
|
Seth Alves
|
efdef52081
|
Merge pull request #7269 from ctrlaltdavid/20822
Restyle bookmark dialogs
|
2016-03-09 07:31:15 -08:00 |
|
Brad Davis
|
95f5d82d37
|
Add a watchdog thread to trigger a crash on detecting a deadlock
|
2016-03-09 00:32:46 -08:00 |
|
Chris Collins
|
d1401796d8
|
Merge pull request #7284 from ctrlaltdavid/fix-raleway-semibold
Fix case of RalewaySemiBold font name
|
2016-03-08 21:24:15 -08:00 |
|
Atlante45
|
380480d4ee
|
Add a couple more dialogs
|
2016-03-08 18:19:26 -08:00 |
|
Brad Hefta-Gaub
|
cb70c398cd
|
Merge pull request #7233 from jherico/vive_menu
Fix the Vive controllers to support menus
|
2016-03-08 18:03:32 -08:00 |
|
samcake
|
bfed0304c3
|
Merge pull request #7218 from zzmp/fix/resort-in-octree
Fix item key lookup on updated items in scene
|
2016-03-08 17:48:51 -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 |
|
Stephen Birarda
|
87d5958eb8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
|
2016-03-08 17:11:18 -08:00 |
|
David Rowe
|
973fa28d3f
|
Fix case of RalewaySemiBold font name
|
2016-03-09 13:32:37 +13:00 |
|
David Rowe
|
155a084eaa
|
Temporarily rename file a part of changing case of filename
|
2016-03-09 13:08:44 +13:00 |
|
David Rowe
|
269936f3ac
|
Fix typo
|
2016-03-09 12:20:09 +13:00 |
|
Brad Davis
|
f651adbd24
|
Correcting vive button naming
|
2016-03-08 15:12:54 -08:00 |
|
Brad Davis
|
1312901f06
|
Removing thumb mappings, using start/back for camera and menu
|
2016-03-08 15:09:45 -08:00 |
|
Brad Davis
|
ac1ab4b5b7
|
Map the primary thumbs to menu/camera as well as the secondary thumb
|
2016-03-08 15:09:44 -08:00 |
|
David Rowe
|
edc50f102d
|
Fix "duplicate bookmark" dialog
|
2016-03-09 11:55:09 +13:00 |
|
Brad Hefta-Gaub
|
35d6afbe77
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable
|
2016-03-08 14:53:41 -08:00 |
|
Brad Hefta-Gaub
|
6d211dd4e5
|
first cut at fixing the scene not stable bug
|
2016-03-08 14:52:21 -08:00 |
|
David Rowe
|
10e4e5e3a7
|
Use OffscreenUI icon enum instead of QMessageBox icon enum
|
2016-03-09 11:33:55 +13:00 |
|
David Rowe
|
03fb6b1444
|
Add ability to have icons in query dialogs
Add icon to bookmark dialogs' titles.
|
2016-03-09 10:45:14 +13: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 |
|
Atlante45
|
e0371929a2
|
Remove unused variables
|
2016-03-08 13:13:45 -08:00 |
|
Atlante45
|
51be88d4c3
|
Reset Window changes
|
2016-03-08 13:13:45 -08:00 |
|
Atlante45
|
320bd2b4d4
|
Reset ContentSection scheme
|
2016-03-08 13:13:45 -08:00 |
|
Atlante45
|
d0e29846f4
|
Add GlyphButton
|
2016-03-08 13:13:45 -08:00 |
|
Atlante45
|
6fecb4e1d1
|
Window fixup
|
2016-03-08 13:13:45 -08:00 |
|
Atlante45
|
30a6dd8629
|
Update StaticSection
|
2016-03-08 13:13:45 -08:00 |
|