Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-08 03:29:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
49797 commits 69 branches 58 tags 1.2 GiB
Commit graph

314 commits

Author SHA1 Message Date
howard-stearns
90ebbb79c1 centered toolbar 2016-11-02 15:37:53 -07:00
David Rowe
427c8008c6 Merge branch 'master' into 21089 2016-11-03 09:18:25 +13:00
Zach Fox
b98c6cb50f Change 'Snapshot' to 'snapshot' and use smaller font 2016-11-01 14:49:18 -07:00
Zach Fox
c4b59eafbb Add 'Snapshot' text. My very first commit! 2016-11-01 14:09:25 -07:00
David Rowe
667a777695 Use Clara.io API for FBX downloads 2016-11-01 23:43:15 +13:00
David Rowe
e0ef24a460 Set auto adding for Clara downloads 2016-10-30 15:35:20 +13:00
David Rowe
12747d26e0 Add parameter that enables automatically adding download model to world 2016-10-30 13:58:17 +13:00
Howard Stearns
0eee6f8abd Merge pull request #8844 from huffman/fix/hud-position 
Update default system toolbar position
 2016-10-20 16:07:20 -07:00
Ryan Huffman
3ad039cadc Update default system toolbar position 2016-10-18 13:57:03 -07:00
Stephen Birarda
5682d51667 use the HFWebEngineProfile in Desktop.qml 2016-10-18 11:42:55 -07:00
Stephen Birarda
c4cec8eb1e use desktop profile again, move classes to networking subdir 2016-10-18 10:22:31 -07:00
Stephen Birarda
3ce47631b7 move the intercepted web engine profile to BaseWebView 2016-10-17 14:25:59 -07:00
Stephen Birarda
b4b5c648c2 use a QWebEngineProfile request interceptor for auth in HTTP header 2016-10-17 11:34:37 -07:00
David Rowe
31b35f0a35 Only raise keyboard if in HMD display mode 2016-10-12 09:43:33 +13:00
David Rowe
f8572096b1 Merge branch 'master' into 21055 2016-09-28 20:00:04 +13:00
David Rowe
bc8c400448 Fix up keyboards in attachments dialogs 2016-09-26 16:39:34 +13:00
David Rowe
023efe05f0 Move keyboard QML files 2016-09-25 09:54:48 +13:00
David Rowe
52137cb3c1 Put keyboard at bottom of scrolling dialogs rather than under controls 2016-09-24 11:40:38 +12:00
howard-stearns
17549348b4 less busy hotspotting, and make use of restricted feed (by protocol) 2016-09-22 16:48:16 -07:00
Howard Stearns
8e9b743515 rollover images 2016-09-21 19:15:01 -07:00
howard-stearns
41b20dc69d single feed with snapshot and concurrency, no radio buttons, mini-card 
has two hotspots that bring up different kinds of cards, and anywhere
 else on the minicard takes you "there".
 2016-09-21 16:00:29 -07:00
Seth Alves
753e4c4c7b keyboard for avatar attachment model url dialog 2016-09-12 16:49:10 -07:00
Seth Alves
2c0676d9b1 make qml keyboard work better in running-scripts dialog 2016-09-12 16:28:24 -07:00
Seth Alves
38a1556716 qml keyboard for running-scripts window 2016-09-12 13:28:46 -07:00
Brad Hefta-Gaub
3d54600843 Merge pull request #8513 from Atlante45/feat/network-port 
Add settings to change local port
 2016-09-08 18:10:32 -07:00
howard-stearns
b918e1ec51 fix system toolbar following upgrade to QT 5.6 2016-09-08 11:32:12 -07:00
SamGondelman
038aba20e4 disable dropshadows if unsupported (OSX and AMD cards) 2016-09-06 17:36:57 -07:00
Atlante45
a8de6f0a57 Add settings to change local port 2016-09-06 10:18:42 -07:00
James B. Pollack
d9ebad7976 Merge pull request #8372 from elisa-lj11/zip_project 
Added Clara.io to the marketplace
 2016-08-24 15:53:58 -07:00
howard-stearns
bc90b0bc43 pr review 2016-08-22 16:09:09 -07:00
howard-stearns
993340811f switch over to metaverse server user story cards 2016-08-19 16:40:53 -07:00
elisa-lj11
8bc9a92429 removed extraneous debug prints 2016-08-19 11:32:13 -07:00
elisa-lj11
4c434e875e fixed merge conflicts in Application.cpp 2016-08-19 09:46:22 -07:00
howard-stearns
d58cc8ddd9 use html card from user_story id, and close things when 
receiveHifiSchemeUrl
 2016-08-17 16:35:29 -07:00
