Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 02:16:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45506 commits 25 branches 0 tags 1.1 GiB
Commit graph

1445 commits

Author SHA1 Message Date
Brad Hefta-Gaub
d5a46d3390 handle repositioning of qml windows 2016-04-15 20:01:14 -07:00
Brad Hefta-Gaub
04df84974c handle repositioning of qml windows 2016-04-15 19:50:12 -07:00
Howard Stearns
e4f8a67e60 Merge pull request #7649 from hyperlogic/tony/simplify-away-mode 
away.js: fix for permanent disabling avatar IK
 2016-04-15 13:35:14 -07:00
David Rowe
19fd8cda14 Merge branch 'master' into 20872 2016-04-15 17:36:42 +12:00
David Rowe
bda2f455e5 Add buttons to entities list that toggle locked and visible 2016-04-15 16:26:34 +12:00
David Rowe
9e2c844dc0 Updated the HiFi glyphs font file 
Used the new "model" icon in entity properties tab.
 2016-04-13 16:48:13 +12:00
David Rowe
43f843f731 Retrofit updated margins and spacing to QML dialogs 2016-04-13 16:39:52 +12:00
David Rowe
b33d28852b Merge branch 'master' into 20872 2016-04-13 13:11:26 +12:00
Brad Davis
1a02220886 Fixing wobble 2016-04-12 17:50:59 -07:00
Anthony J. Thibault
87cba810a7 remove away states from avatar-animation.json 
away.js: prefetch the kneel animation, so it is available when we need it.
 2016-04-12 15:37:31 -07:00
Brad Hefta-Gaub
3f05ded932 Merge pull request #7611 from zzmp/guard/amd 
Disable gradient QML items on AMD
 2016-04-12 08:32:57 -07:00
David Rowe
f7f5443a44 Merge branch 'master' into 20872 
Conflicts:
	examples/html/entityProperties.html
 2016-04-12 15:40:35 +12:00
David Rowe
d6fcbd2dac Revisit margins and spacing 2016-04-12 15:07:30 +12:00
Zach Pomerantz
1df2fc7809 Disable qml gradient for AMD for ContentSection 2016-04-11 13:59:08 -07:00
Zach Pomerantz
d719b3692e Consolidate qml alpha gradient workaround to desktop 2016-04-11 11:36:42 -07:00
Brad Davis
df8ad57185 Fix FPS counter 2016-04-11 00:25:16 -07:00
Brad Davis
2353daa254 Merge pull request #7614 from ctrlaltdavid/20876 
Disable arrow keys being able to move between HTML form fields
 2016-04-08 13:28:30 -07:00
David Rowe
77e16f62c9 Merge branch 'master' into 20872 
Conflicts:
	examples/html/edit-style.css
 2016-04-08 15:08:34 +12:00
Zach Pomerantz
e54cfce392 Disable qml alpha gradients for AMD 2016-04-07 18:27:36 -07:00
Brad Hefta-Gaub
d79d66c34e Merge pull request #7601 from ctrlaltdavid/20871 
Entities editor fixes
 2016-04-07 17:14:00 -07:00
Brad Hefta-Gaub
5287c174b4 Merge pull request #7605 from jherico/route_log_errors 
Fixing logging errors on initial load of controller routes
 2016-04-07 17:13:13 -07:00
David Rowe
e37e46d34a Disable arrow keys being able to move between HTML form fields 
Moving between form fields with arrow keys makes it to easy to make
unintended changes to adjacent fields.
 2016-04-08 10:30:00 +12:00
