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

827 commits

Author SHA1 Message Date
elisa-lj11
8bf87128d9 Fixed browser.qml 'onNewViewRequested' 2016-08-22 16:04:55 -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
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
elisa-lj11
9ea9baeadf Making JS/QML safer (DOES NOT WORK) 2016-08-16 14:12:19 -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
elisa-lj11
b8f5a9d22f CR changes 2016-08-10 10:26:58 -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
elisa-lj11
c009834685 Fixes for linux build of quazip 2016-08-05 17:36:27 -07: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
elisa-lj11
90a1325f65 Finalized combobox feature 2016-08-04 17:02:57 -07:00
elisa-lj11
b39c8c52ab Included combobox in marketplace view 2016-08-04 17:02:04 -07:00
elisa-lj11
d63d0ba870 In process of creating combobox for marketplace with qml 2016-08-04 17:02:04 -07: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
a94a304700 Downloads from Clara.io and uploads to asset server 2016-08-04 16:59:38 -07:00
elisa-lj11
615627e981 Working download and unpackage from Clara.io 2016-08-04 16:59:38 -07:00
elisa-lj11
49712060ed switching to the main site progress 2016-08-04 16:59:38 -07:00
elisa-lj11
c36fc29363 Zip download works 2016-08-04 16:59:03 -07:00
elisa-lj11
ab02d16eb7 QML troubleshooting 
Trying to find out why it does multiple downloads on one click, when
everything fails. Has something to do with a download finish request
getting sent despite not being completed.
 2016-08-04 16:58:31 -07:00
elisa-lj11
6152fa28b7 Download through QML 
It kind of works, not crashing like before, but the weird ghost
file/type error is still happening with multiple downloads
 2016-08-04 16:58:31 -07:00
elisa-lj11
eab7714d70 working within webview to access url 2016-08-04 16:57:19 -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