elisa-lj11
9ea9baeadf Making JS/QML safer (DOES NOT WORK) 2016-08-16 14:12:19 -07:00
howard-stearns
2f114b9c92 fix image link. How did this ever work? 2016-08-16 10:38:00 -07:00
howard-stearns
747c43d065 basic user story card 2016-08-11 16:43:29 -07:00
howard-stearns
e6746acf4c Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-11 15:40:26 -07:00
David Rowe
8e56e0bf18 Fix QML warning 2016-08-10 10:41:37 +12:00
elisa-lj11
a9a8710689 Switched saving download/upload to temporary directory 2016-08-04 17:01:19 -07:00
elisa-lj11
b1b2ea48b2 Made code more QA; extra browser and download widget close upon download 2016-08-04 17:01:19 -07:00
elisa-lj11
615627e981 Working download and unpackage from Clara.io 2016-08-04 16:59:38 -07:00
elisa-lj11
c36fc29363 Zip download works 2016-08-04 16:59:03 -07:00
howard-stearns
611223f013 highlight to show that the cards can be clicked 2016-07-29 15:49:20 -07:00
howard-stearns
ae9421f1f6 smaller user label, and use the word "people" 2016-07-29 15:22:08 -07:00
howard-stearns
ed811d0431 replace Row with ListView, but otherwise same user-functionality 2016-07-28 15:01:21 -07:00
howard-stearns
abb63139f6 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-18 16:29:49 -07:00
Brad Davis
9ebc0c28c8 Fix hover states for toolbar buttons 2016-07-15 17:12:49 -07:00
howard-stearns
f73c2b884d Remove now-superflous Column. 2016-07-15 17:01:37 -07:00
howard-stearns
f00114e53e Make it work with laser pointers (selection at least), and fix magic 
numbers.
 2016-07-15 16:46:20 -07:00
howard-stearns
99e9a76803 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-15 16:14:48 -07:00
howard-stearns
289617d4ce styling 2016-07-15 16:14:29 -07:00
howard-stearns
6fb2cedfe0 card default image: settable, use to start, and reset when needed 2016-07-15 13:42:31 -07:00
howard-stearns
e974bad8f0 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-15 10:36:19 -07:00
Brad Davis
43e045c22a Restore mouseover events for items in windows 2016-07-14 17:40:05 -07:00
Brad Davis
a6d71f508e Fix edit toolbar button vanishing, persistent edit button 2016-07-14 17:40:04 -07:00
Brad Davis
fdcbf71623 Remove fade effect from toolbar buttons 2016-07-14 17:40:02 -07:00
howard-stearns
3132cca482 prototype 2016-07-14 14:49:03 -07:00
Brad Davis
f2220288fb Expand frame decoration when mouse is over a window in HMD mode 2016-07-12 16:40:53 -07:00
Brad Hefta-Gaub
b8d79ec263 Merge pull request #8179 from SamGondelman/snapshotFix3 
Various snapshot improvements
 2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub
bcee128de0 Merge pull request #6959 from Triplelexx/20769 
CR for Job #20769 - Touchscreen camera input for Interface
 2016-07-11 14:24:52 -07:00
SamGondelman
b3513b543c fixed snapshot path setting 2016-07-05 18:23:59 -07:00
Ryan Downe Karpf
7eb07cba4c Merge pull request #8171 from jherico/qml_fixes 
Keyboard focus polish for Vive UI
 2016-07-01 16:20:36 -07:00
howard-stearns
1ad9cfde99 make hud button participate in buttonState just like other toolbar 
chicklets
 2016-07-01 13:54:00 -07:00
howard-stearns
02cc6cc567 hover states 2016-07-01 12:18:26 -07:00
SamGondelman
218b26b521 removed snapshot share dialog, ctrl s shouldn't leave you moving 2016-07-01 10:58:55 -07:00
howard-stearns
125f6d8b63 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-06-30 16:49:19 -07:00
howard-stearns
f03f5f3e68 new icons 2016-06-30 16:47:10 -07:00
SamGondelman
69ffd63ba7 fix snapshot sharing window 2016-06-30 15:42:48 -07:00
Brad Davis
167cb72a0e Don't auto-focus the filter field in running scripts 2016-06-30 15:18:59 -07:00
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01:00
Brad Davis
37e9f66639 Additional toolbar work 2016-06-20 15:41:21 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -07:00
Bradley Austin Davis
33e9caa636 Simplify overlay conductor, menu interation 2016-06-15 17:24:39 -07:00
Bradley Austin Davis
175dbb8924 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-14 09:48:56 -07:00
Brad Hefta-Gaub
7da29daf9d Merge pull request #8036 from ctrlaltdavid/20955 
Fix image2d overlay color property
 2016-06-13 19:21:59 -07:00
