Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 07:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
41396 commits 69 branches 56 tags 1.2 GiB
Commit graph

1136 commits

Author SHA1 Message Date
Brad Davis
ae82298e1b Working on the App JS <-> HTML JS communication 2016-03-28 10:09:22 -07:00
Brad Davis
a47614c9b6 Revert "Build a better event bridge" 
This reverts commit a43fde0803.
 2016-03-25 09:48:25 -07:00
Brad Hefta-Gaub
d26fe77803 Merge pull request #7454 from jherico/qml_crashes 
Fix async issues related to JS <-> App <-> QML <-> HTML communication
 2016-03-24 17:32:38 -07:00
Brad Davis
a43fde0803 Build a better event bridge 2016-03-24 11:01:06 -07:00
David Rowe
51728d14a7 Miscellaneous improvements to Attachments dialog 2016-03-24 21:17:36 +13:00
Brad Hefta-Gaub
3505c14552 Merge pull request #7444 from birarda/uncover-qml 
Attachments Dialog QML updates (from contractor)
 2016-03-23 20:45:50 -07:00
Stephen Birarda
34fb06a7bd changes to attachments dialog from contractor 2016-03-23 13:52:47 -07:00
Brad Davis
a30df07d53 PR feeback, precendence 2016-03-22 09:15:29 -07:00
Brad Davis
28f25489f8 Fix occasional crash on creating overlay tool windows 2016-03-21 19:17:31 -07:00
Brad Hefta-Gaub
481a75faca Merge pull request #7366 from markej/ShowDownloadURLs 
Show which URLs are being actively downloaded
 2016-03-18 10:42:01 -07:00
timemarkov
160b4e7ba2 Implement new design of attachment dialog 2016-03-18 12:11:00 +01:00
Ryan Downe Karpf
8914406987 Merge pull request #7367 from ctrlaltdavid/20852 
Restyle directory, edit, and marketplace toolbars
 2016-03-17 14:32:48 -07:00
David Rowe
df870d6e82 Merge branch 'master' into 20852 2016-03-17 10:35:26 +13:00
David Rowe
bef8c5a807 Fix some QML warnings 2016-03-17 09:51:32 +13:00
David Rowe
48d4316714 Fix typo 2016-03-17 09:34:21 +13:00
David Rowe
5faa7b3e87 Merge branch 'master' into 20851 
Conflicts:
	interface/resources/qml/dialogs/MessageDialog.qml
 2016-03-17 09:29:56 +13:00
Andrew Meadows
6028c3e841 Merge pull request #7318 from birarda/atp 
Asset Transfer Protocol Mappings
 2016-03-15 16:52:36 -07:00
David Rowe
5d08f6f5a2 Update the HiFi-Glyphs font file 2016-03-16 10:29:22 +13:00
Atlante45
03efde5b3c Change text in case of drag and drop. 2016-03-15 13:53:13 -07:00
Mark Johnson
6094613d06 When truncating the URL, show the first 5 characters (for the protocol) 2016-03-15 13:43:42 -07:00
Atlante45
4a90ec303c Fix drag&drop 2016-03-15 11:22:42 -07:00
Clément Brisset
17e5b441cf Merge pull request #111 from huffman/atp-manager-name 
Add atp filename to entities added to world
 2016-03-15 10:19:53 -07:00
Ryan Huffman
1b81b4f01b Merge branch 'atp' of github.com:birarda/hifi into atp-upload 2016-03-15 10:19:20 -07:00
Atlante45
07d2213628 Remove debug 2016-03-15 09:14:22 -07:00
Atlante45
9b8b1d41e3 Edit in place 2016-03-15 09:14:22 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
Mark Johnson
bc2aea8774 Show the (generally truncated) urls being downloaded 2016-03-14 18:18:33 -07:00
Ryan Huffman
7823882aa1 Add atp filename to entities added to world 2016-03-14 16:13:33 -07:00
David Rowe
ab963b4a4b Fix up script editor's "reload script?" message box 2016-03-15 09:04:23 +13:00
Mark Johnson
2834ff2935 Change Q: -> Pending: 2016-03-14 11:45:05 -07:00
David Rowe
f75aa97728 Grow width of QML message box to accommodate wide title if necessary 2016-03-15 07:22:21 +13: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
960047f412 Remove right click selection 2016-03-13 21:06:52 -07:00
Ryan Huffman
6c27bd9eb2 Update upload flow and make asset list dynamically sized 2016-03-13 21:04:07 -07:00
Mark Johnson
47d3f418e3 Merge remote-tracking branch 'highfidelity/master' 2016-03-12 17:30:22 -08:00
Mark Johnson
00829db375 Fill in the downloads line of the stats window 
Will show the active download, current download limit and how many
pending requests
 2016-03-12 17:27:43 -08:00
David Rowe
8b9319b29e Merge branch 'master' into 20829 2016-03-12 13:09:59 +13:00
David Rowe
3deb30d699 Remove no longer need font type 2016-03-12 13:06:29 +13:00
David Rowe
3bf1afb80b HMD submenus not allcaps 2016-03-12 12:56:38 +13:00
David Rowe
9da64e540d Add shortcut keys to HMD menu 2016-03-12 12:53:16 +13:00
Stephen Birarda
890266e0bd shrink message dialog to contentWidth 2016-03-11 15:45:57 -08:00
Stephen Birarda
188712a55b select a right-clicked item in asset browser 2016-03-11 15:45:57 -08:00
Stephen Birarda
31f0e4a919 disable the rename and delete buttons if nothing selected 2016-03-11 15:45:57 -08:00
Stephen Birarda
6d6a53a69a use timer for upload click handle to avoid focus issue 2016-03-11 15:45:57 -08:00
David Rowe
ecf67282d5 Add separators to HMD menus 2016-03-12 12:29:52 +13:00
Stephen Birarda
e51aedeb35 fix error handling for diff request types 2016-03-11 11:36:52 -08:00
David Rowe
e175c19754 Style checkbox for menu items 2016-03-11 15:51:27 +13:00
Stephen Birarda
7ccba8b406 remove debug for selected index crash 2016-03-10 18:36:12 -08:00
Stephen Birarda
7675c83f92 clear selection on reload 2016-03-10 18:34:28 -08:00
Stephen Birarda
8e2b06a8e5 use an explicit selection model for treeview 2016-03-10 18:32:18 -08:00