Commit graph

32883 commits

Author SHA1 Message Date
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
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
Brad Davis
abb71ba604 Don't request an OpenGL 2.0 context via the dock widget 2019-06-19 14:10:53 -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
SamGondelman
ee8cdd6ae6 Merge remote-tracking branch 'origin/master' 2019-06-19 13:09:13 -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
Anna
a19efce173 implemented samuel's requested changes 2019-06-19 10:34:55 -07:00
Simon Walton
b95515933f
Merge pull request #15708 from SimonWalton-HiFi/stun-on-iface-change
Force new IP port on local address change
2019-06-19 10:12:36 -07:00
Sam Gateau
fdf06ea819 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-19 09:41:45 -07:00
Brad Hefta-Gaub
41c0dc0059
Merge pull request #15796 from SamGondelman/mac
BUGZ-730: Fix deferred rendering on macbook air
2019-06-19 08:31:30 -07:00
Anna
803fe1e178 added comments 2019-06-18 19:33:31 -07:00
Anna
a1a3eccad9 fixed gamma on rift, removed extraneous code from quest, clarified variable names 2019-06-18 19:23:40 -07:00
Sam Gateau
1ae06f01b0 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-18 17:41:56 -07:00
SamGondelman
3ff81607ab fix deferred rendering on macbook air 2019-06-18 17:17:21 -07:00
Sam Gateau
251faf2171 Trying to clean up the solution... 2019-06-18 17:08:08 -07:00
Anna
301791c07e fixed gamma on quest 2019-06-18 16:56:14 -07:00
Simon Walton
7d80852544 Reduce reporting period to 1 s 2019-06-18 16:06:47 -07:00
Simon Walton
06b00e93ae Limit the stats-dump on packet error 2019-06-18 15:43:14 -07:00
Seth Alves
0a2f37f9a0 Q_OBJECT and template classes don't mix 2019-06-18 15:36:32 -07:00
Anna
0d543b0f3e Merge branch 'gamma-correction-correction' of github.com:annabrewer/hifi into quest-optimization 2019-06-18 15:26:31 -07:00
Anna
4cf8023d0e fixed gamma on windows 2019-06-18 15:19:02 -07:00
David Rowe
72fdbc0aa8 Entity information and manipulation 2019-06-19 10:18:48 +12:00
raveenajain
55ebfc0789 Merge branch 'master' of https://github.com/highfidelity/hifi into nitpick_shadows 2019-06-18 14:08:50 -07:00
Ken Cooke
5c837406ac
Merge pull request #15788 from kencooke/audio-simd-UBSan-warnings
Fix UBSan warnings due to SIMD intrinsics
2019-06-18 13:38:57 -07:00
SamGondelman
c129f84e73 Merge remote-tracking branch 'origin/master' 2019-06-18 11:48:38 -07:00
Sam Gateau
f30eb919c7 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-18 11:24:04 -07:00
Anthony Thibault
10dae7e4d9
Merge pull request #15783 from hyperlogic/feature/anim-debug-draw-improvement
Improvement to Developer > Avatar > Draw Animation
2019-06-18 10:50:46 -07:00
Ken Cooke
ce7571dcc1 Replace NEXTPOW2() macros with constexpr (supported since VS2015) 2019-06-18 10:29:23 -07:00
raveenajain
44caf67527 init change, bias triggered via script 2019-06-18 10:02:22 -07:00
Ken Cooke
fa4dfffd8e Update reverb SIMD to avoid benign UBSan warnings due to unaligned load/store 2019-06-18 09:53:54 -07:00
Ken Cooke
11b599f8f9 Update SIMD resampler to avoid benign UBSan warnings due to unaligned load/store 2019-06-18 09:34:55 -07:00
Anna
1d3867d777 works on quest but not desktop 2019-06-17 18:34:26 -07:00
Anna
72da2bc7e5 init commit 2019-06-17 18:12:52 -07:00
Anthony J. Thibault
c75dc29c03 more assert macro trickery 2019-06-17 16:11:19 -07:00
Anthony J. Thibault
e6e40e7b48 added include<assert.h> 2019-06-17 16:09:24 -07:00
Anthony J. Thibault
d57ea8ac4a Fix for signed/unsigned compare warning 2019-06-17 15:42:20 -07:00
Anthony J. Thibault
4b5d5062b1 Improvement to Developer > Avatar > Draw Animation
This feature was added to help diagnose the root cause of a rarely occurring finger twitching bug.