Brad Davis
472a3540d7 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	scripts/system/controllers/handControllerGrab.js
 2016-06-10 10:43:09 -07:00
David Rowe
5352bd4b76 Fix height of Load Defaults button 2016-06-09 17:15:17 +12:00
Howard Stearns
bf48099286 Merge pull request #8032 from jherico/pin-button 
Add a constant hud toggle button to the UI
 2016-06-08 10:33:11 -07:00
Brad Davis
ca6e86e767 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-06-07 21:51:47 -07:00
David Rowe
f9d6a7ba8d Fix image2d overlay color property 2016-06-08 14:04:02 +12:00
Brad Davis
ba61491ee6 PR feedback 2016-06-07 15:33:00 -07:00
Brad Davis
b9ee0c087e Add a constant hud toggle button to the UI 2016-06-07 13:45:23 -07:00
David Rowe
b6af46cac9 Add "Load Defaults" button to Running Scripts dialog 
And rename "Stop All" to "Remove All".
 2016-06-07 11:30:07 +12:00
Brad Davis
8c13ff4ee1 Pinned UI support 2016-06-02 17:24:25 -07:00
David Rowe
504516b627 Merge branch 'master' into 20917 2016-05-24 08:03:54 +12:00
Brad Hefta-Gaub
00bd3b2e8a remove more dead code 2016-05-20 13:43:08 -07:00
David Rowe
17b3101ca5 Merge branch 'master' into 20917 2016-05-20 18:50:01 +12:00
Atlante45
38f74c1843 Remove the last of the glow level 2016-05-14 14:49:31 -07:00
David Rowe
b6fcb77d6f Update Running Scripts list to use updated QML table control 2016-05-12 17:16:56 +12:00
Brad Hefta-Gaub
4ab7b660d4 fix a bunch of bugs in qml window placement 2016-04-25 20:19:54 -07:00
Brad Hefta-Gaub
f4e4f217e8 Merge pull request #7642 from ctrlaltdavid/20872 
Further restyling of edit.js
 2016-04-22 13:46:26 -07:00
David Rowe
7b9e6b52fb Merge branch 'master' into 20872 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-04-22 13:19:47 +12:00
David Rowe
a7b82e8cae Decouple ui and shared libraries 2016-04-22 12:58:47 +12:00
David Rowe
266e4c998b Don't show "Reveal Scripts Folder" link when open Running Scripts in HMD 2016-04-22 12:29:22 +12:00
David Rowe
6c5335cfa7 Replace button with icon and text 2016-04-21 15:17:06 +12:00
David Rowe
9c9bca546c Add button that opens scripts directory window 2016-04-21 11:52:03 +12:00
David Rowe
43f843f731 Retrofit updated margins and spacing to QML dialogs 2016-04-13 16:39:52 +12:00
David Rowe
f7f5443a44 Merge branch 'master' into 20872 
Conflicts:
	examples/html/entityProperties.html
 2016-04-12 15:40:35 +12: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
