David Back
|
f65bc9b5ed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements
|
2018-06-25 15:22:07 -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 |
|
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 |
|
David Back
|
6fa191742c
|
Merge pull request #13390 from dback2/editHandleDebugWindowFix
Prevent edit press events when pointing at tablet or desktop windows
|
2018-06-25 11:11:37 -07:00 |
|
John Conklin II
|
17263a1ed3
|
Merge pull request #13396 from dback2/editHandleCollision
Temp disable MyAvatar collisions when stretching entities
|
2018-06-25 10:45:07 -07:00 |
|
John Conklin II
|
0e2675e0d8
|
Merge pull request #13392 from roxanneskelly/roxie-bugfixes
Remove debug logging message spam for avatar entities that have scripts
|
2018-06-25 10:42:43 -07: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
SamGondelman
|
2f0877dc0f
|
debugging js
|
2018-06-19 16:36:13 -07:00 |
|