Commit graph

69482 commits

Author SHA1 Message Date
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
David Back
d35293594c Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-21 14:27:34 -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
David Back
e3e8de1042 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-21 10:24:12 -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
SamGondelman
64fdb8fe62 simplify etc2comp cmake 2018-06-21 09:32:39 -07:00
NissimHadar
f4508e7a80 Merge branch 'master' of github.com:highfidelity/hifi into autoTesterUpdate 2018-06-21 09:32:26 -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
Gabriel Calero
4af0815561 Add missing annotations to breakpad (version, build_number, build_type) 2018-06-21 11:19:39 -03:00
Gabriel Calero
d5e2362ee2 Clean up and complete gradle script 2018-06-21 11:19:29 -03:00
Gabriel Calero
730e14c9d9 Debugging gradle script 2018-06-21 11:19:20 -03:00
Gabriel Calero
ac533a3913 Debugging gradle script 2018-06-21 11:19:11 -03:00
Gabriel Calero
464f8e128a Debugging gradle script 2018-06-21 11:19:04 -03:00
Gabriel Calero
f8511c5233 Debugging gradle script 2018-06-21 11:18:57 -03:00
Gabriel Calero
b42f546b2a Debugging gradle script 2018-06-21 11:18:50 -03:00
Gabriel Calero
2a36b85ece Debugging gradle script 2018-06-21 11:18:43 -03:00
Gabriel Calero
830dfd3233 Debugging gradle script 2018-06-21 11:18:36 -03:00
Gabriel Calero
a7c969f9df Adding debug info 2018-06-21 11:18:29 -03:00
Gabriel Calero
f184e9fae8 Debug dump_sym run 2018-06-21 11:18:21 -03:00
Gabriel Calero
af29e10fe9 Adding debug info 2018-06-21 11:16:17 -03:00
Gabriel
77d53441c0 Add debug logging 2018-06-21 11:12:43 -03:00
Gabriel
3a473eaa0e Update breakpad_dump_syms.zip 2018-06-21 11:11:11 -03:00
Gabriel Calero
e2ddaeac02 Add gradle task runBreakpadDumpSyms 2018-06-21 11:11:03 -03:00
Gabriel Calero
e1b5564c7b Use environment variables BACKTRACE_URL and BACKTRACE_TOKEN (fix) 2018-06-21 11:10:56 -03:00
Gabriel Calero
0242e1d4d5 Use environment variables BACKTRACE_URL and BACKTRACE_TOKEN 2018-06-21 11:10:42 -03:00
David Rowe
d43be5ce19 Code review 2018-06-21 16:35:37 +12:00
Wayne Chen
fa08ce0ef2 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-06-20 16:34:28 -07:00
SamGondelman
ae19f16c3d Merge remote-tracking branch 'origin/particleFix' into particleFix 2018-06-20 16:17:42 -07:00
Sam Gondelman
f0e6a05e7e
Merge pull request #1 from Menithal/samsParticleFix
JS Fixes for Particle Editor
2018-06-20 16:17:05 -07:00
SamGondelman
8f411ad6c8 CR 2018-06-20 16:13:10 -07:00
sabrina-shanman
59833d8f28 Do not use boolean for variable definitions. Use bool instead. 2018-06-20 15:54:19 -07:00
David Back
945ee8cec9 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-20 15:53:51 -07:00
David Back
54145e0310 use previous pick ray when translate reaches end 2018-06-20 15:53:38 -07:00
Andrew Meadows
4424a8df11
Merge pull request #13303 from highfidelity/workload
workload project part 1
2018-06-20 15:39:01 -07:00
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
David Rowe
764e00d9cf Stop desktop app window's QML source from running when window is closed 2018-06-20 15:48:40 +12: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