Dante Ruiz
|
d8834af749
|
make requested changes
|
2018-06-26 11:53:45 -07:00 |
|
Dante Ruiz
|
17f4a27ceb
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-entity-lag-2
|
2018-06-26 10:55:27 -07:00 |
|
Sam Gondelman
|
fbe54437b8
|
Merge pull request #13409 from humbletim/add-raypick-shapeID
Include shapeID in RayPick results
|
2018-06-26 10:25:39 -07:00 |
|
John Conklin II
|
0c9f0cbe03
|
Merge pull request #13443 from samcake/punk
report FIx from rc69 to master: Fix for the point light test flashing in HMD
|
2018-06-26 08:28:03 -07:00 |
|
Sam Gondelman
|
acfd562309
|
Merge pull request #13435 from gcalero/breakpad_android
Breakpad integration for android Interface (part II)
|
2018-06-25 16:47:07 -07:00 |
|
Howard Stearns
|
5fe7b874a4
|
Merge pull request #13455 from howard-stearns/test-wearables
16089: test wearables for wear before gifting and wearing
|
2018-06-25 16:44:53 -07:00 |
|
Andrew Meadows
|
ca70b865d3
|
Merge pull request #13452 from AndrewMeadows/avatar-entities-001
fix physics deactivation of avatar-entities
|
2018-06-25 16:18:01 -07:00 |
|
Gabriel
|
ea2c1298e5
|
Remove crash added with testing purposes only
|
2018-06-25 19:13:47 -03: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 |
|
howard-stearns
|
43cba68cd2
|
test wearables for wear before gifting and wearing
|
2018-06-25 13:40:45 -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 |
|
humbletim
|
b73a957935
|
changes per PR
|
2018-06-25 14:17:33 -04: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 |
|
Andrew Meadows
|
756f34761f
|
don't build AvatarMotionStates until physics enabled
|
2018-06-25 10:37:54 -07:00 |
|
Andrew Meadows
|
5e2a08b3c2
|
handle deactivation of avatar entities differently
|
2018-06-25 10:37:54 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|