Brad Davis
2f28c64edb Fixing menu navigation in oculus remote 2016-04-07 13:21:00 -07:00
Brad Davis
a58a627fdf Support oculus remote input 2016-04-07 13:20:59 -07:00
Brad Davis
85019b2b5e Fixing logging errors on initial load of controller routes 2016-04-07 10:41:54 -07:00
David Rowe
3f62702ff0 Add search icon to entity list filter 2016-04-07 13:38:00 +12:00
David Rowe
4e3cdf6569 Update Running Scripts' search to have rounded ends and a search icon 2016-04-07 12:32:27 +12:00
David Rowe
c9c414d5a8 Fix entities editor display of large negative coordinates and angles 2016-04-06 07:45:04 +12:00
Triplelexx
a4775983a2 Merge branch 'master' into 20769 
# Conflicts:
# interface/src/Application.cpp

conflicting line 2528 wheelEvent is now const
 2016-04-04 19:19:55 +01:00
Triplelexx
11af0a421b Merge branch 'master' into 20769 2016-04-03 22:57:55 +01:00
Brad Hefta-Gaub
e5f3ec4600 Merge pull request #7545 from birarda/marketplace-to-examples 
renaming of marketplace icon/window to examples
 2016-04-03 14:25:00 -07:00
Seth Alves
5fa9f662fc Merge pull request #7542 from birarda/refresh-on-asset-connect 
refresh/close the asset browser dialog on domain switch
 2016-04-01 18:08:59 -07:00
Seth Alves
4788bb453b Merge pull request #7540 from murillodigital/master 
Updating defaultAvatar_full.fbx to fixed version
 2016-04-01 15:53:19 -07:00
Stephen Birarda
6e83ed5ccc use a more generic custom user agent 2016-04-01 15:49:24 -07:00
Stephen Birarda
6df7ddeb16 pass the HighFidelityInterface user agent with WebView 2016-04-01 15:13:28 -07:00
Stephen Birarda
194226103c refresh the Asset Browser when switching domains 2016-04-01 11:13:59 -07:00
Leonardo Murillo
946a292cfb Updating defaultAvatar_full.fbx to fixed version 2016-04-01 11:49:45 -06:00
David Rowe
13ab854a9d Reduce space between collapsed sections 
In settings dialogs as well as entities editor.
 2016-03-31 15:02:16 +13:00
David Rowe
382b05e00b Make expand/collapse icon larger 2016-03-31 13:13:13 +13:00
David Rowe
db72e3efbb Increase maximum window height 2016-03-30 19:22:34 +13:00
David Rowe
28d0fc677c Update UIT QML control 2016-03-30 12:19:26 +13:00
David Rowe
1cb08952ae Merge branch 'master' into 20855 
Conflicts:
	interface/resources/qml/ToolWindow.qml
 2016-03-30 12:01:45 +13:00
Brad Davis
ae82298e1b Working on the App JS <-> HTML JS communication 2016-03-28 10:09:22 -07:00
David Rowe
ef4d67008b Style x, y, z fields 2016-03-28 11:45:50 +13:00
David Rowe
b9ec5f39d9 Style color RGB fields 2016-03-27 22:12:10 +13:00
Brad Davis
a47614c9b6 Revert "Build a better event bridge" 
This reverts commit a43fde0803.
 2016-03-25 09:48:25 -07:00
David Rowe
42af3ebc4a Style the entity editor's "grid" tab 2016-03-25 14:15:03 +13: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
David Rowe
46df386f0b Fix edit tab display after script reload 2016-03-25 10:18:58 +13:00
David Rowe
9280443425 Merge branch 'master' into 20855 2016-03-25 09:06:20 +13: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
David Rowe
5541dd6732 Change edit window's title and default size 2016-03-24 15:38:26 +13:00
David Rowe
96ce912d3d Fix up tab display post-merge 2016-03-24 11:07:48 +13:00
David Rowe
8d778141ef Merge branch 'master' into 20855 
Conflicts:
	interface/resources/qml/ToolWindow.qml
 2016-03-24 10:39:09 +13:00
