Commit graph

69336 commits

Author SHA1 Message Date
Menithal
55e75298bd Added Logging 2018-06-21 01:24:32 +03:00
Menithal
903762b122 Make sure max constraints reset
This now occurs when selecting a new entity and having the UI filled
again
2018-06-21 01:04:01 +03:00
David Back
3967ca6bf6 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-20 14:47:52 -07:00
David Back
7704e8c2a9 fix stretching too far, improve stretch sphere vs camera dist sizing 2018-06-20 14:47:41 -07:00
Menithal
32982326b1 Moved WebBridge sync to oninput:
This avoids the settings_update being called only when the image
finishes loaded
2018-06-21 00:08:36 +03:00
Menithal
d878ec66e2 Added Lock for not sending settings_update
This occurs only when fields are being filled
2018-06-21 00:07:14 +03:00
sabrina-shanman
c039d20304 Fix objects snapping back when selected 2018-06-20 13:55:38 -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
Dante Ruiz
f891c37ac8 fix particle entity 2018-06-20 10:59:19 -07:00
Bradley Austin Davis
6969a9dbe1
Merge pull request #13424 from jherico/fix/audio_display_crash_master
Fix crash in display plugin caused by audio device changed
2018-06-20 10:33:12 -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
Dante Ruiz
3d4f164a9f fixing web entity and whitespace cleanup 2018-06-19 16:53:36 -07:00
SamGondelman
2f0877dc0f debugging js 2018-06-19 16:36:13 -07:00
Wayne Chen
3dbd181a9f Merge branch 'master' of https://github.com/highfidelity/hifi 2018-06-19 16:27:58 -07:00
Dante Ruiz
694c272424 fixed text entity 2018-06-19 16:27:10 -07:00
Andrew Meadows
92e98438d3 remove cruft 2018-06-19 16:22:10 -07:00
Brad Davis
787fb1b9bd Fix crash in display plugin caused by audio device changed 2018-06-19 16:13:57 -07:00
David Back
633be87473 fix stretch panel dimensions 2018-06-19 14:57:46 -07:00
David Back
61cbe84ae5 fix stretching below minimum still moving entity 2018-06-19 14:39:58 -07:00
Andrew Meadows
17a0dd574a remove debug cruft 2018-06-19 14:36:57 -07:00
Andrew Meadows
b557717dab to avoid NaN: don not rely on glm::angle(quat) UYKWYAD 2018-06-19 14:27:27 -07:00
SamGondelman
de5fcccc7b proper reporting of nan values in get 2018-06-19 14:22:24 -07:00
Dante Ruiz
568ba6f777 fixing shape entity 2018-06-19 14:14:16 -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
SamGondelman
12a5d8b550 quiet ubuntu warnings, particle properties show radians 2018-06-19 12:51:35 -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
NissimHadar
79293310e5 No more use of JPG files. 2018-06-19 11:59:31 -07:00
NissimHadar
d55d3c54da Merge branch 'master' of github.com:highfidelity/hifi into autoTesterUpdate 2018-06-19 11:54:25 -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
David Rowe
064f4ca204 Remove deleted entities from list without scrolling to top 2018-06-19 16:22:59 +12:00
David Rowe
5de451e8e0 Update entity list upon entity deletion 2018-06-19 14:52:49 +12:00
Andrew Meadows
44c3620b6e remove cruft 2018-06-18 17:45:58 -07:00
sabrina-shanman
67c605c10a Do not use ownership tracking in serverless mode in PhysicalEntitySimulation 2018-06-18 16:12:38 -07:00
Wayne Chen
413f08e900 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-06-18 15:45:03 -07:00
humbletim
dc5c5c20df raypick partIndex commit
include shapeID for accessing proper material index

add raypick shapeID test script
2018-06-18 18:22:30 -04: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
Sam Gondelman
ad00e1bdca
Merge pull request #13394 from sethalves/fix-osx-etclib-relwithdebinfo
fix etclib link when building RelWithDebInfo on OSX
2018-06-18 14:26:47 -07:00
Zach Fox
ad1da3e225 Fix MS16012: Correct the criteria used to determine empty txn history 2018-06-18 14:26:46 -07:00
NissimHadar
6311f63f42 Merge branch 'master' of github.com:highfidelity/hifi into autoTesterUpdate 2018-06-18 14:01:04 -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