James B. Pollack
7866786da9
Merge pull request #8406 from AlexanderOtavka/script-load
...
Disable loading client scripts over ATP
2016-08-12 11:01:14 -07:00
Atlante45
19b3aa9c89
New metaverse web API
2016-08-12 10:42:32 -07:00
Clément Brisset
7c698b8cbb
Merge pull request #8423 from Atlante45/steam
...
Update Steam branch
2016-08-12 10:40:53 -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
Ryan Huffman
211da3c428
Add more user activity tracking data
2016-08-11 16:49:29 -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
Seth Alves
c363ca9887
3d-model overlays can now be children
2016-08-11 15:29:09 -07:00
Seth Alves
15e2140cb2
Merge branch 'master' of github.com:highfidelity/hifi into overlay-children
2016-08-11 15:06:58 -07:00
Atlante45
c34153b67b
Change Web API arg name to be more descriptif
2016-08-11 11:57:43 -07:00
Ryan Huffman
b6620f128b
Add asset server bandwidth to stats
2016-08-11 11:06:36 -07:00
David Kelly
f8f99721c3
Minor update to add details
...
And, now reflects data-web's slightly updated json structure
for returning info on an uploaded snapshot.
2016-08-10 14:25:00 -07:00
Anthony J. Thibault
8dac45c99e
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-10 11:27:21 -07:00
Brad Hefta-Gaub
5bd5fc43d3
Merge pull request #8408 from SamGondelman/miniMirrorFade
...
Mini mirror fades with overlays
2016-08-10 11:07:47 -07:00
Brad Hefta-Gaub
a714f325fe
Merge pull request #8333 from SamGondelman/miscFixes
...
Miscellaneous cmake and render engine improvements
2016-08-10 11:06:50 -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
SamGondelman
50a4c8b496
mini mirror fades with overlays
2016-08-09 18:02:56 -07:00
Zander Otavka
4e16998b45
Disable loading client scripts over ATP
2016-08-09 17:36:59 -07:00
Brad Hefta-Gaub
412052c285
Merge pull request #8380 from highfidelity/fade
...
Add fade in loading effect
2016-08-09 16:50:05 -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
Howard Stearns
2cdca6211f
Merge pull request #8389 from davidkelly/dk/uploadSnapshot
...
First cut of a snapshot uploader
2016-08-09 15:47:04 -07:00
David Rowe
8e56e0bf18
Fix QML warning
2016-08-10 10:41:37 +12:00
David Kelly
d4f376879d
PR feedback
2016-08-09 15:05:23 -07:00
SamGondelman
9b27f8bc0f
Merge remote-tracking branch 'upstream/master' into loadingFade
2016-08-09 14:55:14 -07:00
David Kelly
0d1df2627d
Merge pull request #8356 from howard-stearns/feed-display
...
feed display
2016-08-09 14:52:53 -07:00
David Kelly
18990821df
Added 'path' to user stories, works now.
...
yay
2016-08-09 14:15:49 -07:00
David Kelly
8457acd234
First guess on how to deal with place
...
Fall back to host when there is no place. Probably better ideas, like
specify the name and the type (a place, a domain if no place, etc...)
will come soon.
2016-08-09 13:42:48 -07: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
Brad Hefta-Gaub
d8edf5c85a
Merge pull request #8357 from sethalves/fsm-arrows-dont-walk
...
FSM arrow keys don't make the avatar walk
2016-08-09 11:17:00 -07:00
Atlante45
25b60d0c62
CR feedback
2016-08-09 10:07:57 -07:00
Seth Alves
607c168493
Merge branch 'master' of github.com:highfidelity/hifi into overlay-children
2016-08-09 09:01:55 -07:00
Ryan Huffman
8ee3f680c9
Change default skybox ambient intensity from 3.5 to 2.0
2016-08-08 16:03:03 -07:00
Ryan Huffman
6854f9fda4
Remove stars shaders and renderable
2016-08-08 16:03:03 -07:00
Ryan Huffman
eaa77edc25
Replace 'Stars' menu option with 'Default Skybox'
2016-08-08 16:03:03 -07:00
Ryan Huffman
9cbfe195cd
Adjust commenting out of old stars rendering code
2016-08-08 16:03:03 -07:00
Ryan Huffman
4c662b0d60
Add static consts for default skybox values
2016-08-08 16:03:03 -07:00
Ryan Huffman
c47a5c5aad
Add default skybox images
2016-08-08 16:03:03 -07:00
Ryan Huffman
5b69ca03f0
Move default skybox out of global and make irradiance gen optional
2016-08-08 16:03:03 -07:00
Ryan Huffman
35ea9908cd
Add default skybox
2016-08-08 16:00:58 -07:00
Brad Hefta-Gaub
55c690d016
Merge pull request #8368 from huffman/feat/domain-connection-display
...
Automatically show address bar after disconnected for X seconds
2016-08-08 15:56:29 -07:00
Atlante45
f08b2f9257
Remove temporary override to reload QML
2016-08-08 15:39:44 -07:00
Atlante45
51b45f8f73
Steam invite are facing the current position
2016-08-08 15:39:25 -07:00
Atlante45
aa2ae31aab
CR UI fixes
2016-08-08 15:39:25 -07:00
Atlante45
7ec2f98cf2
Join lobby on startup
2016-08-08 15:39:25 -07:00
Atlante45
42c9a695ff
Invite friends in HMD
2016-08-08 15:39:25 -07:00
Atlante45
a13950752b
Update steam location with discoverability
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 Kelly
c8f3a898d2
First cut of a snapshot uploader
...
Will need to test end-to-end shortly, etc...
2016-08-08 15:27:27 -07:00
SamGondelman
328d3128fa
merge from master
2016-08-08 13:30:39 -07:00
SamGondelman
a5f3089fda
fix ABXY mapping for touch
2016-08-08 13:14:14 -07:00
Ryan Huffman
fb14628a7e
Handle case in entity loading priority function where max dim size is <= 0
2016-08-08 10:39:27 -07:00
Ryan Huffman
d367583426
Clean up priority loading implementation
2016-08-08 08:53:06 -07:00
Ryan Huffman
d48bc96cf9
Add ability to set number of concurrent downloads
2016-08-08 08:53:06 -07:00
Ryan Huffman
4f9be2ae72
Fix camera position not being set for angular loading
2016-08-08 08:53:06 -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
SamGondelman
771e105fa2
Merge remote-tracking branch 'upstream/master' into loadingFade
2016-08-05 16:52:01 -07:00
Chris Collins
1e2d77a99b
Merge pull request #8346 from sethalves/default-when-av-fails
...
use default avatar when avatar-url is bogus
2016-08-05 15:13:58 -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
elisa-lj11
76a847d34f
testing for URL bug
2016-08-04 16:53:09 -07:00
elisa-lj11
212e4f9cca
making quazip work
2016-08-04 16:48:14 -07:00
elisa-lj11
f277a019bf
FileScriptingInterface
...
Created new .cpp and .h for the download and unzipping of a model
2016-08-04 16:46:56 -07:00
elisa-lj11
4f33e1502f
starting the zip project
2016-08-04 16:46:56 -07:00
howard-stearns
fed775ff83
simple snapshot confirmation
2016-08-04 15:52:39 -07:00
Ryan Huffman
d775a92dab
Update implementation of ConnectionMonitor timeout
2016-08-04 14:45:10 -07:00
Ryan Huffman
26b9da7eef
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-connection-display
2016-08-04 14:41:03 -07:00
Ryan Huffman
a37bcdafda
Remove debug logging in ConnectionMonitor
2016-08-04 14:40:41 -07:00
Ryan Huffman
8044910bf2
Add show-address-bar when disconnected from domain
2016-08-04 14:39:53 -07:00
SamGondelman
b6e73e06a2
merge from master
2016-08-04 13:34:38 -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
Seth Alves
1b571f3be3
Merge branch 'master' of github.com:highfidelity/hifi into overlay-children
2016-08-04 09:58:41 -07:00
Seth Alves
905c6147cf
Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails
2016-08-04 09:56:32 -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
SamGondelman
2eb0c7735f
working on fading shape entities
2016-08-03 13:30:05 -07:00
howard-stearns
188e525efc
basic ugly feed/places toggle button
2016-08-03 11:48:58 -07:00
Seth Alves
ad4fc8c656
merge from upstream, don't hold up enabling of physics if a collision hull fails to load
2016-08-03 10:42:15 -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
Seth Alves
7e94d4c694
Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails
2016-08-02 19:34:17 -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
Anthony J. Thibault
0ab15f0dcd
fixed one frame lag on webEntity keyboard highlight overlay.
...
Also, made overlay not draw in front.
2016-08-02 15:35:59 -07:00
Howard Stearns
09557b1f9b
Merge pull request #8343 from howard-stearns/scroll
...
scrollable suggested places in address bar
2016-08-02 15:34:35 -07:00
Howard Stearns
c2d1f08551
Merge pull request #8342 from highfidelity/dk/snapshot
...
Snapshot button
2016-08-02 15:31:50 -07:00
Anthony J. Thibault
6d768d8327
hand controllers send touch events instead of mouse events to web entities
...
This gives a much better experience when scrolling web content.
2016-08-02 15:23:46 -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
Seth Alves
79121133df
remove unneeded change
2016-08-02 12:00:45 -07:00
Seth Alves
528f417f74
Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails
2016-08-02 11:55:17 -07:00
Seth Alves
f91df4997d
re-enable falling-back to default avatar if an avatar's url is bad
2016-08-02 11:55:11 -07:00
Seth Alves
75f9626c2d
if MyAvatar simulation is cut short (due to no skeleton), still update the head position
2016-08-02 11:50:53 -07:00
Seth Alves
56af36ae64
set head position of other avatars even if they can't be drawn
2016-08-02 11:29:43 -07:00
Seth Alves
229b8d3b5e
testing a more explicit fix of the audio failure
2016-08-02 10:46:11 -07:00
Seth Alves
ed4b0b3589
call _skeletonModel.setURL, but leave our copy of _skeletonModelURL alone. This is so that we don't redo this every time we receive an identity packet from the avatar with the bad url.
2016-08-02 09:57:17 -07:00
Anthony J. Thibault
ed7eaebea8
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-02 09:23:18 -07:00
Seth Alves
5a1fe39737
Merge branch 'master' of github.com:highfidelity/hifi into overlay-children
2016-08-01 18:57:32 -07:00
David Kelly
1d7cdff2bc
Snapshot button plus script
...
Minor change to allow snapshots to not notify (though the old way
with CTRL+S still does). Added button to do it, saves them to disk.
The plan is for us to add UI to share (or not) the snapshot. That's
why we are not going through the notifications. Also, the
script makes sure to hide/unhide hud and overlays. Next we will upload
the pick to AWS via data-web (if you are logged in), and _then_ make
the share UI.
2016-08-01 18:21:01 -07:00
Seth Alves
b953e6f0ff
when an avatar URL fails, switch to the default
2016-08-01 18:12:30 -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
Ryan Huffman
604c8f4a36
Merge pull request #8337 from humbletim/fix-Assets-getMapping
...
fix Assets.getMapping(path, callback) to return a value
2016-08-01 13:32:08 -07:00
howard-stearns
45a49c390b
Merge branch 'discovery' of https://github.com/highfidelity/hifi into scroll
2016-08-01 13:09:20 -07:00
howard-stearns
7cf41d441e
filtering by place
2016-08-01 12:28:57 -07:00
Seth Alves
28e0ca2e49
when a parent of a 3d overlay is deleted, delete the overlay
2016-08-01 10:55:34 -07:00
Seth Alves
70becfaff1
avoid some unneeded SpatiallyNestable transform-locks
2016-08-01 08:20:24 -07:00
Seth Alves
6f3146f872
oops, position and rotation are local, by this point
2016-08-01 08:00:51 -07:00
Seth Alves
182829e64c
get transform once rather than 3 times
2016-08-01 07:49:57 -07:00
Seth Alves
bddff3341a
angry De Morgan
2016-08-01 07:49:22 -07:00
Seth Alves
627048db84
pull missing location properties from overlay
2016-07-31 16:36:14 -07:00