David Rowe
454ba50dc1 Tidying 2016-03-24 10:03:47 +13: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
David Rowe
7e7e421efa Tidy some QML 2016-03-22 19:33:57 +13:00
David Rowe
42b606c09d Merge branch 'master' into 20855 2016-03-22 18:51:07 +13:00
Brad Davis
28f25489f8 Fix occasional crash on creating overlay tool windows 2016-03-21 19:17:31 -07:00
David Rowe
3d2cb6554e Fix QML binding loop 2016-03-19 15:50:16 +13:00
David Rowe
3fa678a652 Style tabs and background 2016-03-19 14:52:40 +13: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
David Rowe
7eb9420c92 Update tool window to use restyled frame 2016-03-18 16:33:55 +13:00
David Rowe
7ed30048a4 Set up files for restyling tool window frame 2016-03-18 16:27:13 +13: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
David Rowe
fb0f97264c Style HMD menu items 2016-03-11 15:24:35 +13:00
Stephen Birarda
39e869fdfd append a trailing slash for folder rename 2016-03-10 17:54:38 -08:00
Stephen Birarda
625032f748 fix for add to world after upload name change 2016-03-10 17:10:49 -08:00
Stephen Birarda
52ee2499fc add trim prior to rename in AssetServer 2016-03-10 16:57:39 -08:00
Stephen Birarda
ed4df72eed cleanup logging for asset browser 2016-03-10 16:57:39 -08:00
Atlante45
4a9d88d213 CR 2016-03-10 16:55:51 -08:00
Atlante45
16287b7040 Disable add to world for uncompatible files 2016-03-10 16:44:39 -08:00
Atlante45
35f5ebb938 Don't allow folder overwrite 2016-03-10 16:44:39 -08:00
Stephen Birarda
2fb478ff3c Merge pull request #99 from huffman/atp-more 
Atp more
 2016-03-10 16:22:05 -08:00
Ryan Huffman
2d4864ed33 Merge branch 'atp' of github.com:birarda/hifi into atp-more 2016-03-10 15:40:07 -08:00
Ryan Huffman
76ed16314a Add prepended slash on rename if missing 2016-03-10 15:38:20 -08:00
Stephen Birarda
e29565a717 don't default to yes when prompted for overwrite 2016-03-10 15:32:12 -08:00
Stephen Birarda
672bafc09d Merge pull request #95 from Atlante45/feat/atp 
Wire upload
 2016-03-10 15:30:53 -08:00
Atlante45
a6ccfb1685 CR 2016-03-10 15:11:39 -08:00
Stephen Birarda
cf12a8d396 always center the text in the message dialog 2016-03-10 15:02:19 -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
Atlante45
dc79d3262a Update glyphs font 2016-03-10 14:59:20 -08:00
Stephen Birarda
7f0917ea00 add to world in front of MyAvatar 2016-03-10 14:49:07 -08:00
Stephen Birarda
e227f68353 tweak wording for overwrite dialog 2016-03-10 14:49:07 -08:00
Stephen Birarda
5167cf69b2 fix for add to world and delete dialog 2016-03-10 14:49:07 -08:00
Stephen Birarda
c65b5b63f0 better error handling for asset browser 2016-03-10 14:48:44 -08:00
Stephen Birarda
8cc0ae3148 menu and naming changes for asset server directory 2016-03-10 14:48:44 -08:00
Ryan Huffman
c93ba2752b Remove rowDelegate styling for asset window 2016-03-10 14:44:53 -08:00
David Rowe
2b45971f8c Style HMD menu backgrounds 2016-03-11 11:42:49 +13:00
Ryan Huffman
e4b5c14a4c Merge branch 'atp' of github.com:birarda/hifi into atp-more 2016-03-10 14:20:22 -08:00
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
Stephen Birarda
5ad4645b47 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-10 13:28:59 -08:00
David Rowe
bbe507ec05 Add file headers and update Qt versions in VR menu QML files 2016-03-11 09:53:10 +13:00
Stephen Birarda
99718e9c4e short circuit the mapping operations for invalid path/hash 2016-03-10 10:52:05 -08:00
Stephen Birarda
b0c326fa2c Merge pull request #92 from huffman/atp-more 
Atp more
 2016-03-10 10:51:12 -08:00
