Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-05 19:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45893 commits 69 branches 57 tags 1.2 GiB
Commit graph

842 commits

Author SHA1 Message Date
howard-stearns
ed811d0431 replace Row with ListView, but otherwise same user-functionality 2016-07-28 15:01:21 -07:00
Andrew Meadows
5ce681154d Merge pull request #8301 from AlexanderOtavka/asset-browser-ui 
Asset browser ui
 2016-07-26 15:04:10 -07:00
Zander Otavka
90154158b6 Fix gravity zero vector 2016-07-25 14:08:07 -07:00
Zander Otavka
344ec25bcd Fix gravity for dynamic entities 2016-07-25 14:01:57 -07:00
James B. Pollack
38765e6fa4 extra space 2016-07-25 11:12:34 -07:00
James B. Pollack
84e4de4bad update formatting 2016-07-25 11:11:37 -07:00
James B. Pollack
ea1c21e685 resolve merge 2016-07-24 18:51:00 -07:00
James B. Pollack
3b25b36db3 cleanup 2016-07-24 16:57:15 -07:00
James B. Pollack
8acb30da8e add permissions bar 2016-07-24 16:54:00 -07:00
Brad Hefta-Gaub
43064807d1 Merge pull request #8292 from jherico/webui 
Fix some UI elements triggered by WebViews
 2016-07-23 13:47:04 -07:00
Zander Otavka
c25b87c33f Use custom dialog for asset server add to world 2016-07-22 17:14:45 -07:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
Brad Davis
faba1a4b4e Fix UI elements triggered by WebViews 2016-07-21 15:13:07 -07:00
Zander Otavka
5394c092d0 Fix bug with dropdown 2016-07-20 13:07:45 -07:00
howard-stearns
4a6132874f encodeURIComponent of the protocol signature 2016-07-19 13:43:28 -07:00
Zander Otavka
acf4539f4f Return a JSON string from QML instead of JS object 
Idk why QML can't return a JS object, but it can't.  Strings work, so I
use a string.
 2016-07-19 13:21:08 -07:00
howard-stearns
57955a2b56 Expose protocol version to qml, and use it in query. 2016-07-18 18:12:27 -07:00
howard-stearns
17e64cf5e6 suggest only unrestricted domains, and also use server to sort 2016-07-18 16:58:29 -07:00
howard-stearns
abb63139f6 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-18 16:29:49 -07:00
Zander Otavka
d75c2e2a6f Merge branch 'master' into edit-model-ui 2016-07-18 13:11:51 -07:00
Zander Otavka
b8398944ac Fix QML warnings 2016-07-18 13:09:32 -07:00
Zander Otavka
06985f9278 Make combo box go by index, add default values 2016-07-18 12:06:11 -07:00
Zander Otavka
6bd7034c1a Improve scaling of components in dialog 
CustomQueryDialog now better handles the absence of one or more input
fields and scales appropriately.
 2016-07-18 11:14:45 -07:00
Howard Stearns
cf025072e1 Only consider "active" domains for all purposes (which on the back end means at least one person connected). 2016-07-16 09:50:56 -07:00
Howard Stearns
d446e1bcf5 Phone home with suggestions activity usage. 2016-07-15 19:15:58 -07:00
Zander Otavka
c27e1d6fdb Polish dialog behavior and spacing 2016-07-15 17:35:55 -07:00
Zander Otavka
71f62c02fc Add basic implementation of customPrompt 
Still missing the warning and diabling of dynamic checkbox when the
static mesh is selected.
 2016-07-15 17:35:55 -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
Brad Davis
317dee1b23 Fix decoration inflation 2016-07-15 16:15:53 -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
cc367f7b49 We don't need HorizontalSpacer.qml. 2016-07-15 14:56:31 -07:00
howard-stearns
562446e7b8 use AddressManager, rather than adding a trampoline to hostname in 
AddressBarDialog.
 2016-07-15 14:44:27 -07:00
howard-stearns
87e54482dd check pictures only for the domains that have someone in them, but use all 
domains when filtering (occupied or no, picture or no).
Also, make darn sure we use default picture if no data.
 2016-07-15 14:30:28 -07:00
howard-stearns
6fb2cedfe0 card default image: settable, use to start, and reset when needed 2016-07-15 13:42:31 -07:00
Brad Hefta-Gaub
574aaa9f28 Merge pull request #8248 from jherico/edit_toolbar 
Migrate edit.js toolbar to the new toolbar API
 2016-07-15 12:42:13 -07:00
howard-stearns
99e229467b Don't show the word "suggesions" when there aren't any. 2016-07-15 11:49:21 -07:00
howard-stearns
8faa961c8d all domains, not just the 'active' ones, which turns out to be defined as 
having at least one person in it.
 2016-07-15 11:41:00 -07:00
