Commit graph

69188 commits

Author SHA1 Message Date
Gabriel Calero
fedc0a9e61 Support web3d overlays in android 2018-06-25 16:37:03 -03:00
John Conklin II
4088035b3b
Merge pull request #13411 from sabrina-shanman/crash-delete-cube
Fix crash when deleting objects in serverless mode
2018-06-21 14:39:07 -07:00
Sam Gondelman
afc64a18a1
Merge pull request #13362 from SamGondelman/modelTextures
Fix transparent textures rendering wrong sometimes
2018-06-21 14:23:49 -07:00
Sam Gateau
dea3f91c0b
Merge pull request #13421 from AndrewMeadows/fix-mac-nan-crash
fix crash on Mac when watching someone else turn with HMD
2018-06-21 11:55:39 -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
John Conklin II
835528b212
Merge pull request #13383 from dback2/autoLaserFix2
Fix auto lasering locked web entities & only auto laser tablet and web overlays
2018-06-21 09:21:54 -07:00
sabrina-shanman
59833d8f28 Do not use boolean for variable definitions. Use bool instead. 2018-06-20 15:54:19 -07:00
Andrew Meadows
4424a8df11
Merge pull request #13303 from highfidelity/workload
workload project part 1
2018-06-20 15:39:01 -07:00
sabrina-shanman
c039d20304 Fix objects snapping back when selected 2018-06-20 13:55:38 -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
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
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
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
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
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
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
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
Sam Gondelman
8817af9b9c
Merge pull request #13330 from Cristo86/android_enterbackground_startup
Android - Make sure we call Interface enterBackground when opening
2018-06-18 12:47:43 -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
David Back
0c644c0504 Merge branch 'master' of https://github.com/highfidelity/hifi into autoLaserFix2 2018-06-18 11:06:56 -07:00
David Back
175e4b7013 also check tabletID 2018-06-18 11:06:33 -07:00
Gabriel Calero
3eecb2f379 Apply code conventions 2018-06-18 14:42:08 -03:00
Andrew Meadows
222756371e set max region radiuses in workload UI 2018-06-18 10:31:41 -07: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
John Conklin II
87d26a9d86
Merge pull request #13304 from sabrina-shanman/btghostraytest
Use optimized Bullet raytest function in CharacterGhostObject::rayTest()
2018-06-18 10:22:17 -07:00
Zach Fox
f307f1d97a Fix MS15545: Fix PAL/GoTo WebView's Back Button 2018-06-18 10:19:00 -07:00