elisa-lj11
bebf9c5890
Added error feature when user tries to download a non fbx file
2016-08-31 17:46:35 -07:00
elisa-lj11
5c40e9a8f5
Restored download ability and removed extra file types from download options
2016-08-31 15:39:29 -07:00
elisa-lj11
9748a17abe
checking out to try new branch
2016-08-31 15:22:28 -07:00
elisa-lj11
b131338dd0
Injected script to remove other file types from download options
2016-08-31 14:13:26 -07:00
elisa-lj11
d16ef521f4
fixed merge conflicts from Howard's webview fix
2016-08-30 15:33:59 -07:00
Brad Davis
3ca01a1e4b
Merge pull request #8540 from howard-stearns/restore-WebView-tab-handler
...
restore onNewViewRequested
2016-08-30 15:21:27 -07:00
elisa-lj11
aceddb0cf8
merge with james repo
2016-08-30 15:07:01 -07:00
howard-stearns
8824507523
new smaller WebView.qml
2016-08-30 14:37:08 -07:00
elisa-lj11
bbb80f4a55
hello again
2016-08-30 14:24:00 -07:00
elisa-lj11
074f9e0688
test to merge to status_bar branch
2016-08-30 14:15:27 -07:00
howard-stearns
564769f7d3
move WebView.qml to baseWebView.qml
2016-08-30 14:07:34 -07:00
howard-stearns
232ac74b26
back to master version
2016-08-30 14:06:20 -07:00
howard-stearns
c5b998a2a8
use new hook in marketplace code
2016-08-30 12:18:03 -07:00
elisa-lj11
8b62c0e712
switching over to a fork
2016-08-30 11:49:49 -07:00
elisa-lj11
37cc50a14a
Merge remote-tracking branch 'highfidelity/master' into marketplaces_html
2016-08-30 10:45:26 -07:00
elisa-lj11
fa941e4a1b
Merge remote-tracking branch 'origin' into marketplaces_html
2016-08-30 10:42:56 -07:00
Stephen Birarda
74fac8c7c9
Merge pull request #8512 from birarda/shareable-address
...
add shareable address from default name, leverage for steam join/invite
2016-08-30 09:35:24 -07:00
elisa-lj11
6bd41d0dd5
added status bar to marketplace
2016-08-29 18:43:52 -07:00
elisa-lj11
f2e61aa504
added status bar to marketplace
2016-08-29 18:43:32 -07:00
Brad Hefta-Gaub
f3d157c396
Merge pull request #8500 from jherico/gl_context
...
Custom OpenGL context creation
2016-08-29 16:22:21 -07:00
howard-stearns
11f00ed46c
add a hook so that clients can gain access to the new component, window,
...
and request
2016-08-29 14:44:48 -07:00
howard-stearns
6272db42da
restore onNewViewRequested
2016-08-29 13:53:08 -07:00
Howard Stearns
a1ae9eebf2
Merge pull request #8534 from howard-stearns/silence-address-bar-log-warning
...
Silence address bar log warning
2016-08-29 11:48:43 -07:00
Brad Davis
617633b85c
Moving to custom context creation
2016-08-29 11:21:54 -07:00
howard-stearns
01af8899bf
silence address bar dialog qml warning
2016-08-29 10:47:22 -07:00
Brad Davis
587d015c57
Give names to offscreen contexts for easier debugging
2016-08-26 19:09:26 -07:00
Brad Hefta-Gaub
3d6691f3d1
Merge pull request #8527 from zzmp/fix/skybox-default-color
...
fix skybox default
2016-08-26 15:14:44 -07:00
Brad Hefta-Gaub
10c465f591
Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering
...
Improved web entity rendering
2016-08-25 16:49:00 -07:00
Zach Pomerantz
24162f0f3d
set skybox default color to empty color
2016-08-25 12:37:23 -07:00
Anthony J. Thibault
e82f6a90af
Improved web entity rendering
...
* fading now works properly
* web browsers are now fully opaque.
2016-08-25 11:04:23 -07:00
Andrew Meadows
d7bb555987
make menu wording more correct
2016-08-25 08:53:08 -07:00
Andrew Meadows
25fb7aacad
ShapeManager hands out const shape pointers
2016-08-24 22:26:56 -07:00
Anthony J. Thibault
c2af948e25
Merge branch 'master' into feature/handheld-marketplace
2016-08-24 16:07:04 -07:00
James B. Pollack
d9ebad7976
Merge pull request #8372 from elisa-lj11/zip_project
...
Added Clara.io to the marketplace
2016-08-24 15:53:58 -07:00
Zach Pomerantz
c740b263a8
detect unset skybox
2016-08-23 15:16:26 -07:00
Howard Stearns
89b00883dd
Merge pull request #8428 from highfidelity/discovery
...
Snapshot of Snapshot-Discovery to master
2016-08-23 14:32:10 -07:00
Howard Stearns
3f30b23b78
Merge pull request #8496 from huffman/fix/address-bar-popup
...
Fix address bar being opened when moving between places on same domain
2016-08-23 13:08:31 -07:00
Stephen Birarda
9461ca0cfc
use the facing shareable address for steam location
2016-08-23 11:56:18 -07:00
elisa-lj11
cdc5dde40e
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-23 11:22:43 -07:00
Stephen Birarda
fbe784155e
add a shareable address return to address manager
2016-08-23 11:19:14 -07:00
Anthony J. Thibault
b2dff8aa77
Easier to click buttons on web entities with shaky hand controllers
...
There is an angular and time dead spot on webEntity for scrolling vs clicking.
Currently, it's 150 ms and 3 degrees. See POINTER_PRESS_TO_MOVE_DELAY and POINTER_PRESS_TO_MOVE_DEADSPOT_ANGLE
* Fix for warnings when clicking on window.open() links in WebEntity
2016-08-23 10:19:49 -07:00
Anthony J. Thibault
c6ea64926c
Sensor space entity support
...
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space. Essentially, this
gives you the ability to place objects in the user's physical room.
WebTablets now are located in this feature and no longer jitter.
2016-08-23 10:13:06 -07:00
Brad Hefta-Gaub
21bc06f154
Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration
...
handControllerGrab and web entity input integration
2016-08-23 09:59:25 -07:00
howard-stearns
7601876641
Scale the activity card back up to match the window being scaled down, so
...
that it covers the address bar.
2016-08-23 09:44:28 -07:00
David Rowe
f7389dc059
Fix server card window scale
2016-08-23 16:28:32 +12:00
Zach Pomerantz
cbb115bbcc
fix typo argee->agree
2016-08-22 16:34:23 -07:00
howard-stearns
bc90b0bc43
pr review
2016-08-22 16:09:09 -07:00
elisa-lj11
2d2cb45c5d
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-22 16:05:16 -07:00
elisa-lj11
8bf87128d9
Fixed browser.qml 'onNewViewRequested'
2016-08-22 16:04:55 -07:00
howard-stearns
056b90c662
separate into four files
2016-08-22 15:01:55 -07:00