Ryan Huffman
0df05d273d Implement addToWorld in asset window 2016-03-10 10:25:51 -08:00
Stephen Birarda
899595183e add reload of mappings on component complete 2016-03-10 09:02:45 -08:00
Stephen Birarda
f1919031de error message boxes for mapping errors 2016-03-10 08:57:37 -08:00
Ryan Huffman
3e5e2eef17 Add mapping sorting, copying, and isKnownMapping 2016-03-10 08:18:32 -08:00
David Rowe
4c3f374f02 Update HiFi glyphs font file 
Has some new, soon to be used characters, but no other changes.
 2016-03-10 15:10:44 +13: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
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 Hefta-Gaub
1c07276501 fix a couple bugs 2016-03-09 09:45:55 -08:00
Seth Alves
efdef52081 Merge pull request #7269 from ctrlaltdavid/20822 
Restyle bookmark dialogs
 2016-03-09 07:31:15 -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
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
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
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
Atlante45
82d6d3ff01 Small fix to buttons color 2016-03-08 13:13:45 -08:00
Atlante45
784f669998 First draft Assets Manager 2016-03-08 13:13:45 -08:00
Brad Hefta-Gaub
ed67ef8f14 Merge pull request #7247 from jherico/qml_script_messaging 
Allow message passing from a script to a QML window
 2016-03-08 10:21:09 -08:00
David Rowe
2aaf9ff0d0 Update message dialogs to use HiFi-Glyphs icons 2016-03-08 17:13:05 +13:00
David Rowe
e5188108a1 Fix width of delete bookmark drop-down 2016-03-08 15:21:15 +13:00
David Rowe
2f91b29c06 Set default focus 2016-03-08 14:03:54 +13:00
David Rowe
b71a512a6f Reorder OK and Cancel buttons 2016-03-08 13:58:20 +13:00
David Rowe
7f2938c53f Tidy message dialog code 2016-03-08 13:56:25 +13:00
David Rowe
b7fd5467ba Restyle query dialogs 2016-03-08 13:53:05 +13:00
David Rowe
d893b2e3b1 Handle no icon in modal dialogs 2016-03-08 13:52:24 +13:00
David Rowe
e6b81b31d8 Fix Running Script's tree view 2016-03-08 09:59:00 +13:00
David Rowe
b4c489d4c6 Fix not reliably being able to select "None" in Graphics settings 2016-03-05 10:17:39 +13:00
Brad Davis
4e1f78b585 Allow message passing from a script to a QML window 2016-03-04 13:11:08 -08:00
David Rowe
1eb6fa425c Fix up Running Scripts dialog 2016-03-03 20:09:50 +13:00
David Rowe
f88eef7549 Update section headers 2016-03-03 19:17:48 +13:00
David Rowe
fb675dbaf5 Add vertical spacing above other settings fields 2016-03-03 18:49:13 +13:00
David Rowe
2d250e2f64 Only the first checkbox in a group has vertical space before it 2016-03-03 17:51:14 +13:00
David Rowe
a41f409e33 Defer dialog vertical spacing decisions to content items 2016-03-03 17:49:18 +13:00
David Rowe
4729020df1 Change section expand/collapse icons 2016-03-03 14:32:08 +13:00
David Rowe
46bb3c05a5 Right justify leading control labels 2016-03-03 14:17:02 +13:00
David Rowe
81f13afb4e Tweak look of combo box control 2016-03-03 10:24:42 +13:00
David Rowe
c3b47088c9 Fix slider vertical alignment 2016-03-03 01:59:21 +13:00
David Rowe
a51dd43dff Wrap labels 2016-03-03 01:56:02 +13:00
David Rowe
c1f5bac86a Style the ComboBox 2016-03-03 01:14:00 +13:00
David Rowe
98ad785267 Get ComboBox working 2016-03-03 00:04:15 +13:00
David Rowe
829c858b04 Start on ComboBox again using Austin's HMD-compatible code 2016-03-02 22:18:12 +13:00
David Rowe
4d53dee29c Rename section control 2016-03-02 19:46:26 +13:00
David Rowe
e79427bb3b Make some settings dialogs have collapsible sections 2016-03-02 19:41:50 +13:00
David Rowe
20bf07550a Update to new HiFi-Glyphs font file 2016-03-02 13:10:52 +13:00
David Rowe
d1f4369a5f Fix width of divider above buttons at bottom of settings dialogs 2016-03-02 12:00:29 +13:00
David Rowe
16fbf60bae Update preferences dialog titles to match menu items 2016-03-02 11:52:58 +13:00
David Rowe
881302df02 Merge branch 'master' into 20812 2016-03-02 09:55:17 +13:00
David Rowe
5a3f74d51b Style drop-down combo box for Developer > Graphics... 2016-03-02 09:53:10 +13:00
David Rowe
a309a2e08f Style slider controls 2016-03-02 09:24:57 +13:00
David Rowe
a32452db8b Change Running Scripts reload, close, and tree buttons when pressed 
Provides visual feedback to user.
 2016-03-01 10:43:46 +13:00