howard-stearns
e974bad8f0 Merge branch 'master' of https://github.com/highfidelity/hifi into suggestions 2016-07-15 10:36:19 -07:00
howard-stearns
ce99146733 filter by typing 2016-07-15 10:27:52 -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
1c2d13d1ee Don't show where you are now. 2016-07-14 15:38:22 -07:00
howard-stearns
3132cca482 prototype 2016-07-14 14:49:03 -07:00
Brad Davis
656da16c4d Remove highlight animation duration on menus 2016-07-14 10:30:36 -07:00
James B. Pollack
aacddcf66d fix pop ups 2016-07-13 15:02:51 -07:00
James B. Pollack
c3c9c0cb10 update so HTML5 media apis work again 2016-07-13 14:37:41 -07:00
Brad Davis
6336362d40 Fixing decoration inflation 2016-07-12 17:23:13 -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
Brad Davis
829a871d6f Merge pull request #8208 from SamGondelman/qmlFixes 
Fixed issues in Browser.qml and UpdateDialog.qml
 2016-07-07 19:51:37 -07:00
SamGondelman
99fc472d77 fixed errors in Browser.qml and UpdateDialog.qml 2016-07-07 14:06:57 -07:00
Brad Davis
23700dc90f Ensure newly shown windows are popped to the top of the zorder 2016-07-07 13:16:59 -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
71c44f4f93 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-07-01 13:05:32 -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
Sam Gondelman
af67d814eb Merge pull request #8163 from ctrlaltdavid/20981 
distinguish between file name and directory as prompt in file chooser
 2016-07-01 10:39:32 -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
James B. Pollack
3b57fd1faf Merge pull request #8173 from SamGondelman/snapshotFix2 
Fix snapshot dialog rendering
 2016-06-30 16:48:43 -07:00
howard-stearns
f03f5f3e68 new icons 2016-06-30 16:47:10 -07:00
howard-stearns
b22844dc97 Merge branch 'master' of https://github.com/highfidelity/hifi into button-state 2016-06-30 16:24:36 -07:00
howard-stearns
ff55644fe8 stateful hud toolbar buttons 2016-06-30 16:24:11 -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
Brad Davis
ce54f1b1d1 Improve desktop 'unfocus' functionality 2016-06-30 15:18:14 -07:00
Brad Davis
86f8b57841 Highlight controls based on activeFocus, not focus 2016-06-30 15:16:28 -07:00
David Rowe
759b3065fc Distinguish between file name and directory as prompt in file chooser 2016-06-30 20:48:19 +12:00
Brad Davis
5a9be817df PR comments 2016-06-29 10:28:55 -07:00
Brad Davis
962f9d5f22 Don't update the shown state of the tool window when it's already invisible 2016-06-28 18:10:06 -07:00
howard-stearns
68be819ea2 fix crash when hmd context menu triggers a modal 2016-06-27 14:07:13 -07:00
Brad Davis
f90a351400 Don't reposition windows prior to selecting the initial display plugin 2016-06-24 16:31:24 -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
howard-stearns
baa9139881 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 17:02:23 -07:00
Brad Davis
f3bad3a63b Don't trigger keyboard on revealing the overlay layer 2016-06-21 16:04:06 -07:00
howard-stearns
8421931c56 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 14:47:45 -07:00
Brad Davis
0bc4beeffd Fix initial toolbar positioning 2016-06-20 17:09:30 -07: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
71bf9384ce Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-15 10:45:51 -07:00
David Rowe
3c2b98b15a Let user choose an existing file in the file save dialog 2016-06-15 11:28:38 +12:00
Brad Hefta-Gaub
1c391e626f Merge pull request #8054 from ctrlaltdavid/20957 
fix model export continued
 2016-06-14 10:57:25 -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
0ddee876c3 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-13 13:03:46 -07:00
David Rowe
098432152d Merge branch 'master' into 20957 2016-06-13 16:16:12 +12:00
David Rowe
f7578f084f Fix buttons on warning message box when can't export a file 2016-06-13 15:21:59 +12:00
David Rowe
546699da03 When choosing a directory default selection to default directory 2016-06-13 15:06:10 +12:00
David Rowe
d74f1c8b5d Fix default directory for Settings directory preference fields 2016-06-13 14:51:14 +12:00
Brad Hefta-Gaub
92909af52c Merge pull request #8044 from ctrlaltdavid/20957 
fix model export
 2016-06-12 19:43:51 -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
David Rowe
cf6945b403 Fix selecting directory directly from dropdown 2016-06-09 17:11:00 +12:00