Ryan Huffman
|
a72f8cac0e
|
Update to only send users to tutorial if they have Vive or Touch
|
2016-12-20 07:45:35 -08:00 |
|
Ryan Huffman
|
4e29d7a2b8
|
Add send-to-tutorial logic for Oculus Touch
|
2016-12-20 07:45:35 -08:00 |
|
Brad Davis
|
d0d6b1f87e
|
tracing polish
|
2016-12-20 07:45:35 -08:00 |
|
Andrew Meadows
|
e03e57a480
|
adding profile stats relating to avatar CPU costs
|
2016-12-20 07:45:35 -08:00 |
|
Ryan Huffman
|
21bab49f79
|
Add chrome tracing support
|
2016-12-20 07:45:35 -08:00 |
|
David Rowe
|
898372e841
|
Fix crash after manually closing Clara download status message box
|
2016-12-20 07:45:35 -08:00 |
|
David Rowe
|
6d0bb3bdc7
|
Make manually closing message box code more correct
|
2016-12-20 07:45:35 -08:00 |
|
Zach Pomerantz
|
13d3ffd47c
|
change render forward flag to HIFI_...
|
2016-12-20 07:45:35 -08:00 |
|
David Rowe
|
3ebfc130c0
|
Scale all imported Clara models to have max dimension of exactly 1m
|
2016-12-20 07:45:35 -08:00 |
|
David Rowe
|
d933b3506f
|
Fix Clara download status message box not auto-closing
|
2016-12-20 07:45:35 -08:00 |
|
David Rowe
|
fa9aef8b22
|
Fix crashing if manually close Clara download status message box
|
2016-12-20 07:45:35 -08:00 |
|
David Rowe
|
7a9cf498dc
|
Increase resize timeout to 5 mins to improve the odds of model rezzing
Model needs to rez in order for its initial dimensions to be obtained
from FBX.
|
2016-12-20 07:45:35 -08:00 |
|
David Rowe
|
a63beedff4
|
Rescale models if necessary to have their largest dimension be 1m
Models are still rescaled beforehand if thought to be in cm.
|
2016-12-20 07:45:35 -08:00 |
|
David Rowe
|
e9dbb32277
|
Handle unzip failure
|
2016-12-20 07:45:35 -08:00 |
|
David Rowe
|
0ec1dc6c85
|
Log requested ATP mapping of model upload
|
2016-12-20 07:45:35 -08:00 |
|
David Rowe
|
d02e217b49
|
Don't make downloaded Clara.io models dynamic
|
2016-12-20 07:45:35 -08:00 |
|
David Rowe
|
932b05c1ba
|
Rework Clara.io download user messaging to have no user interaction
|
2016-12-20 07:45:35 -08:00 |
|
David Rowe
|
c4ff129f86
|
Inform user if can't do Clara.io download because can't write to ATP
|
2016-12-20 07:43:48 -08:00 |
|
David Rowe
|
f3899736e8
|
Auto-close Clara model download progress box when model added to world
|
2016-12-20 07:43:48 -08:00 |
|
David Rowe
|
825225fcb2
|
Make Clara.io models grabbable and dynamic by default
|
2016-12-20 07:43:48 -08:00 |
|
David Rowe
|
591bc245bd
|
Fix model being left invisible if not auto-resized
|
2016-12-20 07:43:48 -08:00 |
|
David Rowe
|
a4ff4f61b9
|
Increase auto-resize timeout for Clara.io asset download from ATP
|
2016-12-20 07:43:48 -08:00 |
|
David Rowe
|
5b8a9c0bcd
|
Add extra logging for Clara.io asset resizing
|
2016-12-20 07:43:48 -08:00 |
|
howard-stearns
|
8d300eac76
|
pal prototype
|
2016-12-20 07:43:48 -08:00 |
|
David Rowe
|
25651800dd
|
Code review
|
2016-12-20 07:43:48 -08:00 |
|
David Rowe
|
9f4df9bd07
|
Fix model auto-scaling to 1% not being seen by observers take 2
|
2016-12-20 07:43:48 -08:00 |
|
David Rowe
|
58edbf4eaf
|
Fix model auto-scaling to 1% not being seen by observers
|
2016-12-20 07:43:48 -08:00 |
|
Seth Alves
|
67093dc519
|
don't flutter tablet when menu button is pressed. start on a stylus
|
2016-12-20 07:43:48 -08:00 |
|
David Rowe
|
7a36e4eed8
|
Fix keyboard focus when switch highlight between overlays and entities
|
2016-12-20 07:42:21 -08:00 |
|
David Rowe
|
d13e990ebe
|
Rescale large Clara.io models to 1% instead of 10%
|
2016-12-20 07:42:21 -08:00 |
|
David Rowe
|
f749c76ced
|
First pass at controller interaction with 3D Web overlay
|
2016-12-20 07:42:21 -08:00 |
|
David Rowe
|
367e758dc6
|
Fix compiler warning
|
2016-12-20 07:42:21 -08:00 |
|
David Rowe
|
d06a0ce9f5
|
Auto-resize Clara.io models if larger than 10m as likely in cm or mm
|
2016-12-20 07:42:21 -08:00 |
|
David Rowe
|
527757cd22
|
Add further user feedback on Clara download progress
|
2016-12-20 07:40:28 -08:00 |
|
David Rowe
|
4cbd64b75e
|
Improve temporary download directory robustness
|
2016-12-20 07:40:28 -08:00 |
|
David Rowe
|
5843185683
|
Tidying
|
2016-12-20 07:40:28 -08:00 |
|
David Rowe
|
5fbdd64fff
|
Handle Clara marketplace downloads
|
2016-12-20 07:40:28 -08:00 |
|
David Rowe
|
e85bc50333
|
Tidying
|
2016-12-20 07:38:25 -08:00 |
|
David Rowe
|
44f36a9dae
|
Highlight Web overlay with focus
|
2016-12-20 07:38:25 -08:00 |
|
David Rowe
|
92b72af71c
|
Direct keyboard input to Web overlay when has focus
|
2016-12-20 07:38:25 -08:00 |
|
David Rowe
|
e3444e1861
|
Add mouse press, move, and release handling to Web overlay
|
2016-12-20 07:38:25 -08:00 |
|
David Rowe
|
1987719cfd
|
Display Clara.io download information
|
2016-12-20 07:33:55 -08:00 |
|
David Rowe
|
43ebdf97cb
|
Tidy UI text
|
2016-12-20 07:33:55 -08:00 |
|
David Rowe
|
6329b670c9
|
Improve error handling for case that don't have permissions
|
2016-12-20 07:33:55 -08:00 |
|
David Rowe
|
bf2bcc0b80
|
Add user feedback on download process
|
2016-12-20 07:33:55 -08:00 |
|
David Rowe
|
e41d178534
|
Default collision shap to hull per submesh instead of static
|
2016-12-20 07:33:55 -08:00 |
|
David Rowe
|
e1a135591f
|
Code tidying
|
2016-12-20 07:33:55 -08:00 |
|
David Rowe
|
4cabf49b23
|
Handle duplicate Clara download asset names
|
2016-12-20 07:33:55 -08:00 |
|
David Rowe
|
0ccff32365
|
Delete temporary directory after content has been used
|
2016-12-20 07:33:55 -08:00 |
|
David Rowe
|
7e8fc12258
|
Automatically download Clara model to ATP and add to world
|
2016-12-20 07:33:55 -08:00 |
|
David Rowe
|
467741f348
|
Add parameter that enables automatically adding download model to world
|
2016-12-20 07:33:55 -08:00 |
|
Brad Hefta-Gaub
|
c65471e880
|
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
Conflicts:
libraries/script-engine/src/FileScriptingInterface.cpp
|
2016-12-19 22:27:24 -08:00 |
|
Brad Hefta-Gaub
|
0c9ff87feb
|
add support for an HMD script debug log window
|
2016-12-19 19:34:14 -08:00 |
|
Chris Collins
|
61c60fca2d
|
Merge pull request #8968 from ctrlaltdavid/21089
Clara.io marketplace improvements
|
2016-12-19 18:21:45 -08:00 |
|
Brad Davis
|
ee3c8e6efd
|
Merge pull request #9225 from jherico/chrome_tracing
Additional work on tracing
|
2016-12-16 17:53:55 -08:00 |
|
Brad Davis
|
2d73588361
|
Fix stat tracker missing in agents
|
2016-12-16 17:34:00 -08:00 |
|
Ryan Huffman
|
217d46704d
|
Update req tutorial version for Oculus Touch
|
2016-12-16 15:41:04 -08:00 |
|
Ryan Huffman
|
b9598a28f3
|
Update to only send users to tutorial if they have Vive or Touch
|
2016-12-16 15:05:17 -08:00 |
|
Ryan Huffman
|
c953ceb58b
|
Add send-to-tutorial logic for Oculus Touch
|
2016-12-16 15:05:17 -08:00 |
|
samcake
|
1ded581895
|
Merge pull request #9217 from zzmp/feat/render-forward-bounds
Render bounds in Forward Render Task
|
2016-12-16 14:57:14 -08:00 |
|
Brad Davis
|
30a9961362
|
tracing polish
|
2016-12-16 14:02:27 -08:00 |
|
Andrew Meadows
|
ee6a9f4506
|
adding profile stats relating to avatar CPU costs
|
2016-12-16 13:41:31 -08:00 |
|
Ryan Huffman
|
7bb2755913
|
Add chrome tracing support
|
2016-12-16 01:14:01 -08:00 |
|
David Rowe
|
9459b967be
|
Merge branch 'master' into 21089
|
2016-12-16 20:02:43 +13:00 |
|
Brad Hefta-Gaub
|
8497ad1e29
|
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
|
2016-12-15 16:42:41 -08:00 |
|
David Rowe
|
9aaf55e6a3
|
Fix crash after manually closing Clara download status message box
|
2016-12-16 12:49:26 +13:00 |
|
Howard Stearns
|
ba8b585368
|
Merge pull request #9202 from howard-stearns/pal-proto
People Action List prototype
|
2016-12-15 13:56:12 -08:00 |
|
Anthony J. Thibault
|
8b99fa90e8
|
Merge branch 'master' into tablet-ui
|
2016-12-15 13:28:23 -08:00 |
|
David Rowe
|
b8114b29b2
|
Make manually closing message box code more correct
|
2016-12-16 09:47:11 +13:00 |
|
Zach Pomerantz
|
41f6990051
|
change render forward flag to HIFI_...
|
2016-12-15 14:53:51 -05:00 |
|
samcake
|
7a29dbe7d4
|
Merge pull request #9207 from zzmp/feat/render-forward-empty
Forward render task (empty and only used with RENDER_FORWARD set)
|
2016-12-15 09:57:18 -08:00 |
|
Seth Alves
|
26639aac15
|
Merge pull request #8789 from Atlante45/fix/settings
Use JSON for application Settings
|
2016-12-15 07:00:46 -08:00 |
|
David Rowe
|
16418d52d2
|
Scale all imported Clara models to have max dimension of exactly 1m
|
2016-12-15 20:11:29 +13:00 |
|
David Rowe
|
349765ad74
|
Fix Clara download status message box not auto-closing
|
2016-12-15 16:00:07 +13:00 |
|
David Rowe
|
23b8bf7aab
|
Fix crashing if manually close Clara download status message box
|
2016-12-15 13:35:58 +13:00 |
|
Atlante45
|
0dec97fc03
|
Make Steamworks a plugin
|
2016-12-14 15:37:49 -08:00 |
|
David Rowe
|
eb293fb579
|
Increase resize timeout to 5 mins to improve the odds of model rezzing
Model needs to rez in order for its initial dimensions to be obtained
from FBX.
|
2016-12-15 12:26:53 +13:00 |
|
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 |
|
Anthony J. Thibault
|
d4f9d21ce8
|
Pass tablet QQuickItem to TabletScriptingInterface
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
|
2016-12-14 14:04:48 -08: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 |
|
Anthony J. Thibault
|
db0b2ba7d3
|
Fleshing out TabletScriptingInterface.
Added TabletProxy and TabletButtonProxy
|
2016-12-14 12:08:41 -08:00 |
|
David Rowe
|
934f48362a
|
Rework Clara.io download user messaging to have no user interaction
|
2016-12-14 22:23:25 +13:00 |
|
Brad Hefta-Gaub
|
a7750501c6
|
first cut at adding view frustum support to avatar mixer
|
2016-12-13 18:58:11 -08: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 |
|
Zach Pomerantz
|
bc59be12ef
|
create flagged forward render task
|
2016-12-13 19:19:30 -05:00 |
|
howard-stearns
|
6fc27ac8d6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
|
2016-12-13 09:39:51 -08: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 |
|
Stephen Birarda
|
b4f43e01b1
|
Merge pull request #9189 from huffman/feat/help-touch
Add support for oculus touch in help menu
|
2016-12-12 16:48:00 -08:00 |
|
howard-stearns
|
712543a39a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
|
2016-12-12 16:37:41 -08:00 |
|
howard-stearns
|
4b5aae3c55
|
pal prototype
|
2016-12-12 16:37:16 -08:00 |
|
Seth Alves
|
d97be52542
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2016-12-12 16:24:17 -08: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 |
|