Dante Ruiz
200f6d540a
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-09-06 09:59:51 -07:00
Dante Ruiz
93b0f15116
addressing some feedback
2018-08-30 13:22:17 -07:00
John Conklin II
f5ebdfa233
Merge pull request #13905 from zfox23/fixPr13870
...
Fixup PR13870: Make the feature work in Master
2018-08-30 11:08:23 -07:00
Dante Ruiz
8c77820e30
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-30 09:45:41 -07:00
Zach Fox
b8cd5dd8b9
Fixup PR13870: Make the feature work in Master
2018-08-29 16:58:19 -07:00
John Conklin II
7298cb4654
Merge pull request #13888 from dback2/editControllerMapping
...
Edit mode controller mapping using new platform state variables
2018-08-29 16:06:47 -07:00
John Conklin II
47ce8be526
Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847
...
MS16847: Tablet button doesn't load in HMD mode
2018-08-29 13:20:04 -07:00
David Back
96d2ba660c
Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping
2018-08-29 12:05:51 -07:00
David Back
0e53fa3f8b
only focus with selection
2018-08-29 12:05:46 -07:00
David Back
dcf2074d7e
remove [ camera key, allow F to enter camera without selection
2018-08-29 11:56:37 -07:00
David Back
511478a563
use not Mac instead of Windows
2018-08-27 18:11:19 -07:00
David Back
f81fe6b29f
add more inputs to controller mapping
2018-08-27 16:35:36 -07:00
Seth Alves
52bbb4d2ab
fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.
2018-08-27 16:21:01 -07:00
David Back
b6edb2c9d6
platform states, edit controller mapping, separate mac/win delete
2018-08-27 14:53:13 -07:00
danteruiz
e4293d9ad5
fixing some entity visual problems
2018-08-26 21:50:01 -07:00
Dante Ruiz
af19849a75
fixing merge conflict
2018-08-24 15:48:42 -07:00
Dante Ruiz
3796675123
script update and visuallyReady entities
2018-08-24 15:46:39 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom
...
Enable bloom in zone properties
2018-08-24 14:46:31 -07:00
Howard Stearns
9a472fa388
Merge pull request #13870 from zfox23/wallet_autologout
...
Implement Wallet Security feature - Auto Logout checkbox
2018-08-23 18:04:38 -07:00
Zach Fox
dddb2141f0
Implement Wallet Security feature - Auto Logout checkbox
2018-08-23 15:45:29 -07:00
Zach Fox
e3d03cd321
Fix MS17738: Fix a case where the BLAST icon didn't show up in Snapshot Review
2018-08-23 13:16:02 -07:00
Dante Ruiz
bb83a2f620
interstitial script ending cleanup fixes
2018-08-22 16:48:10 -07:00
Dante Ruiz
f5441b2721
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-22 15:28:42 -07:00
Dante Ruiz
78458d62de
revert some changes and fix toolbar issue
2018-08-22 15:20:56 -07:00
Dante Ruiz
535fdf32cf
saving changes
2018-08-22 13:13:00 -07:00
John Conklin II
32562511e8
Merge pull request #13782 from ElderOrb/FB17184
...
Add Support for Managing Avatar Entities to the Avatar App
2018-08-22 10:20:04 -07:00
Dante Ruiz
26a30edec9
trying to fix loading bar
2018-08-21 18:27:21 -07:00
Dante Ruiz
71e8ccd190
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-21 16:20:16 -07:00
Wayne Chen
4e9a544618
redoing newline
2018-08-21 16:01:24 -07:00
Wayne Chen
bb176eb228
trailing debug statements
2018-08-21 16:00:01 -07:00
John Conklin II
1b4314ae45
Merge pull request #13846 from ctrlaltdavid/M17652-b
...
Reduce strength of teleport parabola
2018-08-21 11:32:40 -07:00
Wayne Chen
bfb9b67968
more debug statements
2018-08-21 11:17:33 -07:00
Dante Ruiz
db3d3d3d93
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-21 09:56:59 -07:00
David Rowe
67eb03ba7d
Reduce strength of teleport parabola
2018-08-21 11:18:00 +12:00
Seth Alves
c876cda89d
Merge pull request #13826 from ctrlaltdavid/M17615
...
Disable Vive teleport button if transitioning from direction button
2018-08-20 14:05:45 -07:00
Dante Ruiz
2261ad2bcb
clean up the interstitial page
2018-08-20 11:14:48 -07:00
Ryan Huffman
ead0126365
Merge pull request #13815 from thoys/fix/create/createZeroRotationEntities
...
MS17562: CreateApp - newly created Entity rotation should be zero
2018-08-20 09:07:38 -07:00
Alexander Ivash
9f92ff5de9
fix for duplicating wearables on saving
...
note: the issue was caused by newly-introduced code converting between attachments & entities
fix removes attachments-related code because attachments are deprecated and converted into entities on the fly
2018-08-18 16:38:35 +03:00
David Rowe
26576fa760
Fix Vive left/right buttons not disabling teleport
2018-08-18 09:34:16 +12:00
David Rowe
5328b48acc
Make Vive snap turn buttons lock teleport, also
2018-08-17 09:09:11 +12:00
David Rowe
bf733ded0f
Handle Vive controller not being available at start-up
2018-08-17 09:08:28 +12:00
John Conklin II
96fd4704ac
Merge pull request #13829 from huffman/fix/edit-zoom-stuck
...
Fix edit orbit camera getting stuck zooming
2018-08-16 08:21:31 -07:00
David Rowe
8d1b947bbd
Fix variable names
2018-08-16 13:35:36 +12:00
elderorb
ea22fdb400
Merge branch 'master' into FB17184
2018-08-16 02:08:47 +03:00
Ryan Huffman
2f833f16d8
Force entity list tool to refresh when opened
2018-08-15 14:19:20 -07:00
Ryan Huffman
24af22a52f
Fix edit orbit camera getting stuck zooming
2018-08-15 13:56:44 -07:00
Seth Alves
83718ca06d
Merge pull request #13746 from alexiamandeville/emoteIcon
...
updating emote app icon
2018-08-15 08:29:48 -07:00
David Rowe
2034162c76
Disable Vive teleport button if transitioning from direction button
2018-08-15 21:31:53 +12:00
Seth Alves
3623590e90
Merge pull request #13784 from sethalves/far-point-joints
...
Far point joints
2018-08-14 15:40:07 -07:00
John Conklin II
8c5344ad1a
Merge pull request #13781 from thoys/fix/localAngularVelocityZeroesOut
...
MS17380: Create App fix for angularVelocity zeroing out on duplication or undo
2018-08-14 11:37:33 -07:00