David Rowe
50ebbe362d Style avatar browser field 2016-02-27 14:06:33 +13:00
David Rowe
1a331fcdac Style basic text field 2016-02-27 13:52:21 +13:00
David Rowe
2b03e16bec Increase the title's focus shadow offset 2016-02-27 12:48:09 +13:00
David Rowe
b62bd682ed Tidying 2016-02-27 11:03:57 +13:00
David Rowe
e8f349ec31 Fix up capitalization of labels and use of colons 2016-02-27 11:02:39 +13:00
David Rowe
bf0bcbe2ec Style spinbox control 2016-02-27 10:48:53 +13:00
David Rowe
3cac94ed35 Refactor label style 2016-02-26 17:32:25 +13:00
David Rowe
3dc9d01aab Style checkbox control 2016-02-26 15:56:19 +13:00
David Rowe
b620427ae8 Fix text field label color 2016-02-26 15:54:50 +13:00
David Rowe
513bc5d4ef Style scripts section 2016-02-26 14:10:37 +13:00
David Rowe
a25702535b Style snapshots section 2016-02-26 14:01:57 +13:00
David Rowe
d255ad3805 Improve property naming 2016-02-26 10:17:36 +13:00
David Rowe
5d931523ad Style settings section headings 2016-02-26 10:03:00 +13:00
David Rowe
09029e4edd Change name of dialog to match menu item 2016-02-25 20:37:54 +13:00
David Rowe
f04654fb56 Style and swap order of save and cancel buttons 2016-02-25 20:35:27 +13:00
David Rowe
10efbd996f Update General Settings dialog to use new window frame style 2016-02-25 20:26:36 +13:00
David Rowe
023c04d2fe Add optional footer to "form editor" dialogs 2016-02-25 20:25:20 +13:00
Brad Hefta-Gaub
f9b55c4b87 Merge pull request #7185 from ctrlaltdavid/20809 
Fixes for new modal message dialog
 2016-02-24 16:20:40 -08:00
David Rowe
b9a1c2051b Fix modal dialog not being opaque to mouse clicks 2016-02-25 10:52:16 +13:00
Brad Hefta-Gaub
568fd3e77f Merge pull request #7164 from ctrlaltdavid/20809 
Restyle message box modal dialogs
 2016-02-24 13:47:00 -08:00
Brad Hefta-Gaub
1699e4a396 Merge pull request #7131 from ctrlaltdavid/20805 
Restyle the Running Scripts dialog
 2016-02-24 13:45:40 -08:00
David Rowe
51b41da488 Horizontally center short messages in the dialog 2016-02-25 09:15:07 +13:00
Chris Collins
64a07440cc Merge pull request #7180 from jherico/qml 
Several QML fixes
 2016-02-24 08:20:03 -08:00