Also, some asserts were added to AnimClip to also help catch a rarely occurring crash.
2019-06-17 14:50:19 -07:00
Seth Alves
e7b852ca38 don't try to create collision shape before compound shape resource is finished loading 2019-06-17 13:18:03 -07:00
David Rowe
23785b5406 Regularize links to individual entity types 2019-06-15 14:06:49 +12:00
Sam Gateau
84a43c0e00 Merge branch 'yellow' of github.com:samcake/hifi into yellow 2019-06-14 17:54:50 -07:00
Sam Gateau
e5a772a9b8 Introducing the HUD layer rendering pass into it s own task and file 2019-06-14 17:54:15 -07:00
Simon Walton
cfcea359b2 Handle local address changes for servers 2019-06-14 16:51:59 -07:00
David Rowe
9c752c9964 Fix up descriptions in EntityType table 2019-06-15 11:07:40 +12:00
David Rowe
b16086de74 Revise JSDoc for key Entities methods plus entity properties 2019-06-15 10:44:56 +12:00
Sam Gateau
864daaef1f Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-14 14:31:19 -07:00
Howard Stearns
723b4ac30f
Merge pull request #15771 from roxanneskelly/bugz516
BUGZ-696 Drop non DS UDP packets when silent domain checkins exceeds 3 seconds
2019-06-14 14:13:33 -07:00
Roxanne Skelly
1b31b8cff8 CR fixes 2019-06-14 13:23:33 -07:00
Sam Gateau
aff139f495 excluding any intel gpu from deferred on mac for the next few days 2019-06-14 12:49:11 -07:00
Sam Gateau
b84a8ce668 Merge branch 'nut' of github.com:samcake/hifi into nut 2019-06-14 12:45:59 -07:00
Sam Gateau
c30e65350a Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-14 11:29:48 -07:00
Roxanne Skelly
2be828a84c Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-14 11:24:03 -07:00
Brad Davis
6b34b0971f Enable KHR_robustness option 2019-06-14 11:09:28 -07:00
Roxanne Skelly
5b6911efa4 log username with "haven't heard from" messages
remove rebind on silent domain checkin
2019-06-14 10:45:18 -07:00
Simon Walton
0804ffe5eb Merge branch 'master' into stun-on-iface-change
including PR15765, don't rebind.
2019-06-14 09:32:06 -07:00
Sam Gateau
12f8c7486b getting rescaling to work for forward yop 2019-06-14 00:48:07 -07:00
howard-stearns
b69d850c8e move constant to the comment that will use it 2019-06-13 19:41:12 -07:00
howard-stearns
c2fe688740 Merge branch 'master' of https://github.com/highfidelity/hifi into stop-rebinding 2019-06-13 19:25:14 -07:00
Sam Gateau
4ba34f9a85 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-13 17:42:52 -07:00
Sam Gateau
5288314d02 Drafting ways to rescale in forward 2019-06-13 17:42:32 -07:00
Roxanne Skelly
3d2b1dbf2b When missing domain checkins, drop packets not destined for DS 2019-06-13 17:25:35 -07:00
Roxanne Skelly
91dce827a5 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-13 17:05:04 -07:00
Shannon Romano
d6859a42d9
Merge pull request #15762 from annabrewer/quest-login-keybrd
BUGZ-531: Quest tablet login missing keyboard
2019-06-13 16:44:49 -07:00
Howard Stearns
11d3f0a629 Merge branch 'master' of github.com:highfidelity/hifi into stop-rebinding 2019-06-13 16:38:40 -07:00
Howard Stearns
8f9fa4a878 stop rebinding 2019-06-13 14:59:27 -07:00
Shannon Romano
bc70abfa10
Merge pull request #15764 from AndrewMeadows/rollback-bugz512
BUGZ-512: rollback fixes for bugz512
2019-06-13 14:43:56 -07:00
Shannon Romano
b4f708f4ad
Merge pull request #15755 from samcake/nut
BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now
2019-06-13 14:32:36 -07:00
Andrew Meadows
db3c7b9194 rollback fixes for bugz512 2019-06-13 13:57:18 -07:00
Anna
7099b04911 appeasing jenkins 2019-06-13 12:21:41 -07:00
Shannon Romano
a37ce9f89d
Merge pull request #15754 from AndrewMeadows/fix-crash-bugz512
BUGZ-512: avoid MacOS crash on shutdown: destroy WebSurfaces before exit
2019-06-13 12:13:04 -07:00
Sam Gateau
def0007496 REfining the filter based on the COmputer model name and catching the 2 known problematic models 2019-06-13 11:39:13 -07:00
Andrew Meadows
b08bb93ff7 add comment about why WebEntityRenderer::onRemoveFromSceneTyped() 2019-06-13 10:53:55 -07:00
Sam Gateau
97236570d8 FIlter on the gpu model name for ththe 2 known cases 2019-06-13 10:28:34 -07:00
Sam Gateau
d6f90c497f FIlter on the gpu model name for ththe 2 known cases 2019-06-13 10:16:57 -07:00
Sam Gateau
43a119cbbc just adding the correct include tobring th edefines 2019-06-12 23:15:53 -07:00
Sam Gateau
fbab3fcde9 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-12 19:15:25 -07:00
Sam Gateau
5004070af9 Grab the name of the renderer no matter what 2019-06-12 17:14:44 -07:00
Brad Hefta-Gaub
50cfe4531e
Merge pull request #15752 from PrestonB1123/moreToolbarTinkering
BUGZ-666: Toolbar Artifact Always Present
2019-06-12 17:14:18 -07:00
Sam Gateau
b2feb0f920 Add specific caps for the render method deferred from the platform profiler, to prevent bad choice on mac book air 2019-06-12 16:48:36 -07:00
Andrew Meadows
eee52deefe destroy WebSurfaces on shutdown 2019-06-12 16:07:15 -07:00
Howard Stearns
0c1df749b9
Merge pull request #15746 from roxanneskelly/bugz516
BUGZ-628 - Add quasi-MTBF logging to track disconnects
2019-06-12 15:48:45 -07:00
Preston Bezos
8dcf6e6a03 removed a dead line of code, made a couple formating changes 2019-06-12 15:47:19 -07:00
Preston Bezos
29d795af5b hopefully good now 2019-06-12 15:36:20 -07:00
Roxanne Skelly
790d4edb04 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-12 15:25:08 -07:00
Roxanne Skelly
7017cf8437 reinitialize winsock on silent domain checkin 2019-06-12 15:24:43 -07:00
Anna
4b30065ad1 fixed keyboard on quest login and cleaned up qml files 2019-06-12 15:17:37 -07:00
Preston Bezos
34e9acc0b5 better fix for the toolbar remnant 2019-06-12 14:31:43 -07:00
Zach Fox
fade8f9c04 It works! 2019-06-12 12:47:48 -07:00
Roxanne Skelly
ca0c9e236b Cleanup 2019-06-12 11:58:26 -07:00
Roxanne Skelly
6e6bd18baa Undo Visual Studio mis-formatting 2019-06-12 11:43:43 -07:00
Zach Fox
51c2cc793a Tinkering with toolbar visibility signal - not quite working 2019-06-12 10:26:32 -07:00
Brad Hefta-Gaub
35cdd19456
Merge pull request #15721 from sethalves/quiet-asan-gpu-stats
BUGZ-623: Quiet asan gpu stats
2019-06-12 09:02:13 -07:00
Shannon Romano
b9e2443451
Merge pull request #15700 from ctrlaltdavid/DOC-63
DOC-63: Tablet JSDoc
2019-06-11 16:51:08 -07:00
Brad Hefta-Gaub
d9e3dd2857
Merge pull request #15742 from SimonWalton-HiFi/connections-hash-lock
Add mutex for Socket::_connectionsHash
2019-06-11 16:41:11 -07:00
Roxanne Skelly
8704a36d07 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-11 16:26:55 -07:00
Roxanne Skelly
67cb5821bc Update packet headers / add connect 'reason' 2019-06-11 16:00:49 -07:00
David Rowe
92eb418690 Doc review 2019-06-12 10:50:37 +12:00
Seth Alves
2fe8979206 fix warning 2019-06-11 15:46:12 -07:00
Simon Walton
1c03aeac20 Add lock for Connections map 2019-06-11 15:14:01 -07:00
jennaingersoll
1935b49538
Merge pull request #15676 from ctrlaltdavid/DOC-33
DOC-33: MyAvatar API JSDoc catch-up
2019-06-11 15:05:06 -07:00
Roxanne Skelly
071a779930 convert enum reason for disconnect to boolean 2019-06-11 14:38:39 -07:00
Roxanne Skelly
8a3672f3c5 Checkpoint MTBF uptime reporting 2019-06-11 12:41:45 -07:00
Howard Stearns
3111d2fa2e Merge branch 'master' of github.com:highfidelity/hifi into verbose-logging-2 2019-06-11 12:22:46 -07:00
Seth Alves
c5e1f2aedc change ContextStats::evalDelta to better handle wrapping values in graphics stats 2019-06-11 11:56:49 -07:00
Howard Stearns
bd446192e8 get windows error before calling io 2019-06-11 10:31:22 -07:00
Shannon Romano
973e93aa2f
Merge pull request #15729 from hyperlogic/bug-fix/avatar-data-max-size-computation
AvatarData: Fix avatarDataByteArray max size computation
2019-06-11 08:43:52 -07:00
Brad Hefta-Gaub
34283097d2
Merge pull request #15730 from SamGondelman/assert
BUGZ-631: Don't normalize zero vector in flipNormalsMyAvatarVsBackfacingTriangles
2019-06-11 07:48:29 -07:00
howard-stearns
d7f6685022 Merge branch 'master' of https://github.com/highfidelity/hifi into verbose-logging-2 2019-06-10 19:42:07 -07:00
Anthony J. Thibault
897e276188 Compile fix 2019-06-10 18:34:11 -07:00
Anthony J. Thibault
6c4e7cd805 AvatarData: arranged order of size computation reflect order in the packet. 2019-06-10 18:00:54 -07:00
Anthony J. Thibault
889a5d2bda AvatarData: Add FAR_GRAB_JOINTS_SIZE to byteArraySize computation. 2019-06-10 17:58:46 -07:00
Simon Walton
d780964cb4 Reset NodeList upon local nework change; abort current socket when rebinding
Also ensure QUdpSocket is owned by LimitedNodeList.
2019-06-10 17:28:49 -07:00
SamGondelman
88003c37d7 fix physics assert 2019-06-10 17:12:56 -07:00
Shannon Romano
04d707dbe0
Merge pull request #15723 from sethalves/zero-size-grid-asan
BUGZ-627: don't divide by zero if a grid entity-item has a zero dimension
2019-06-10 16:54:03 -07:00
Anthony J. Thibault
2fa16719cf AvatarData: Fix avatarDataByteArray max size computation
The previous size calculation did not take the presence of the hand controller section into account.
This could sometimes result in a buffer overrun of the network buffer as identified in a debug build.

