Commit graph

1574 commits

Author SHA1 Message Date
David Rowe
9fa4a20e55 Fix Asset Browser dialog 2016-08-18 09:37:26 +12:00
howard-stearns
17d9db487d adjust .qml for useFeed being a c++ property instead of qml. 2016-08-17 09:57:46 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07: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
howard-stearns
d764c363cc Merge branch 'discovery' into ux-improvements 2016-08-16 12:19:43 -07:00
howard-stearns
2b75240771 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-16 11:14:36 -07:00
howard-stearns
4da2cb685c Set full url path to where the picture was taken.
Expand width of scroll, but leave a margin at both ends.
Include an image at the end to indicate that the scroll is swipable.
Adjust ighlight color and border size.
2016-08-16 10:43:05 -07:00
howard-stearns
2f114b9c92 fix image link. How did this ever work? 2016-08-16 10:38:00 -07:00
James B. Pollack
5a2c7cf58e cleanup 2016-08-16 09:58:18 -07:00
James B. Pollack
f143c62e9c whoops 2016-08-15 11:53:32 -07:00
James B. Pollack
a078b20f9d make it work with click 2016-08-15 10:24:24 -07:00
James B. Pollack
493adca04f map oculus grip to trigger 2016-08-15 10:02:53 -07:00
Brad Davis
39b424645a Cropping no-preview image 2016-08-12 22:28:57 -07:00
Brad Davis
719e555381 Restoring reprojection to OpenVR 2016-08-12 22:28:55 -07:00
Brad Davis
901e2da828 Hand lasers 2016-08-12 22:28:29 -07:00
Brad Davis
adcfd55cc0 Batch replay reprojection 2016-08-12 22:28:23 -07:00
Brad Davis
7e93747acf Working on reprojection 2016-08-12 22:28:22 -07:00
Bradley Austin Davis
274321de8a First pass at threaded rendering 2016-08-12 22:18:36 -07:00
Atlante45
e4dd4c1a41 Merge branch 'master' of https://github.com/highfidelity/hifi into steam 2016-08-12 10:38:05 -07:00
Howard Stearns
8708e2ac2b image url, in anticipation of having it in details 2016-08-12 07:00:07 -07:00
howard-stearns
b4a43db025 include user name in search text for user stories 2016-08-11 17:04:48 -07:00
howard-stearns
cd9bd8dddf we don't need the dummy data any more 2016-08-11 16:58:06 -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
Ryan Huffman
b6620f128b Add asset server bandwidth to stats 2016-08-11 11:06:36 -07:00
Anthony J. Thibault
8dac45c99e Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-10 11:27:21 -07:00
elisa-lj11
b8f5a9d22f CR changes 2016-08-10 10:26:58 -07:00
Brad Hefta-Gaub
7503a495fd Merge pull request #8401 from ctrlaltdavid/21026
Fix crash when adding new attachment
2016-08-10 09:18:17 -07:00
Brad Hefta-Gaub
8abbe27c07 Merge pull request #8387 from SamGondelman/mappingFixes
Fix Standard.A/B/X/Y primary thumb JSON mappings
2016-08-09 16:43:45 -07:00
David Rowe
8e56e0bf18 Fix QML warning 2016-08-10 10:41:37 +12:00
howard-stearns
f34030d276 factor out metaverseBase to make it easier to repoint to a test server 2016-08-09 12:48:01 -07:00
Brad Hefta-Gaub
1834b035d7 Merge pull request #8382 from ctrlaltdavid/21024
Disable Asset Browser's right-click popup menu if in HMD mode
2016-08-09 12:41:48 -07:00
Brad Hefta-Gaub
d8f1847fde Merge pull request #8365 from huffman/feat/default-skybox
Default skybox change
2016-08-09 11:17:36 -07:00
Atlante45
25b60d0c62 CR feedback 2016-08-09 10:07:57 -07:00
Ryan Huffman
c47a5c5aad Add default skybox images 2016-08-08 16:03:03 -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
SamGondelman
a5f3089fda fix ABXY mapping for touch 2016-08-08 13:14:14 -07:00
Seth Alves
38314b180b Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk 2016-08-08 06:30:18 -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
Anthony J. Thibault
90a06f0d40 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-05 11:05:10 -07:00
Seth Alves
84ce29eb90 Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk 2016-08-05 10:44:46 -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
howard-stearns
8a7bbbaaed limit user stories to first 100 2016-08-04 12:37:09 -07:00
howard-stearns
04bd98b15f new assets. remove margins between buttons (letting the graphics do the
work)
2016-08-04 12:33:50 -07:00
howard-stearns
1ecb01feac center the scroll 2016-08-04 12:06:07 -07:00
howard-stearns
f5d07f4186 helper text size and italic 2016-08-04 11:55:31 -07:00
howard-stearns
d39446f340 no place name over user-story scroll items 2016-08-04 10:36:17 -07:00
howard-stearns
421707c5d8 fix typo that was making user stories not show date 2016-08-04 10:07:33 -07:00
howard-stearns
c44ce0f5b5 Fix forward/back button states. 2016-08-03 17:03:27 -07:00
Chris Collins
2473bbf1db Merge pull request #8313 from imgntn/tweak_lazers
Tweak Teleport + Hand Lasers
2016-08-03 16:40:28 -07:00
howard-stearns
8c6744e5e8 new address bar graphic 2016-08-03 16:18:41 -07:00
howard-stearns
30327d8135 New buttons, with hover behavior. Also don't impose test data if the api
gives data.
2016-08-03 16:02:22 -07:00
Philip Rosedale
98e40d54e1 Merge pull request #8355 from SamGondelman/touchDeadZone
Added dead zones to Hydra and Oculus Touch joysticks
2016-08-03 15:17:15 -07:00
James B. Pollack
7a41ed25db Merge remote-tracking branch 'upstream/master' into tweak_lazers 2016-08-03 14:59:51 -07:00
Anthony J. Thibault
713bee84c3 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-03 14:06:43 -07:00
Seth Alves
40a5e4abc8 in full-screen mirror camera mode, arrow keys move camera but don't make the avatar walk 2016-08-03 13:54:25 -07:00
howard-stearns
188e525efc basic ugly feed/places toggle button 2016-08-03 11:48:58 -07:00
Anthony J. Thibault
75b88b0794 WebEntities now support custom hifi url handling
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
2016-08-03 10:20:15 -07:00
SamGondelman
458e43fadc added dead zones to hydras, style fixes 2016-08-03 10:18:57 -07:00
Howard Stearns
e593077b4b basic display of user story feed (hardcoded switch place names vs feed) 2016-08-03 09:39:27 -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
James B. Pollack
88ebeaa4cb start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck 2016-08-02 18:46:47 -07:00
SamGondelman
1ce7623f41 added deadzones to oculus touch movements 2016-08-02 18:19:58 -07:00
Zander Otavka
3c30743d0d Remove url change debug info for WebView 2016-08-02 16:48:39 -07:00
howard-stearns
70e07f3299 remove highlight move animation 2016-08-02 13:56:01 -07:00
James B. Pollack
7fae7e9c77 cleanup 2016-08-02 12:26:37 -07:00
James B. Pollack
108e7a2fc1 Merge remote-tracking branch 'upstream/master' into tweak_lazers 2016-08-02 12:25:27 -07:00
James B. Pollack
a7b8f2c9df updates 2016-08-02 12:25:24 -07:00
David Rowe
31ac7a2812 Add OverlayWebWindow resized, moved, and closed signals 2016-08-02 12:40:01 +12:00
howard-stearns
c3bf52267d Don't suggest loaded places. 2016-08-01 15:27:29 -07:00
howard-stearns
7cf41d441e filtering by place 2016-08-01 12:28:57 -07: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
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
ff17761769 basic minority-report scroll (fixed initial data, but infinite cards) 2016-07-28 15:46:32 -07:00
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