Chris Collins
7f679af186 Merge pull request #7176 from zzmp/menu/graphics 
Update graphics menus
 2016-02-24 08:18:58 -08:00
Brad Davis
fa23e2023e Fix bad tool window placement 2016-02-23 21:05:57 -08:00
Clément Brisset
8e8e23452f Merge pull request #7156 from ZappoMan/depthReticleWork 
Depth reticle work
 2016-02-23 17:54:35 -08:00
David Rowe
a816d835d3 Finesse modal message box dialog layout 2016-02-24 13:59:43 +13:00
Zach Pomerantz
ea8edb3744 Remove antialiasing from menus, default to on 2016-02-23 16:24:44 -08:00
Chris Collins
94d018be3e Merge pull request #7172 from zzmp/fix/stats 
Consolidate stats for opaque/transparent/other
 2016-02-23 16:23:11 -08:00
David Rowe
7ee1edac3a Merge branch '20805' into 20809 2016-02-24 13:08:28 +13:00
David Rowe
beef3f59eb Fix QML warning 2016-02-24 12:59:21 +13:00
David Rowe
76ec5e4600 Merge branch 'master' into 20805 2016-02-24 12:38:44 +13:00
David Rowe
ad4d697f38 Use names for HiFi glyph characters 2016-02-24 12:37:23 +13:00
David Rowe
bac703b29e Adjust height of Running Scripts now that fonts are consistently sized 2016-02-24 12:36:46 +13:00
David Rowe
128583660b Specify font sizes in pixels instead of points 
Makes the dialog layout and look consistent across different devices.
 2016-02-24 12:10:19 +13:00
David Rowe
9dd1bfad2d Fix tree view branch indicator colors 
Using interim HiFi glyphs until branch triangles are added to the font.
 2016-02-24 10:54:36 +13:00
Zach Pomerantz
7804ee22d4 Consolidate stats for opaque/transparent/other 2016-02-23 12:14:00 -08:00
Brad Hefta-Gaub
71262c3e64 cleaner QML rejection of mouse messages 2016-02-23 11:14:16 -08:00
Brad Hefta-Gaub
8117d51324 Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-02-23 10:21:10 -08:00
Brad Hefta-Gaub
2db25690f1 detect when mouse is over QML overlays or 2D JS Overlays 2016-02-23 10:14:44 -08:00
David Rowe
fdb7a9cf75 Merge branch '20805' into 20809 2016-02-23 20:29:18 +13:00
David Rowe
e30135a89d Increase height of dialog to avoid scrollbars 2016-02-23 20:05:45 +13:00
David Rowe
67b6cafc92 Use placeholder text for Filter field instead of separate label 
Also fixes color of separate label if that is reinstated at some time.
 2016-02-23 20:05:16 +13:00
David Rowe
9583b801f6 Increase size of resize handle 2016-02-23 19:57:13 +13:00
David Rowe
6bf377aac8 Move FontAwesome.qml to be with other font files 2016-02-23 18:16:32 +13:00
David Rowe
0e3cbd2930 Tidying 2016-02-23 18:05:49 +13:00
David Rowe
b09a20187a Reverse order buttons appear in to make more consistent with Windows 2016-02-23 17:57:21 +13:00
David Rowe
aa32c1f1af Restyle modal message dialog content 2016-02-23 17:54:02 +13:00
David Rowe
86bb1b1ed8 Make copy of TextEdit control for restyling 2016-02-23 17:44:11 +13:00
Brad Davis
160a107bbd Auto-unhide the desktop when showing or raising a window 2016-02-22 19:36:00 -08:00
David Rowe
84e352a1de Move icon to be in title 2016-02-23 14:54:49 +13:00
David Rowe
33cfe8f21f Style modal dialog icon and message 2016-02-23 13:31:08 +13:00
David Rowe
f1921b4e38 Style modal dialog title 2016-02-23 13:14:38 +13:00
David Rowe
e86b36b00f Don't whitewash screen when modal dialog is displayed 
Focus shadow is used instead.
 2016-02-23 13:12:29 +13:00
