David Rowe
c82cceccac
Rescale models if necessary to have their largest dimension be 1m
...
Models are still rescaled beforehand if thought to be in cm.
2016-12-15 12:25:56 +13:00
David Rowe
dbd00e39a8
Handle unzip failure
2016-12-15 11:52:34 +13:00
David Rowe
17c54a5fae
Log requested ATP mapping of model upload
2016-12-15 10:01:19 +13:00
David Rowe
5af57d7bbc
Don't make downloaded Clara.io models dynamic
2016-12-15 09:38:06 +13:00
David Rowe
934f48362a
Rework Clara.io download user messaging to have no user interaction
2016-12-14 22:23:25 +13:00
David Rowe
2b0529bcea
Inform user if can't do Clara.io download because can't write to ATP
2016-12-14 14:45:33 +13:00
David Rowe
2df7c189a2
Auto-close Clara model download progress box when model added to world
2016-12-14 01:22:47 +13:00
David Rowe
5344cc6155
Make Clara.io models grabbable and dynamic by default
2016-12-14 01:15:12 +13:00
David Rowe
c9a00e86d1
Fix model being left invisible if not auto-resized
2016-12-13 18:31:24 +13:00
David Rowe
ea7d84ec7d
Increase auto-resize timeout for Clara.io asset download from ATP
2016-12-13 17:55:44 +13:00
David Rowe
aefa116207
Add extra logging for Clara.io asset resizing
2016-12-13 17:55:22 +13:00
David Rowe
1f3045ad30
Merge branch 'master' into 21089
...
Conflicts:
interface/src/Application.cpp
2016-12-13 14:05:24 +13:00
David Rowe
efb784f703
Code review
2016-12-13 13:11:21 +13:00
samcake
9155f11b3d
Merge pull request #9190 from jherico/test_mode
...
Add test mode to interface
2016-12-12 15:37:05 -08:00
Brad Davis
2a43f5fbef
Add test mode to interface
2016-12-12 14:51:11 -08:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
Clément Brisset
84bf93b0fc
Merge pull request #9154 from highfidelity/revert-9144-revert-9129-audio-dll
...
Restores "Select Audio DLL at runtime"
2016-12-12 13:38:34 -08:00
David Rowe
8a399c7cc0
Fix model auto-scaling to 1% not being seen by observers take 2
2016-12-12 17:01:02 +13:00
David Rowe
4f0c429e7f
Fix model auto-scaling to 1% not being seen by observers
2016-12-11 17:08:36 +13:00
Chris Collins
c912d77a95
Merge pull request #9167 from Atlante45/feat/oculus-reorient-quit
...
Honor reorient and quit request from OVR
2016-12-09 16:03:41 -08:00
David Rowe
a52d8d1982
Merge branch 'master' into 21089
2016-12-10 11:47:43 +13:00
David Rowe
e956608fa4
Fix keyboard focus when switch highlight between overlays and entities
2016-12-09 18:31:52 +13:00
David Rowe
bad8d20dd9
Rescale large Clara.io models to 1% instead of 10%
2016-12-09 17:02:06 +13:00
Atlante45
aa1d90108c
No updater command line argument
2016-12-08 16:35:30 -08:00
Clément Brisset
06331494af
Revert "Revert "Select Audio DLL at runtime""
2016-12-08 14:14:03 -08:00
David Rowe
4c236b293e
First pass at controller interaction with 3D Web overlay
2016-12-09 01:47:40 +13:00
David Rowe
5313a682ad
Fix compiler warning
2016-12-08 19:48:51 +13:00
David Rowe
7eacdb69b5
Auto-resize Clara.io models if larger than 10m as likely in cm or mm
2016-12-08 19:17:26 +13:00
David Rowe
639d7a5d97
Add further user feedback on Clara download progress
2016-12-08 18:36:50 +13:00
Atlante45
7b0b777051
Honor reorient and quit request from OVR
2016-12-07 17:29:54 -08:00
Howard Stearns
2eb8d9d0c4
Merge pull request #9153 from davidkelly/dk/machineFingerprint
...
Machine fingerprint
2016-12-06 16:34:45 -08:00
David Kelly
562cd12bca
More CR feedback
...
Breaking into 2 functions - one public, one private, so I can avoid
nested control structures and so on in dealing with errors on the
windows side of things. So, no more namespace, back to a class with
2 static functions, one public one private
2016-12-06 15:17:47 -08:00
David Rowe
186d3f18ef
Improve temporary download directory robustness
2016-12-07 11:55:17 +13:00
David Rowe
eafd51ba9e
Merge branch 'master' into 21089
2016-12-07 11:27:15 +13:00
David Rowe
8e30674069
Tidying
2016-12-07 09:28:35 +13:00
David Rowe
d857f943f8
Handle Clara marketplace downloads
2016-12-07 09:16:59 +13:00
David Kelly
dc47c5fc0c
CR feedback
...
lame mistake - it is always the error branches that get you.
2016-12-06 11:12:50 -08:00
David Kelly
c40aadfea4
whitespace
2016-12-05 17:13:12 -08:00
Anthony J. Thibault
89ae3b3d6e
Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
...
This reverts commit efe9571ab8333e9ec7f4
2016-12-05 15:18:03 -08:00
Anthony J. Thibault
e8b5b56df7
Revert "Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode"
...
This reverts commit 119653bceba69d77ffbe
2016-12-05 15:16:49 -08:00
Andrew Meadows
119653bceb
Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode
...
Fix for reset sensors while in desktop mode.
2016-12-05 13:46:53 -08:00
Anthony J. Thibault
349f0355ae
Fix for reset sensors while in desktop mode.
...
Previously hitting ' a.k.a. reset sensors, would teleport you to the last
position you were in before you switched into desktop mode, or the spawn location.
This fixes that behavior but not re-centering the avatar while in desktop mode.
2016-12-05 10:42:20 -08:00
David Rowe
2f42f4cfa5
Merge branch 'master' into 21089
2016-12-05 18:33:38 +13:00
David Rowe
71de106594
Tidying
2016-12-04 15:14:47 +13:00
David Rowe
b84bcaf629
Highlight Web overlay with focus
2016-12-04 13:42:12 +13:00
David Rowe
38e6c8075c
Direct keyboard input to Web overlay when has focus
2016-12-04 12:28:44 +13:00
David Rowe
6dbb7129e6
Add mouse press, move, and release handling to Web overlay
2016-12-03 17:09:09 +13:00
David Kelly
643353a31e
Initial push
...
Works on windows, have not tried it on mac. Lots more to do, but
need to get it pushed to remote just in case.
2016-12-02 15:46:20 -08:00
Clément Brisset
3659e8e585
Revert "Select Audio DLL at runtime"
2016-12-02 14:15:11 -08:00
Seth Alves
efe9571ab8
Merge pull request #8691 from highfidelity/out-of-body-experience
...
Room Scale HMD comfort features.
2016-12-01 11:09:39 -08:00
