Commit graph

20424 commits

Author SHA1 Message Date
Atlante45
7e6d45ead7 CR 2018-04-17 16:25:07 -07:00
Atlante45
a626e9f6f3 Add special handler for heap corruption 2018-04-17 15:09:10 -07:00
Clement
bd59ff1573 Fix threaded force crashes 2018-04-13 15:11:49 -07:00
Melissa Brown
fd7b3b75f9
Merge pull request #12884 from Atlante45/fix/build-instructions
Update docs with correct qt version
2018-04-13 11:12:06 -07:00
John Conklin II
fc487ea322
Merge pull request #12831 from ctrlaltdavid/21829
Model overlay fixes
2018-04-12 17:04:55 -07:00
Clement
157ca8cd68 Update docs with correct qt version 2018-04-12 16:21:26 -07:00
Sam Gateau
77a27b2be7
Merge pull request #12835 from NissimHadar/speedUp1
ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG
2018-04-12 11:48:09 -07:00
John Conklin II
7bcaa12c50
Merge pull request #12679 from FlameSoulis/getAnimatationRoles-fix
Typo corrected: getAnimatationRoles to getAnimationRoles
2018-04-12 10:32:09 -07:00
Sam Gateau
f355bd86c2
Merge pull request #12783 from samcake/blue
Hack: Adding more budget options for memory texture
2018-04-11 15:46:08 -07:00
John Conklin II
7a905ed420
Merge pull request #12777 from ctrlaltdavid/21813
Fix Window API position and size reporting
2018-04-11 13:48:21 -07:00
John Conklin II
854d3d7804
Merge pull request #12765 from ctrlaltdavid/21822
Fix text sizing per text3d overlay lineHeight property
2018-04-11 12:16:51 -07:00
MiladNazeri
9f7a765ec3
Merge pull request #12729 from ctrlaltdavid/21814
Settings API JSDoc
2018-04-11 11:48:15 -07:00
Zach Fox
0c9d65bc15
Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError
Commerce: Fix Certificate Info error
2018-04-11 09:38:43 -07:00
NissimHadar
7f70511d1a Added a script command to clear caches. 2018-04-08 10:32:35 -07:00
David Rowe
f3a745b6cb Fix initialization order 2018-04-07 18:53:27 +12:00
David Rowe
8093e3e5ae Fix some miscellaneous JSDoc typos 2018-04-07 16:48:05 +12:00
David Rowe
96178404c7 Document that jointTranslations and jointRotations are not cloned 2018-04-07 16:47:38 +12:00
David Rowe
ba020854b6 Add missing "animationSettings.currentFrame" property JSDoc 2018-04-07 16:46:44 +12:00
David Rowe
38d7b81a4f Add missing "get" and JSDoc for "loadPriority" property 2018-04-07 16:46:02 +12:00
David Rowe
6d9b69cd2e Fix cloning a model overlay not cloning animation settings 2018-04-07 16:44:58 +12:00
Dante Ruiz
00713ab225 fix selection api 2018-04-06 14:00:50 -07:00
Zach Fox
0c48ccefa4 Clean up failResponse to make it better 2018-04-06 11:41:17 -07:00
Zach Fox
af5a68b282 Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError 2018-04-06 10:58:32 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66
Merge back RC66 to master
2018-04-06 10:43:01 -07:00
Howard Stearns
ad191defb8
Merge pull request #12799 from zfox23/snapshot_fixCrashOnUploadError
Prevent Interface from crashing when a Snapshot upload fails
2018-04-05 13:51:33 -07:00
Seth Alves
8de545acdf add new address accessor for 'public' addresses, use it for snapshot and stream 2018-04-05 13:39:51 -07:00
Zach Fox
ac2721fe6a Logging improvements 2018-04-05 13:04:09 -07:00
Zach Fox
8e46ebf83b Prevent Interface from crashing when a Snapshot upload fails 2018-04-05 11:27:26 -07:00
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003
cleanup around simulation-ownership
2018-04-05 10:58:45 -07:00
Seth Alves
4b0d338e57 on first run, send user to serverless tutorial rather than checking for a local sandbox 2018-04-04 18:00:11 -07:00
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade
Update to Transitions debugging / editing script
2018-04-04 14:31:59 -07:00
John Conklin II
cba307f28b
Merge pull request #12762 from samcake/one
Remove notifications and print outs when degrading LOD
2018-04-04 10:35:05 -07:00
Zach Fox
752246d950
Merge pull request #12760 from zfox23/inspection_rightClickTweaking
Inspection: Tweak mouse-right-click-to-inspect behavior
2018-04-04 09:32:29 -07:00
samcake
1629756d53 Adding more budget options for memory texture 2018-04-03 18:08:43 -07:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66
RC66 mergeback
2018-04-03 15:39:16 -07:00
David Rowe
095c1b837c Update JSDoc 2018-04-04 09:48:33 +12:00
David Rowe
6868ca971f Make Window.x and Window.y report top left of drawable area of window 2018-04-04 09:43:39 +12:00
David Rowe
a3c8b2792d Fix Window.geometryChanged() values for moving and resizing window 2018-04-04 09:42:05 +12:00
samcake
2dc4630e68 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-04-03 12:55:21 -07:00
Seth Alves
5f13df4102
Merge pull request #12722 from druiz17/fix-entities-outline
fix ContextOverlayInferface highlighing unspecified entities.
2018-04-03 12:29:19 -07:00
John Conklin II
53a5261905
Merge pull request #12712 from zfox23/newUpdateCertLocation
Fix cert location for content sets; handle .content.zip content sets
2018-04-03 09:10:11 -07:00
David Rowe
ab55f20976 Fix text sizing per text3d overlay lineHeight property
Makes text size correct for multiple lines of text.
2018-04-03 16:54:07 +12:00
David Rowe
63603ff97c Fix window height reported by Window.geometryChanged() signal 2018-04-03 14:21:15 +12:00
samcake
5a1eac563b Code review fixes 2018-04-02 15:50:18 -07:00
John Conklin II
9dcef996c5
Merge pull request #12684 from vladest/assetserver_wrong_dialog
Fix invalid message if cancel adding asset to AssetServer
2018-04-02 15:28:46 -07:00
John Conklin II
74ca98dc81
Merge pull request #12727 from amantley/triggerRecenterBehaviour
Trigger Avatar Recenter Behaviour
2018-04-02 14:42:21 -07:00
Zach Fox
1f3063193a Tweak right-click to inspect 2018-04-02 14:24:51 -07:00
samcake
d4bc61fb3d Remove notifications and print outs for LOD changes because it was too much noise 2018-04-02 13:53:30 -07:00
John Conklin II
796bd069b2
Merge pull request #12659 from alexiamandeville/script_charcontroller
Updating char controller
2018-04-02 13:24:15 -07:00
Zach Fox
7f3e9547cc Handle the case when metaverse returns error for certificateInfo 2018-04-02 11:55:10 -07:00