David Rowe
f7654dce05 Style modal dialog background and border 2016-02-23 13:10:02 +13:00
David Rowe
d986a45497 Merge branch '20805' into 20809 2016-02-23 09:59:39 +13:00
David Rowe
942406e5d5 Improve focus shadow 2016-02-23 09:58:37 +13:00
David Rowe
42734a0202 Tidy desktop QML dialogs 2016-02-22 21:16:00 +13:00
David Rowe
72fb2ff102 Make copies of modal window files 2016-02-22 17:05:57 +13:00
David Rowe
db6c76bf67 Merge branch 'master' into 20805 2016-02-22 13:15:40 +13:00
Triplelexx
949eab62ec Merge remote-tracking branch 'refs/remotes/highfidelity/master' into 20769 
# Conflicts:
#	libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp

removed deviceID
 2016-02-21 22:04:14 +00:00
David Rowe
bfedd24ad7 Fixes after reviewing against latest UI Toolkit doc 2016-02-21 16:43:41 +13:00
David Rowe
558c8872b1 Rework scrollbar to make layout more robust 2016-02-21 14:02:51 +13:00
David Rowe
b2c74447fb Fix OSX scrollbars in scripts lists starting too low 2016-02-21 12:44:29 +13:00
Brad Hefta-Gaub
9066fb0622 Merge pull request #7145 from howard-stearns/lod-pid-removal 
Lod pid removal
 2016-02-20 10:29:42 -08:00
David Rowe
91e4fb478d Don't display dialog focus or content shadows on OSX 
Alpha gradients display as fuchsia on OSX.
 2016-02-20 13:12:51 +13:00
Brad Hefta-Gaub
342391cb2f Merge pull request #7143 from imgntn/webengine-new-windows 
Add support for pop-up windows to Qt WebEngineView
 2016-02-19 14:31:16 -08:00
Brad Hefta-Gaub
edb241807a Merge pull request #7137 from imgntn/webengine-fun 
Enable HTML5 userMedia APIs in QTWebengine view
 2016-02-19 14:27:27 -08:00
James B. Pollack
56f8282607 dont need this code here 2016-02-19 13:54:31 -08:00
James B. Pollack
7ec09c49f3 feature request is in another pull 2016-02-19 13:53:22 -08:00
James B. Pollack
afb6f1fe84 no clipboard 2016-02-19 13:50:30 -08:00
James B. Pollack
66e8f070e4 popup windows 2016-02-19 13:48:54 -08:00
Howard Stearns
30b4eace95 Remove LOD PID-related preferences and the related toggling of preferences. 2016-02-19 11:52:07 -08:00
Triplelexx
087e2e7f66 revise touchscreen camera control manipulation 
Touchscreen camera control is now via a touchscreen device. Input must
be enabled with the menu option. Currently supports dragging and
gesturing to control avatar camera. Gesturing is handled by integration
of the Qt implementation.
 2016-02-19 13:47:28 +00:00
Brad Davis
6f364de062 Add a QML document referencing the QML multimedia types to force inclusion in the build 2016-02-18 18:39:25 -08:00
James B. Pollack
d73728ae78 add to browser 2016-02-18 16:58:34 -08:00
James B. Pollack
4b29921e63 media! 2016-02-18 16:41:29 -08:00
David Rowe
54b27f3ac3 Merge branch 'master' into 20805 2016-02-18 23:35:37 +13:00
David Rowe
c07b1f9b1e Tidying 2016-02-18 23:06:26 +13:00
David Rowe
b68837277c Fix default focus 2016-02-18 22:12:43 +13:00
David Rowe
81169c59c8 Fix runtime warnings 2016-02-18 19:52:20 +13:00
David Rowe
4df77cff31 Add scrollbars to running scripts and available scripts tables 2016-02-18 18:10:58 +13:00