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
elisa-lj11
cdc5dde40e
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-23 11:22:43 -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
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
howard-stearns
d0b58d8f8e
move thread safety into Application from caller
2016-08-22 12:49:51 -07:00
howard-stearns
80afc6a3b4
pr review comments
2016-08-22 10:59:21 -07:00
Anthony J. Thibault
b6a4904068
remove explicit check for WebEntity from setKeyboardFocus
...
Also, don't get entityTree from entityScriptInterface instead go thru EntityTreeRenderer
2016-08-22 10:56:35 -07:00
Ryan Huffman
bd86318611
Fix address bar being opened when moving between places on same domain
2016-08-22 10:36:56 -07:00
howard-stearns
02d3666d86
code review cleanup
2016-08-22 09:58:27 -07:00
Seth Alves
9bcda1bb45
merge from upstream
2016-08-20 15:25:04 -07:00
Howard Stearns
f877e65703
larger story card
2016-08-20 10:45:02 -07:00
Howard Stearns
7428eb2635
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-19 21:34:55 -07:00
James B. Pollack
0d42920f1b
Merge remote-tracking branch 'upstream/master' into demo_movement
2016-08-19 16:45:44 -07:00
howard-stearns
993340811f
switch over to metaverse server user story cards
2016-08-19 16:40:53 -07:00
howard-stearns
a3d64dbd9c
code cleanup
2016-08-19 14:14:31 -07:00
howard-stearns
b8b345fb43
Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2
2016-08-19 13:04:39 -07:00
elisa-lj11
4aab389305
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-19 11:32:37 -07:00
elisa-lj11
8bc9a92429
removed extraneous debug prints
2016-08-19 11:32:13 -07:00
Anthony J. Thibault
8bb6bb7c6f
generalized keyboard focus interface
...
Removed dynamic casts to RenderableWebEntityItem, instead
virtual methods were added to EntityItem to facilitate this.
* bool wantsKeyboardFocus()
* void setProxyWindow()
* QObject* getEventHandler()
2016-08-19 10:56:52 -07:00
James B. Pollack
98f0290565
Merge pull request #8436 from huffman/feat/more-user-activity-data
...
Add more user activity data
2016-08-19 10:48:28 -07:00
elisa-lj11
4c434e875e
fixed merge conflicts in Application.cpp
2016-08-19 09:46:22 -07:00
howard-stearns
f6670a6374
new optional aspect-ratio argument to snapshot chain (javascript through
...
c++ display plugin). When non-zero, it pulls out the largest piece from
the center that maintains that ratio. Snapshot button uses 1.91.
2016-08-18 16:29:42 -07:00
howard-stearns
4492c4e64e
Allow javascript to safely open the correct login window (or answer that
...
it is unneded).
2016-08-18 14:19:36 -07:00
James B. Pollack
402bad3417
Merge remote-tracking branch 'upstream/master' into demo_movement
2016-08-18 13:43:54 -07:00
Brad Hefta-Gaub
1cec7b2db0
Merge pull request #8429 from SamGondelman/loadingFade2
...
Don't do fade effect once physics kick in
2016-08-18 12:46:24 -07:00
Chris Collins
140b0c4d02
Merge pull request #8462 from jherico/openvr_random_position_fix
...
Address issues with random camera locations
2016-08-18 11:51:47 -07:00
Seth Alves
15ce40ecf4
merge from upstream
2016-08-18 11:46:02 -07:00
Clément Brisset
d1fb723b01
Merge pull request #8444 from zzmp/fix/skybox
...
fix flashing in default skybox, and allow skybox lighting without textures
2016-08-18 11:07:09 -07:00
James B. Pollack
1eaac8605f
invert the structure and make it work with oculus
2016-08-18 10:43:37 -07:00
Seth Alves
ccaf7379fc
missed some more due to conditional compilation
2016-08-18 10:31:53 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
Seth Alves
8487f825a0
don't return reference to local variables
2016-08-18 08:01:42 -07:00
Seth Alves
2ff35768aa
make 3d-line overlays work again
2016-08-17 18:45:09 -07:00
howard-stearns
0f415abd6b
dual purpose address bar - switchable between html and qml
2016-08-17 16:56:52 -07:00
Ryan Huffman
25b9d756ca
Update entity edit tracking to track count rather than bool
2016-08-17 16:54:04 -07:00
Brad Davis
89df5768f3
Merge pull request #8435 from imgntn/touch_grip
...
Map oculus touch grip to trigger
2016-08-17 16:38:58 -07:00
howard-stearns
d58cc8ddd9
use html card from user_story id, and close things when
...
receiveHifiSchemeUrl
2016-08-17 16:35:29 -07:00
