Commit graph

79509 commits

Author SHA1 Message Date
Ryan Huffman
b28763a017 Add extra logging to Windows launcher 2019-06-20 15:21:01 -07:00
amer cerkic
30e295d1a0 push to talk causes fun, removing tttt 2019-06-20 15:12:20 -07:00
amer cerkic
1218f7e014 moved audioclient stop to dtor 2019-06-20 15:10:21 -07:00
Andy Howell
4cc6eae478
Merge pull request #15809 from samcake/nut
BUGZ-776 : Detect AMD gpu on more than one possible token
2019-06-20 15:08:41 -07:00
RebeccaStankus
e7cec0f11f Fixed dialogs imports 2019-06-20 15:07:39 -07:00
Shannon Romano
6d3e129bcd
Merge pull request #15808 from danteruiz/launcher-logging
Add more detail logging to mac launcher
2019-06-20 15:06:54 -07:00
Andrew Meadows
cd9b450475 re-expose mic and camera to disable crash 2019-06-20 15:03:15 -07:00
Shannon Romano
7645fcfaa1
Merge pull request #15805 from SamGondelman/shared
BUGZ-777: Clean up SharedObject code
2019-06-20 14:35:58 -07:00
Sam Gateau
bde50aa21c Detect AMD gpu on more than one possible token... 2019-06-20 14:24:04 -07:00
dante ruiz
b42306739d remove comments 2019-06-20 14:00:50 -07:00
dante ruiz
5fed710035 enable log 2019-06-20 13:48:33 -07:00
dante ruiz
c0250275a1 extra logging 2019-06-20 13:01:07 -07:00
Zach Fox
d49205be74 Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-20 09:45:49 -07:00
Andrew Meadows
1ea0dba083 use weak_ptr for fade-out-finished lambda 2019-06-20 09:29:48 -07:00
Andrew Meadows
87d7a0a72f recover the Good Parts from first attempt to fix bugz-512 2019-06-20 09:29:48 -07:00
Sam Gateau
a66bd04810
Merge pull request #15803 from SamGondelman/setPipeline
BUGZ-703: Possible fix for do_setPipeline crash and other Mac fixes
2019-06-20 09:27:16 -07:00
Andrew Meadows
b23badf374
Merge pull request #15804 from samcake/wall
DEV-146, BUGZ-747: Add one call in PlatformInfo::getPlatform() returning the complete description of the platform
2019-06-20 09:07:19 -07:00
David Rowe
0945bdaac7 Remainder of Entities methods' JSDoc 2019-06-20 15:11:01 +12:00
Shannon Romano
77d91fce33
Merge pull request #15802 from annabrewer/unreachable-code
Small warning fix
2019-06-19 18:06:34 -07:00
Shannon Romano
80b118560d
Merge pull request #15801 from SimonWalton-HiFi/recording-playback-null-url
A null recording clip should be considered an error
2019-06-19 17:58:46 -07:00
Sam Gateau
b5e4a47375 Proper allocation of the resource in forward and starting to remove the ui as we have it 2019-06-19 17:33:26 -07:00
Sam Gateau
b2631e89e9 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-19 17:11:20 -07:00
SamGondelman
50df5e0bc5 small cleanup to shared object etc. 2019-06-19 16:56:45 -07:00
Sam Gateau
8f04eaae1d Merge branch 'master' of github.com:highfidelity/hifi into wall 2019-06-19 16:53:04 -07:00
Sam Gateau
53094ef70c One more pass of clean up on the platform api, returning the complete description in a single call, adding the version of the OS and deprecating legacy PlatformInfo calls 2019-06-19 16:52:33 -07:00
SamGondelman
fb8cc27fef Merge remote-tracking branch 'upstream/master' into shared 2019-06-19 16:52:04 -07:00
SamGondelman
f2e3218ec0 possible fix for do_setPipeline crash and other mac fixes 2019-06-19 16:34:38 -07:00
Shannon Romano
c7a5d35436
Merge pull request #15799 from roxanneskelly/bugz516a
BUGZ-516 - add OS type to connect message for logging
2019-06-19 16:08:13 -07:00
Anna
c215831df8 fixed potential unreachable code warnings 2019-06-19 15:41:53 -07:00
Bradley Austin Davis
e848aca193
Merge pull request #15800 from jherico/fix/gl_context_create_2_0
BUGZ-402: Don't request an OpenGL 2.0 context via the dock widget
2019-06-19 15:20:50 -07:00
Anna
523f73ab87 Merge branch 'master' of github.com:highfidelity/hifi 2019-06-19 15:19:34 -07:00
jennaingersoll
150ae31a88
Merge pull request #15748 from ctrlaltdavid/DOC-85
DOC-85: Revise new MyAvatar signals' JSDoc
2019-06-19 15:16:46 -07:00
Roxanne Skelly
0576e6ae3e remove newline for sysinfo to make splunk queries easier 2019-06-19 15:10:02 -07:00
Simon Walton
7701710aa5 Consider a NetworkClipLoader resource with null URL to be failed 2019-06-19 15:02:16 -07:00
Shannon Romano
12357e5ced
Merge pull request #15797 from annabrewer/gamma-correction-correction
BUGZ-271: Android gamma correction is too high
2019-06-19 14:39:09 -07:00
SamGondelman
46f913c73b Merge remote-tracking branch 'origin/master' 2019-06-19 14:30:59 -07:00
Brad Davis
abb71ba604 Don't request an OpenGL 2.0 context via the dock widget 2019-06-19 14:10:53 -07:00
Shannon Romano
3d72370d1a
Merge pull request #15792 from MiladNazeri/nametagFixes
Bugz-504: more stable nametag updates
2019-06-19 14:07:19 -07:00
Roxanne Skelly
2ed5e8aefb add OS type to connect message 2019-06-19 13:53:38 -07:00
Anna
00820b9a9b Merge branch 'master' of github.com:highfidelity/hifi into gamma-correction-correction 2019-06-19 13:49:55 -07:00
Zach Fox
8fdfdbaae4 Another attempt, still not working 2019-06-19 13:31:21 -07:00
Gayathri
e6e0b06a80
Merge pull request #15789 from RebeccaStankus/migrateEditFiles
JIRA 659-Create App shows a File not found message in the Properties and Grid Tab
2019-06-19 15:16:37 -05:00
SamGondelman
ee8cdd6ae6 Merge remote-tracking branch 'origin/master' 2019-06-19 13:09:13 -07:00
Sam Gateau
7ad0975528 Merge branch 'master' of github.com:highfidelity/hifi into wall 2019-06-19 13:06:20 -07:00
Shannon Romano
38f414efc8
Merge pull request #15798 from hyperlogic/bug-fix/nitpick-interface-install-mac
BUGZ-721: nitpick: [mac] preserve symlinks when installing interface.app
2019-06-19 12:36:49 -07:00
RebeccaStankus
f5fa44dc21 Revert "Changed icons path to be relative"
This reverts commit e277070423.
2019-06-19 12:06:34 -07:00
Anthony Thibault
96179328e0 nitpick: [mac] preserve symlinks when installing interface.app 2019-06-19 11:20:32 -07:00
RebeccaStankus
e277070423 Changed icons path to be relative 2019-06-19 11:17:52 -07:00
Howard Stearns
ff1d828aaa
Merge pull request #15794 from SimonWalton-HiFi/limit-stats-dump-rate
Limit the stats-dump rate on packet error
2019-06-19 11:14:48 -07:00
Anna
45ac07de3b fixed pick profiling 2019-06-19 10:54:28 -07:00