Andrew Meadows
|
ca70b865d3
|
Merge pull request #13452 from AndrewMeadows/avatar-entities-001
fix physics deactivation of avatar-entities
|
2018-06-25 16:18:01 -07:00 |
|
Zach Fox
|
7a5d794505
|
Fix MS16113: Use alternate method for creating backup instructions
|
2018-06-25 14:40:54 -07:00 |
|
Dante Ruiz
|
7f7ca677f0
|
mac - moving general settings back under settings
|
2018-06-25 14:23:37 -07:00 |
|
Zach Fox
|
3ceb9ddee9
|
Merge pull request #13444 from zfox23/MS16074_16076_banklinks
Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity
|
2018-06-25 13:47:08 -07:00 |
|
Gabriel Calero
|
0a70e844bf
|
Merge remote-tracking branch 'upstream/master' into web_overlay_android
|
2018-06-25 17:41:51 -03:00 |
|
howard-stearns
|
43cba68cd2
|
test wearables for wear before gifting and wearing
|
2018-06-25 13:40:45 -07:00 |
|
Gabriel Calero
|
fedc0a9e61
|
Support web3d overlays in android
|
2018-06-25 16:37:03 -03:00 |
|
Zach Fox
|
3553f97776
|
Merge pull request #13446 from zfox23/MS16088_usernameOverlap
Fix MS16088: Prevent long usernames from overlapping HFC logo in Wallet Home
|
2018-06-25 11:45:29 -07:00 |
|
Andrew Meadows
|
756f34761f
|
don't build AvatarMotionStates until physics enabled
|
2018-06-25 10:37:54 -07:00 |
|
David Rowe
|
af3861def8
|
Code review
|
2018-06-25 16:33:05 +12:00 |
|
David Rowe
|
40fb627504
|
Merge branch 'master' into 21892
|
2018-06-25 16:04:44 +12:00 |
|
Zach Fox
|
6fce6431a3
|
Fix MS16088: Prevent long usernames from overlapping HFC logo in Wallet Home
|
2018-06-22 16:09:49 -07:00 |
|
Zach Fox
|
25f22326a8
|
Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity
|
2018-06-22 15:43:16 -07:00 |
|
John Conklin II
|
b7069fff71
|
Merge pull request #13382 from SamGondelman/particleFix
Fix Particle Entities
|
2018-06-22 13:27:11 -07:00 |
|
Sam Gondelman
|
44a7d04b2a
|
Merge pull request #13426 from SamGondelman/avatarPriority
Highest loading priorities for avatars and attachments
|
2018-06-22 11:22:10 -07:00 |
|
Sam Gondelman
|
850e2d5cf5
|
Merge branch 'master' into particleFix
|
2018-06-21 17:32:24 -07:00 |
|
John Conklin II
|
aa630e02cf
|
Merge pull request #13269 from wayne-chen/BillboardableWarning-case-14709
Billboardable::pointTransformAtCamera div by zero asan warning
|
2018-06-21 10:04:38 -07:00 |
|
Gabriel Calero
|
4af0815561
|
Add missing annotations to breakpad (version, build_number, build_type)
|
2018-06-21 11:19:39 -03:00 |
|
SamGondelman
|
8f411ad6c8
|
CR
|
2018-06-20 16:13:10 -07:00 |
|
Andrew Meadows
|
4424a8df11
|
Merge pull request #13303 from highfidelity/workload
workload project part 1
|
2018-06-20 15:39:01 -07:00 |
|
SamGondelman
|
8014f61243
|
loading priorities for avatars and attachments
|
2018-06-20 12:29:28 -07:00 |
|
Andrew Meadows
|
24bae8eddc
|
Merge pull request #13425 from sabrina-shanman/crash-strafe
Fix crash when walking sideways
|
2018-06-20 11:13:20 -07:00 |
|
sabrina-shanman
|
a8b2da14cf
|
Format numeric constant in strafe crash commit to match coding standards
|
2018-06-20 08:45:12 -07:00 |
|
sabrina-shanman
|
45fdf3d68f
|
Fix crash when walking sideways
|
2018-06-19 17:23:00 -07:00 |
|
Brad Davis
|
787fb1b9bd
|
Fix crash in display plugin caused by audio device changed
|
2018-06-19 16:13:57 -07:00 |
|
Zach Fox
|
fa3fae09b2
|
Merge pull request #13416 from zfox23/MS15154_removeButtonFocusState
Fix MS15154: Remove focused button color
|
2018-06-19 13:10:11 -07:00 |
|
Zach Fox
|
a4d47a0248
|
Merge pull request #13408 from zfox23/MS16012_emptyHistoryFix
Fix MS16012: Correct the criteria used to determine empty txn history
|
2018-06-19 12:01:51 -07:00 |
|
Zach Fox
|
1ea3b85a5d
|
Merge pull request #13418 from zfox23/MS16052_PNG50
Implement MS16052: Use quality '50' when saving PNG Snapshots
|
2018-06-19 11:52:10 -07:00 |
|
Zach Fox
|
97e4d2eb46
|
Merge pull request #13404 from zfox23/MS15545_fixWebBackButton
Fix MS15545: Fix PAL/GoTo WebView's Back Button
|
2018-06-19 11:25:27 -07:00 |
|
Zach Fox
|
3ef41664dc
|
Implement MS16052: Use quality '50' when saving PNG Snapshots
|
2018-06-19 10:32:01 -07:00 |
|
Zach Fox
|
d056fa6c93
|
Fix MS15154: Remove focused button color
|
2018-06-19 09:56:24 -07:00 |
|
David Rowe
|
0e1e44a3f5
|
Zero avatar velocity if protocol version mismatch so that overlays show
|
2018-06-19 20:44:53 +12:00 |
|
Andrew Meadows
|
44c3620b6e
|
remove cruft
|
2018-06-18 17:45:58 -07:00 |
|
Atlante45
|
4a4c0d132e
|
Make stereo interface async
|
2018-06-18 17:26:29 -07:00 |
|
John Conklin II
|
9ace80c709
|
Merge pull request #13407 from AndrewMeadows/0.69.0-colliding-avatars
RC69: avatars collide again (again)
|
2018-06-18 15:21:47 -07:00 |
|
John Conklin II
|
a47038d81f
|
Merge pull request #13381 from hyperlogic/feature/crashpad-thread-id
Add main & render thread ids to crashpad annotations
|
2018-06-18 15:21:04 -07:00 |
|
Sam Gateau
|
56a1137f7b
|
Merge pull request #13312 from SamGondelman/overlayPipelines
Fix layered overlay rendering and highlight
|
2018-06-18 14:35:03 -07:00 |
|
Zach Fox
|
ad1da3e225
|
Fix MS16012: Correct the criteria used to determine empty txn history
|
2018-06-18 14:26:46 -07:00 |
|
Andrew Meadows
|
a18ba36dd2
|
merge 'master' into 'workload'
|
2018-06-18 13:40:08 -07:00 |
|
Andrew Meadows
|
085130e3c9
|
avatars collide again again
|
2018-06-18 13:17:32 -07:00 |
|
Zach Fox
|
84ed07cdb4
|
Merge pull request #13405 from zfox23/MS16007_supportPngSnapshots
Implement MS16007: Add support for PNG snapshots
|
2018-06-18 13:10:45 -07:00 |
|
Wayne Chen
|
07e689f086
|
removing compute/check for u
|
2018-06-18 13:02:53 -07:00 |
|
Zach Fox
|
e83b76781b
|
Be a bit more specific in the docs
|
2018-06-18 11:47:26 -07:00 |
|
Zach Fox
|
614b512411
|
Add docs
|
2018-06-18 11:43:31 -07:00 |
|
Howard Stearns
|
69d1b85d32
|
Merge pull request #13393 from howard-stearns/fix-concurrency-drill-down
fix concurrency drillDown
|
2018-06-18 11:39:30 -07:00 |
|
Elisa Lupin-Jimenez
|
9c488ff05e
|
Merge pull request #13331 from gcalero/breakpad_android
Breakpad integration for android Interface
|
2018-06-18 11:32:05 -07:00 |
|
Elisa Lupin-Jimenez
|
c08df9e39f
|
Merge pull request #13400 from kitely/parse-snapshot-fix
Don't call parseSnapshotData() in a static manner
|
2018-06-18 11:26:29 -07:00 |
|
Zach Fox
|
dbf3ade04f
|
Implement MS16007: Add support for PNG snapshots
|
2018-06-18 11:22:05 -07:00 |
|
Wayne Chen
|
e381022910
|
checking for NaN in cross products from vec3 positions
|
2018-06-18 11:21:53 -07:00 |
|
Gabriel Calero
|
3eecb2f379
|
Apply code conventions
|
2018-06-18 14:42:08 -03:00 |
|
Wayne Chen
|
ed7f008517
|
checking edge case of if input vectors are zero
|
2018-06-18 10:31:11 -07:00 |
|
Andrew Meadows
|
6d422e4678
|
Merge 'master' into 'workload'
|
2018-06-18 10:30:13 -07:00 |
|
Zach Fox
|
f307f1d97a
|
Fix MS15545: Fix PAL/GoTo WebView's Back Button
|
2018-06-18 10:19:00 -07:00 |
|
Elisa Lupin-Jimenez
|
b255cf0ba9
|
Merge pull request #13389 from AndrewMeadows/misc-001
crash fixes, removing unnecessary writes, and misc cleanup
|
2018-06-18 09:19:22 -07:00 |
|
Oren Hurvitz
|
d8ea47b78f
|
Don't call parseSnapshotData() in a static manner.
Shouldn't call non-static methods in a static manner. (Some compilers don't even allow this, although apparently Visual Studio 2017 does.)
|
2018-06-17 14:18:25 +03:00 |
|
David Rowe
|
be4b929301
|
Fix cauterization when reparent entity to a different joint
|
2018-06-16 16:31:06 +12:00 |
|
David Rowe
|
4dd6ba1d18
|
Fix Mac crash
|
2018-06-16 16:29:45 +12:00 |
|
Gabriel Calero
|
583c46b3a0
|
Merge remote-tracking branch 'upstream/master' into breakpad_android
|
2018-06-15 21:21:03 -03:00 |
|
Gabriel Calero
|
20c147ef11
|
Fix compilation error
|
2018-06-15 21:12:38 -03:00 |
|
howard-stearns
|
97fa22b69b
|
fix concurrency drillDown
|
2018-06-15 16:57:21 -07:00 |
|
Gabriel Calero
|
1cdd8c2f3c
|
Fix compilation error
|
2018-06-15 20:39:24 -03:00 |
|
Gabriel Calero
|
20727378e2
|
Rename crash handler files
|
2018-06-15 20:32:10 -03:00 |
|
John Conklin II
|
2655dd77b6
|
Merge pull request #13368 from zfox23/MS15501_CreateModelKeyboard
MS15501: Fix keyboard in Create -> Model in HMD
|
2018-06-15 15:34:02 -07:00 |
|
Anthony J. Thibault
|
2feecf6db8
|
removed unnecessary setting of 'username' annotation.
|
2018-06-15 14:56:10 -07:00 |
|
Anthony J. Thibault
|
8ddcff6070
|
Set username annotation more reliably.
|
2018-06-15 14:47:02 -07:00 |
|
John Conklin II
|
2483c45f40
|
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly
Remove functionality for rendering collision models directly in the Model class
|
2018-06-15 14:46:40 -07:00 |
|
Andrew Meadows
|
be0899c41d
|
remove unnecessary writes to appease Xcode's static analyzer
|
2018-06-15 11:44:22 -07:00 |
|
Anthony J. Thibault
|
24689224ce
|
removed redundant machine_fingerprent crashpad annotation.
|
2018-06-15 11:40:45 -07:00 |
|
David Rowe
|
249f72758e
|
Fix entity detaching from head joint not becoming visible
|
2018-06-15 16:36:16 +12:00 |
|
Thijs Wenker
|
05bc32b3ad
|
Merge branch 'master' of github.com:highfidelity/hifi into merge/triplelexx-21883
# Conflicts:
# interface/src/Application.cpp
# interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp
|
2018-06-15 02:34:29 +02:00 |
|
Gabriel Calero
|
c02750edd1
|
Upload breakpad minidumps from an android service
|
2018-06-14 19:43:03 -03:00 |
|
Anthony J. Thibault
|
84601446bf
|
Add main thread id & machine fingerprint to crashpad annotations
|
2018-06-14 12:57:30 -07:00 |
|
John Conklin II
|
d023d6adef
|
Merge pull request #13321 from danteruiz/tablet-imporvments
Tablet improvements
|
2018-06-14 12:38:20 -07:00 |
|
Anthony Thibault
|
f2d6d0ee56
|
Merge pull request #13351 from ctrlaltdavid/21891
Fix Avatar > Attachments joint and spinboxes
|
2018-06-14 11:31:04 -07:00 |
|
Anthony Thibault
|
5d06ea1c45
|
Merge pull request #13250 from MiladNazeri/gravprep-docs
Jsdoc to Grav Automation Tool
|
2018-06-14 11:26:56 -07:00 |
|
John Conklin II
|
7057e00583
|
Merge pull request #13298 from danteruiz/fix-vive-configuration-page
Controller Confguration Page fixes
|
2018-06-14 11:07:26 -07:00 |
|
John Conklin II
|
b43d5287e2
|
Merge pull request #13286 from ElderOrb/spinbox-bugs
Introduce test 'controls gallery' application for controls testing & few spinbox fixes
|
2018-06-14 10:21:17 -07:00 |
|
Dante Ruiz
|
dc28e8f03f
|
fixing error
|
2018-06-13 18:24:06 -07:00 |
|
Dante Ruiz
|
eb01b50e6f
|
making code review changes
|
2018-06-13 17:58:10 -07:00 |
|
Zach Fox
|
6b59b5b53c
|
MS15501: Fix keyboard in Create -> Model in HMD
|
2018-06-13 13:23:43 -07:00 |
|
John Conklin II
|
99b5835098
|
Merge pull request #13344 from birarda/feat/new-version-numbers
handle semantic version numbers in interface/sandbox update
|
2018-06-13 11:16:56 -07:00 |
|
Dante Ruiz
|
60e46481b2
|
emissive maps
|
2018-06-13 10:41:02 -07:00 |
|
John Conklin II
|
0ba97fa83b
|
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags
Scripted Blendshapes and Procedural Face Movement Flags
|
2018-06-13 10:32:59 -07:00 |
|
Clement
|
920263ef49
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2018-06-12 17:00:25 -07:00 |
|
Howard Stearns
|
6f011b70ac
|
Merge pull request #13358 from howard-stearns/drill-down-to-place-and-stack-goto-cards
MS15788: drillDownToPlace and isStacked based on server data.
|
2018-06-12 16:18:54 -07:00 |
|
Zach Fox
|
ffb9a47be0
|
Merge pull request #13355 from zfox23/MS14314_multipleSnapshots
Interface Fix for MS14314: Make use of original image filename when sharing
|
2018-06-12 15:10:22 -07:00 |
|
Anthony Thibault
|
027c4f6b9e
|
Merge pull request #13332 from hyperlogic/bug-fix/large-avatar-little-domain-rc68
Large avatars should instantly shrink when entering small height domains
|
2018-06-12 14:57:07 -07:00 |
|
howard-stearns
|
05d3f92867
|
drillDownToPlace and iStacked based on server data.
|
2018-06-12 13:18:44 -07:00 |
|
Zach Fox
|
bf5d6de780
|
Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots
|
2018-06-12 11:19:05 -07:00 |
|
Dante Ruiz
|
759c29ab10
|
updating the model
|
2018-06-12 10:53:38 -07:00 |
|
Dante Ruiz
|
f1d11f9566
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-12 10:21:12 -07:00 |
|
Andrew Meadows
|
d31ee52d79
|
revert PR-13162 from RC68
|
2018-06-12 03:51:55 -07:00 |
|
David Rowe
|
537665c22a
|
Fix spinbox not validating the second time an invalid value is entered
|
2018-06-12 17:35:53 +12:00 |
|
Anthony J. Thibault
|
042f902d2e
|
Merge branch 'master' into scriptedBlendshapesFaceFlags
|
2018-06-11 17:13:30 -07:00 |
|
Zach Fox
|
14034f29a1
|
Interface Fix for MS14314: Make use of original image filename when sharing
|
2018-06-11 17:10:09 -07:00 |
|
Sam Gateau
|
f769b63c3d
|
Merge pull request #13308 from jherico/fix/13677
Fix for black text rendering white in web elements
|
2018-06-11 16:17:31 -07:00 |
|
Sam Gondelman
|
e8ec32c7f8
|
Merge pull request #13340 from SamGondelman/modelTextures
Try to fix ModelOverlay texture loading
|
2018-06-11 16:09:10 -07:00 |
|
Dante Ruiz
|
6685fbbfc4
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 13:56:54 -07:00 |
|
Zach Fox
|
7fbc7bf1a5
|
Merge pull request #13347 from zfox23/MS15721_deleteApp
Fix MS15721: Delete app.json if installed script isn't running
|
2018-06-11 13:28:05 -07:00 |
|
Zach Fox
|
15129e37db
|
Merge pull request #13341 from zfox23/MS13761_hideOverlayFix
Fix MS13761: Change the move conditions under which overlays hide
|
2018-06-11 11:44:26 -07:00 |
|