Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-24 02:29:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45856 commits 25 branches 0 tags 1.1 GiB
Commit graph

809 commits

Author SHA1 Message Date
David Rowe
9fa4a20e55 Fix Asset Browser dialog 2016-08-18 09:37:26 +12:00
Stephen Birarda
3355a90e7d Merge pull request #8413 from huffman/feat/atp-bandwidth 
Add asset server bandwidth to stats
 2016-08-16 15:54:11 -07:00
Atlante45
e4dd4c1a41 Merge branch 'master' of https://github.com/highfidelity/hifi into steam 2016-08-12 10:38:05 -07:00
Ryan Huffman
b6620f128b Add asset server bandwidth to stats 2016-08-11 11:06:36 -07:00
David Rowe
8e56e0bf18 Fix QML warning 2016-08-10 10:41:37 +12:00
Atlante45
25b60d0c62 CR feedback 2016-08-09 10:07:57 -07:00
Atlante45
aa2ae31aab CR UI fixes 2016-08-08 15:39:25 -07:00
Atlante45
f0ff975248 UI wiring 2016-08-08 15:39:25 -07:00
Atlante45
205df0cf51 login UI first draft 2016-08-08 15:39:25 -07:00
Atlante45
cea0e182c0 Interface login through steam 2016-08-08 15:39:25 -07:00
David Rowe
38b5314322 Disable Asset Browser's right-click popup menu if in HMD mode 2016-08-06 17:53:59 +12:00
Brad Hefta-Gaub
82119f7f0b Merge pull request #8336 from ctrlaltdavid/21018 
close file browser dialog immediately after selecting asset to upload
 2016-08-05 14:39:35 -07:00
Brad Hefta-Gaub
70cb3d3393 Merge pull request #8354 from AlexanderOtavka/remove-web-debug 
Remove url change debug info for WebView
 2016-08-03 09:10:10 -07:00
Seth Alves
cc7322a0de Merge pull request #8334 from ctrlaltdavid/21015 
refresh file dialog when directory content changes
 2016-08-03 08:11:40 -07:00
Zander Otavka
3c30743d0d Remove url change debug info for WebView 2016-08-02 16:48:39 -07:00
David Rowe
31ac7a2812 Add OverlayWebWindow resized, moved, and closed signals 2016-08-02 12:40:01 +12:00
David Rowe
18b0ed9e8f Close file browser dialog immediately after selecting asset to upload 2016-07-30 14:16:08 +12:00
David Rowe
800c2b9ec0 Refresh file dialog when directory content changes 2016-07-30 11:21:40 +12: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