Commit graph

69349 commits

Author SHA1 Message Date
Zach Fox
25f22326a8 Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity 2018-06-22 15:43:16 -07:00
Sam Gateau
7b4b6bc3b8 Same fix as the point lighting flashing for rc69 in master 2018-06-22 14:59:37 -07:00
samcake
df3d689098 Try mono threaded and profiled 2018-06-22 14:59:37 -07:00
David Back
88762e879f Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision 2018-06-22 13:53:04 -07:00
David Back
80adad7965 myAvatar constant 2018-06-22 13:52:43 -07:00
NissimHadar
fdf0beba9c Merge branch 'master' of github.com:highfidelity/hifi into autoTesterUpdate 2018-06-22 13:46:50 -07:00
John Conklin II
b7069fff71
Merge pull request #13382 from SamGondelman/particleFix
Fix Particle Entities
2018-06-22 13:27:11 -07:00
Seth Alves
6f22f210bc
Merge pull request #13433 from SamGondelman/etc2fix
Simplify Etc2Comp cmake
2018-06-22 12:03:55 -07:00
David Back
6a4c5ed12a Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision 2018-06-22 11:58:28 -07:00
David Back
844c3c77ac Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-22 11:55:44 -07:00
Wayne Chen
1239472f2d adding line for allowing grabbing of collisionless overlays 2018-06-22 11:35:01 -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
SamGondelman
d37a8bcd72 more jsdoc updates 2018-06-22 10:13:18 -07:00
Wayne Chen
5b36449edd allowing grabbing of collisionless entities 2018-06-22 09:54:25 -07:00
Wayne Chen
25d7284e81 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-06-21 18:22:01 -07:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix 2018-06-21 17:32:24 -07:00
SamGondelman
223350b7be remove logging, play with debounce times 2018-06-21 17:26:39 -07:00
NissimHadar
8ad8713a13 New API. 2018-06-21 17:02:51 -07:00
David Back
c019a4816f CR changes + eslint fixes 2018-06-21 16:45:09 -07:00
David Back
ed56f09fcf comment 2018-06-21 15:00:10 -07:00
David Back
2a7d146661 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-21 14:48:48 -07:00
David Back
37b35353d2 space 2018-06-21 14:48:37 -07: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
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