David Rowe
4e3cdf6569 Update Running Scripts' search to have rounded ends and a search icon 2016-04-07 12:32:27 +12:00
Triplelexx
11af0a421b Merge branch 'master' into 20769 2016-04-03 22:57:55 +01: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
51728d14a7 Miscellaneous improvements to Attachments dialog 2016-03-24 21:17:36 +13:00
Stephen Birarda
34fb06a7bd changes to attachments dialog from contractor 2016-03-23 13:52:47 -07:00
timemarkov
160b4e7ba2 Implement new design of attachment dialog 2016-03-18 12:11:00 +01:00
David Rowe
48d4316714 Fix typo 2016-03-17 09:34:21 +13:00
Atlante45
5a0beec1f5 Replace old drag&drop with new UI 2016-03-09 11:47:31 -08:00
Atlante45
ded449072f Rename window 2016-03-08 13:13:45 -08:00
Atlante45
784f669998 First draft Assets Manager 2016-03-08 13:13:45 -08:00
David Rowe
1eb6fa425c Fix up Running Scripts dialog 2016-03-03 20:09:50 +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
16fbf60bae Update preferences dialog titles to match menu items 2016-03-02 11:52:58 +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
09029e4edd Change name of dialog to match menu item 2016-02-25 20:37:54 +13:00
David Rowe
10efbd996f Update General Settings dialog to use new window frame style 2016-02-25 20:26:36 +13: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
bac703b29e Adjust height of Running Scripts now that fonts are consistently sized 2016-02-24 12:36:46 +13:00
Brad Hefta-Gaub
71262c3e64 cleaner QML rejection of mouse messages 2016-02-23 11:14:16 -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
e30135a89d Increase height of dialog to avoid scrollbars 2016-02-23 20:05:45 +13:00
David Rowe
db6c76bf67 Merge branch 'master' into 20805 2016-02-22 13:15:40 +13: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
David Rowe
54b27f3ac3 Merge branch 'master' into 20805 2016-02-18 23:35:37 +13:00
David Rowe
b68837277c Fix default focus 2016-02-18 22:12:43 +13:00
David Rowe
d32f743f52 Style running scripts and available scripts tables 2016-02-18 16:35:51 +13:00
David Rowe
b2314d33ba Style and lay out text fields 2016-02-17 20:44:09 +13:00
David Rowe
61d359a9b5 Style Button controls 2016-02-17 16:12:11 +13:00
David Rowe
1164e3e303 Set up window pane's content width so that can right-align 2016-02-17 15:35:35 +13:00
David Rowe
386a247f78 Put Running Scripts content into sections 2016-02-16 17:48:21 +13:00
David Rowe
4d74bb04b0 Style scrollbar 2016-02-16 09:48:09 +13:00
howard-stearns
7057d5c40c Snap Turn avatar preference. (Still tied to Developer menu item.) 2016-02-15 12:38:40 -08:00
David Rowe
9a536b3b33 Specify a minimum Running Scripts window size 2016-02-15 18:02:59 +13:00
David Rowe
a5da678d6e Make Running Scripts dialog content scrollable when needed 2016-02-15 18:02:20 +13:00
David Rowe
31930e879a Style content background, size frame, and position frame elements 2016-02-14 21:01:23 +13:00
David Rowe
3d8df56baa Copy bare minimum of files as start of restyling Running Scripts dialog 
And add license headers to files.
 2016-02-12 10:13:06 +13:00
Zach Pomerantz
5eeaa9a33e Move graphics settings to dedicated dialog 2016-02-11 10:00:44 -08:00
Brad Davis
e376b781c1 Keyboard navigation in running scripts list 2016-02-08 16:12:23 -08:00
Bradley Austin Davis
ebf0bf394a Fix native text rendering by forcing positions to integer values 2016-02-05 11:43:31 -08:00
Bradley Austin Davis
320c4d27b5 Force Qt (rather than OS) rendering in a number of places 2016-02-03 14:51:05 -08:00
Bradley Austin Davis
bc7fda0ae9 Set desirable global settings for QML web views 2016-02-02 15:19:47 -08:00
Andrew Meadows
e394f64540 Merge pull request #6991 from seefo/master 
Added camera sensitivity dialog preferences
 2016-02-02 08:22:45 -08:00
Brad Davis
27c38599a9 Snapshot dialogs 2016-02-01 11:07:48 -08:00
Seefo
ffa6687af3 Added setting dialogs for camera pitch and yaw 2016-01-29 19:34:57 -05:00
Brad Davis
8c19b95ea2 Fix oversized text, invalid color handling 2016-01-28 16:36:28 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00
samcake
f4e0352f61 Merge pull request #6930 from zzmp/feat/bubble-render-settings 
Bubble up render settings from CPP to JS/QML
 2016-01-27 14:20:51 -08:00
Brad Davis
f53aaa1d64 Removing old attachment dialog, updating menu code 2016-01-26 21:55:42 -08:00
Brad Davis
2956557c5f Adding overlay compatible combo-box 2016-01-26 21:55:41 -08:00
Brad Davis
664100b9b1 Attachment dialog 2016-01-26 21:55:40 -08:00
Zach Pomerantz
bed325d675 Add Graphics to general settings 2016-01-25 15:17:43 -08:00
Brad Davis
bbefafcb07 Break up preferences dialogs 2016-01-23 23:11:41 -08:00
Brad Davis
8e57f06de2 Add browser action shortcut to our custom desktop 2016-01-23 22:06:59 -08:00
Brad Davis
208d7c3cfc Killing the old preferences dialog 2016-01-22 19:24:38 -08:00
Brad Davis
71ae36f5c0 Button prefs and conditionally enabled prefs 2016-01-22 19:06:30 -08:00
Brad Davis
27fdb523cb Add directory & avatar browsing preferences 2016-01-22 17:30:10 -08:00
Brad Davis
c7186590ea Support for directory browsing 2016-01-22 17:30:09 -08:00
Brad Davis
2026821d9e Moving preferences to dependency mananger 2016-01-22 17:30:08 -08:00
Brad Davis
205ab05506 First pass on preferences dialog 
Conflicts:
	tests/ui/qmlscratch.pro
 2016-01-22 17:30:07 -08:00
Brad Davis
d2900200a1 More cleanup & menu fixing 2016-01-20 11:23:56 -08:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00