https://highfidelity.atlassian.net/browse/BUGZ-526
2019-06-10 16:52:44 -07:00
Anthony J. Thibault
654b5775e1 Crash fix for ResourceCache::getResource()
A wrong 'read' locker is used around a critical section that actually modifies the _resources QHash.
This can result in memory corruption and seg faults.
2019-06-10 15:05:34 -07:00
Seth Alves
67995a8677 don't divide by zero if a grid entity-item has a zero dimension 2019-06-10 14:25:44 -07:00
Shannon Romano
1748d0527f
Merge pull request #15698 from samcake/nut
BUGZ-544: Refine the LOD manager target rate with the Refreshrate current target
2019-06-10 13:10:56 -07:00
Shannon Romano
1982424ee9
Merge pull request #15719 from SamGondelman/crash
BUGZ-545: Possible fix for Mac PolyLine-related crash
2019-06-10 12:56:31 -07:00
Roxanne Skelly
4a89d22482
Merge pull request #15694 from roxanneskelly/bugz516
BUGZ-516 - attempt to rebind bound sockets on silent domain checkin
2019-06-10 12:30:23 -07:00
Howard Stearns
9c6ca60108 get windows error first, check for socket changes, and fix bad Q_OS_WINDOWS ref 2019-06-10 12:08:51 -07:00
SamGondelman
23f8778feb possible fix for mac crash? 2019-06-10 11:10:29 -07:00
Howard Stearns
0e8753d9fc Merge branch 'master' of github.com:highfidelity/hifi into roxanneskelly-bugz516 2019-06-10 11:02:54 -07:00
Sam Gateau
32399997b1 Merge branch 'master' of github.com:highfidelity/hifi into nut 2019-06-10 10:52:53 -07:00
Simon Walton
aa65361b37 Merge remote-tracking branch 'upstream/master' into stun-on-iface-change 2019-06-10 10:32:31 -07:00
Shannon Romano
d8791c4379
Merge pull request #15710 from SamGondelman/lightmap
BUGZ-596: Fix baking of light maps
2019-06-10 10:13:55 -07:00
Sam Gateau
e0714e5b1a Removing comments 2019-06-07 17:18:30 -07:00
Sam Gateau
2d9a7f7c4f Refined the capping of the LOD Target Rate to be the lower REfreshrate when FOcus-inactive, this prevent the panic attacks of the LOD system on low end hardware 2019-06-07 17:00:37 -07:00
Howard Stearns
c7b87a34d2 Merge branch 'bugz516' of git://github.com/roxanneskelly/hifi into roxanneskelly-bugz516 2019-06-07 16:41:54 -07:00
Simon Walton
c088fab606 Fix annoying typo 2019-06-07 16:23:38 -07:00
Roxanne Skelly
ec1118db1f Attempting to write to a socket in unbound state was causing qt to crash
after a number of tries.  This fix does an initial check to prevent that
case.
2019-06-07 15:23:06 -07:00
SamGondelman
129d96a997 get rid of lightmapMap 2019-06-07 14:53:31 -07:00