Ryan Huffman
240dba5306
Fix oculus touch labels in tutorial
2016-12-20 07:45:35 -08:00
Ryan Huffman
74b07273d6
Update oculus touch labels to be emissive
2016-12-20 07:45:35 -08:00
Ryan Huffman
1ddc869c8e
Fix emissive channel on touch models
2016-12-20 07:45:35 -08:00
Ryan Huffman
495a61ced4
Update right joystick mesh
2016-12-20 07:45:35 -08:00
Ryan Huffman
ac33bf4d4a
Fix right touch joystick
2016-12-20 07:45:35 -08:00
Ryan Huffman
335e91e4a6
Update touch controller tips
2016-12-20 07:45:35 -08:00
Ryan Huffman
b835fc7ada
Add touch controller support to ControllerDisplay
2016-12-20 07:45:35 -08:00
Ryan Huffman
b6759fb1d1
Extend HMD scripting interface to check subdevices
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
1b8108bfba
Update from Seth
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
77676436a2
Missing comment close
2016-12-20 07:45:35 -08:00
David Rowe
5bb497d258
Initial fix for detaching tablet UI
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
6680395e97
Add scriptEvent message to web3d overlay event bridge
2016-12-20 07:43:48 -08:00
howard-stearns
641f98589a
don't keep selection while things are disappearing
2016-12-20 07:43:48 -08:00
howard-stearns
db68a6adcd
fix broken search for myself
2016-12-20 07:43:48 -08:00
howard-stearns
07ab771c2b
update canKick whenever we get new data, instead of just at first use.
2016-12-20 07:43:48 -08:00
howard-stearns
d0cdd4d5c1
missing the ban button
2016-12-20 07:43:48 -08:00
howard-stearns
0e9b1b45f4
Don't show admin columns if you can't kick.
2016-12-20 07:43:48 -08:00
howard-stearns
5a97156151
no debug printing
2016-12-20 07:43:48 -08:00
howard-stearns
946d9aa346
checkpoint
2016-12-20 07:43:48 -08:00
howard-stearns
7e7ce0c103
checkpoint
2016-12-20 07:43:48 -08:00
Howard Stearns
b6b80fb9c1
checkpoint
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
39d01b8755
Raise and lower keyboard on password fields
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
0accdddc8f
Fix Web overlay x, y coordinate calcs
2016-12-20 07:42:21 -08:00
David Rowe
17831e3b6a
Fix Overlays.getProperty method not returning value to script
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
73df11bddf
Fix build warnings
2016-12-20 07:40:28 -08:00
David Rowe
2216ab6def
Delete redundant code
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
bebedd8e51
Add JavaScript event bridge for Web 3D overlay
2016-12-20 07:40:28 -08:00
David Rowe
767b3ea8e9
Add script injection to Web 3D overlay
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
5a550e5fc9
Refactoring
2016-12-20 07:38:25 -08:00
David Rowe
aca0e15503
Add mouse hover handling to Web overlay
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
5db2fad6ec
Fix Web 3D overlay ray intersection then comment out for performance
...
Per Image3DOverlay.
2016-12-20 07:38:25 -08:00
David Rowe
ef488ec036
Get script injection working in new marketplaces window
2016-12-20 07:33:55 -08:00
David Rowe
5690bc30ea
Automatically continue once Zip file is ready
2016-12-20 07:33:55 -08:00
David Rowe
e40b71b3dd
Customize Clara item menu
2016-12-20 07:33:55 -08:00
David Rowe
c7c3dfef3e
Fix up library link from Clara item page
2016-12-20 07:33:55 -08:00
David Rowe
f7503ba46c
Display "image" option for each Clara marketplace item
2016-12-20 07:33:55 -08:00
David Rowe
1987719cfd
Display Clara.io download information
2016-12-20 07:33:55 -08:00
David Rowe
9c2252bd7e
Fix typo
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
b672b7e177
Fix Clara download failing if move mouse after initiating download
2016-12-20 07:33:55 -08:00
David Rowe
e79f6b1203
Don't raise keyboard for non-text HTML input fields
2016-12-20 07:33:55 -08:00
David Rowe
196473f9fa
Provide keyboard in marketplaces window
2016-12-20 07:33:55 -08:00
David Rowe
b3cc69d608
Inject keyboard raising and lowering script into marketplaces window
2016-12-20 07:33:55 -08:00
David Rowe
420f65b1aa
Add keyboard control to marketplaces window
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
7f809083dc
Use Clara.io API for FBX downloads
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
09ee7b1bd4
Hide brief flash of browser window used for download
2016-12-20 07:33:55 -08:00
David Rowe
a4b2077d5a
Set auto adding for Clara downloads
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
David Rowe
5f7a2f3b3c
Canonical default browser URL
2016-12-20 07:33:55 -08:00
David Rowe
211cf7a81a
Make Clara.io download more robust
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
Anthony J. Thibault
a791ddcc22
Tablet can switch to a web url.
...
Help button has been updated to switch to the help.html. It doesn't look good because
the content was authored expecting landscape window, not portrait.
The API is by no means final. But it exposes two methods to JS.
* Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will
hooked up to the tablet button.
* Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url.
tabletTest.js and help.js have been updated to use this functionality.
2016-12-19 17:52:19 -08:00
Brad Hefta-Gaub
df954cab10
remove some log spam, recatargorize script logs to allow fine grain filtering
2016-12-19 16:15:10 -08:00
Howard Stearns
891aba31a1
Merge pull request #9233 from samcake/ambient
...
Introducing a fix for the overlayered model drawn in front
2016-12-19 15:56:32 -08:00
howard-stearns
60cb7acb50
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-19 15:28:07 -08:00
Anthony J. Thibault
856791c11d
Made TabletRoot.qml the main tablet qml file.
...
This file uses a Loader node to load, Tablet.qml.
2016-12-19 15:15:16 -08:00
samcake
c435afb728
Introducing a fix for the overlayered model drawn in front
2016-12-19 13:17:56 -08:00
Anthony J. Thibault
10f9233c90
Fixed js interface after recent Tablet.qml changes
...
* TabletButton.inDebugMode defaults to false
* TabletButton now listens to onIsActiveChanged event to flip state of button.
* Fixed help.js and tabletTest.js to compensate for the removal of the TabletButton.color property
2016-12-19 12:20:56 -08:00
Zach Fox
a912fec496
PR comments; need particular fix on Master for full QA
2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4
Comments and clarity
2016-12-19 10:20:08 -08:00
Zach Fox
aa837d8858
It's working! Untested on human avatars.
2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08
Super close
2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f
Checkpoint
2016-12-19 10:20:08 -08:00
Faye Li Si Fi
edd1a02aa1
added debug mode
2016-12-19 09:19:36 -08:00
howard-stearns
9d9345cb65
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-19 09:19:14 -08:00
Faye Li Si Fi
434e7dfbbd
reduce testing buttons number to 6
2016-12-19 09:13:12 -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
Faye Li Si Fi
01c5c2745d
remove commented out code, added uuid property
2016-12-16 16:29:02 -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
188bf600d1
Fix oculus touch labels in tutorial
2016-12-16 15:05:17 -08:00
Ryan Huffman
46251e805a
Update oculus touch labels to be emissive
2016-12-16 15:05:17 -08:00
Ryan Huffman
46f5494af8
Fix emissive channel on touch models
2016-12-16 15:05:17 -08:00
Ryan Huffman
a1fea65aa5
Update right joystick mesh
2016-12-16 15:05:17 -08:00
Ryan Huffman
3df1819086
Fix right touch joystick
2016-12-16 15:05:17 -08:00
Ryan Huffman
cde558fb94
Update touch controller tips
2016-12-16 15:05:17 -08:00
Ryan Huffman
674bbe7de5
Add touch controller support to ControllerDisplay
2016-12-16 15:05:17 -08:00
Ryan Huffman
90e121ba47
Extend HMD scripting interface to check subdevices
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
howard-stearns
3adc78fecc
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de
sessionDisplayName set at server and passed to all clients (including
...
oneself)
2016-12-16 14:15:20 -08:00
Brad Davis
30a9961362
tracing polish
2016-12-16 14:02:27 -08:00
Faye Li Si Fi
4d98f6979c
hover state glow
2016-12-16 13:43:47 -08:00
Andrew Meadows
ee6a9f4506
adding profile stats relating to avatar CPU costs
2016-12-16 13:41:31 -08:00
Faye Li Si Fi
5200dd9581
New color scheme and button state styling
2016-12-16 11:50:04 -08:00
Anthony J. Thibault
3610beb2cd
bug-fix found in code review
2016-12-16 09:57:12 -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
David Rowe
9bf8f25ed0
Update from Seth
2016-12-16 16:11:27 +13:00
Anthony J. Thibault
5441d33a25
Support for the ablity to change button properties from js.
2016-12-15 18:17:14 -08:00
Brad Hefta-Gaub
8497ad1e29
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
2016-12-15 16:42:41 -08:00
Anthony J. Thibault
5d1ccfbccc
Tablet#removeButton now works properly
2016-12-15 15:49:37 -08:00
David Rowe
9aaf55e6a3
Fix crash after manually closing Clara download status message box
2016-12-16 12:49:26 +13:00
Brad Hefta-Gaub
ed19b4b592
remove compression at the per avatar data buffer for now, since it gave no benefit
2016-12-15 14:13:38 -08: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
4494edae33
Merge pull request #9210 from zfox23/FB_2591
...
FB 2591: Taking simultaneous GIF snapshots crashes Interface
2016-12-15 07:01:58 -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
Anthony J. Thibault
d2c4417b24
Hook up Help button to the new Tablet interface
2016-12-14 17:05:47 -08:00
howard-stearns
ae4064f445
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-14 17:04:52 -08:00
David Rowe
23b8bf7aab
Fix crashing if manually close Clara download status message box
2016-12-15 13:35:58 +13:00
Atlante45
588fdd6efa
Add steamworks to interface externals
2016-12-14 16:07:33 -08:00
Atlante45
bfc789f072
CR - CLI text
2016-12-14 15:44:00 -08: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
David Rowe
fa6f121ff2
Missing comment close
2016-12-15 11:51:28 +13:00
David Rowe
b55c558f96
Initial fix for detaching tablet UI
2016-12-15 11:11:40 +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
Zach Fox
c53111781b
Fix the bug
2016-12-14 12:17:00 -08:00
Anthony J. Thibault
db0b2ba7d3
Fleshing out TabletScriptingInterface.
...
Added TabletProxy and TabletButtonProxy
2016-12-14 12:08:41 -08:00
Anthony J. Thibault
d94da76b72
Added TabletScriptingInterface
2016-12-14 12:08:40 -08:00
Brad Hefta-Gaub
2290179281
add compression and minimal data flags to AvatarData
2016-12-14 11:47:45 -08:00
Faye Li Si Fi
a651e19bdd
audio gradient bar length as a function of 0 to 1
2016-12-14 11:38:36 -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
Zach Pomerantz
bbb7229392
skip graphics config if not in engine
2016-12-13 20:47:28 -05: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
d546b69daf
Add scriptEvent message to web3d overlay event bridge
2016-12-14 14:30:02 +13:00
howard-stearns
4503855ae8
don't keep selection while things are disappearing
2016-12-13 17:00:24 -08:00
howard-stearns
a50b731faa
fix broken search for myself
2016-12-13 16:52:18 -08:00
Brad Hefta-Gaub
e3bc49c302
drop avatar data rate to 45hz
2016-12-13 16:51:59 -08:00
howard-stearns
773bbc4ef1
update canKick whenever we get new data, instead of just at first use.
2016-12-13 16:30:16 -08:00
howard-stearns
00653b6b19
missing the ban button
2016-12-13 16:23:43 -08:00
Zach Pomerantz
bc59be12ef
create flagged forward render task
2016-12-13 19:19:30 -05:00
Faye Li
53263789a0
fix relative path
2016-12-13 16:04:25 -08:00
howard-stearns
03d3e0b550
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-13 16:03:00 -08:00
Faye Li
5b8e80654d
button glow on hover
2016-12-13 16:01:50 -08:00
Faye Li
ad905ac6dc
drop shadow on tablet buttons + set text at instantiation
2016-12-13 15:32:21 -08:00
Brad Hefta-Gaub
a2ba03284e
Merge pull request #9186 from ZappoMan/kinectPlugin
...
Kinect Plugin
2016-12-13 15:29:41 -08:00
howard-stearns
b0a69468d2
Don't show admin columns if you can't kick.
2016-12-13 15:16:18 -08:00
howard-stearns
adbfa0752a
no debug printing
2016-12-13 15:09:46 -08:00
howard-stearns
c9827d1521
checkpoint
2016-12-13 15:05:08 -08:00
howard-stearns
86010af828
checkpoint
2016-12-13 13:01:45 -08:00
Faye Li
8fcc42e537
overriding colors at tablet buttons instantiation
2016-12-13 12:34:38 -08:00
Faye Li
dc72a0fd2f
tablet mic mute and unmute icons
2016-12-13 12:18:19 -08:00
howard-stearns
6fc27ac8d6
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
2016-12-13 09:39:51 -08:00
Howard Stearns
7c92ad5ced
checkpoint
2016-12-13 09:15:28 -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
20623ebddb
Raise and lower keyboard on password fields
2016-12-13 22:48:17 +13:00