Sam Gondelman
|
4d621ba61c
|
Merge branch 'master' into splash
|
2018-11-27 16:01:07 -08:00 |
|
SamGondelman
|
1f354f813c
|
rework shader pre-compilation
|
2018-11-27 14:38:02 -08:00 |
|
Jeff Clinton
|
fd87aad3c2
|
Merge pull request #14465 from sethalves/fix-up-disable-qml
make cmake -DDISABLE_QML=1 work again
|
2018-11-27 14:16:25 -08:00 |
|
Seth Alves
|
8f21ade0c7
|
make cmake -DDISABLE_QML=1 work again
|
2018-11-27 12:41:40 -08:00 |
|
Shannon Romano
|
d6c7027fea
|
Merge pull request #14437 from sethalves/fix-asan-shared-lib-problem
fix linux + clang build when memory debugging is enabled
|
2018-11-27 12:25:13 -08:00 |
|
Sam Gateau
|
87730884ab
|
Merge pull request #14340 from Nex-Pro/patch-5
Change to English spelling of 'declination'
|
2018-11-27 10:53:28 -08:00 |
|
Antonina Savinova
|
d547a29f94
|
Merge pull request #14438 from birarda/bug/update-wireshark-dissectors
update wireshark dissector with correct control packet types
|
2018-11-26 13:55:14 -08:00 |
|
Shannon Romano
|
422045861a
|
Merge pull request #14471 from jherico/fix/macbuild
Make vcpkg build default to home directory on mac
|
2018-11-26 13:30:06 -08:00 |
|
Brad Davis
|
43b9aa29bc
|
Make vcpkg build default to home directory on mac
|
2018-11-26 12:37:11 -08:00 |
|
John Conklin II
|
7e2f1ca64a
|
Merge pull request #14436 from birarda/bug/no-naks-after-timeout
ensure packets are always added to loss list after estimated timeout
|
2018-11-21 15:48:14 -08:00 |
|
Seth Alves
|
87878cbdee
|
use -shared-libasan with clang whem memory debugging is enabled
|
2018-11-20 10:40:32 -08:00 |
|
John Conklin II
|
87cac67c75
|
Merge pull request #14280 from ElderOrb/FB17381
FB17381 - Reticle.setVisible isn't working
|
2018-11-20 09:53:52 -08:00 |
|
John Conklin II
|
04ccf9a257
|
Merge pull request #14435 from dback2/draggableNumberDelay2
Entity list - prevent draggable number updates while dragging
|
2018-11-20 09:16:14 -08:00 |
|
John Conklin II
|
9b886ff725
|
Merge pull request #14391 from SimonWalton-HiFi/upload-to-ds-chunked
Upload content to domain server in multiple chunks
|
2018-11-19 17:53:44 -08:00 |
|
birarda
|
23857ea8c2
|
ensure packets are added to loss list after timeout
|
2018-11-19 17:40:55 -08:00 |
|
birarda
|
e52c7d9c85
|
update the control packet types after removals
|
2018-11-19 17:32:18 -08:00 |
|
David Back
|
dff4e34e7b
|
CR changes
|
2018-11-19 16:59:33 -08:00 |
|
Jeff Clinton
|
30051f75da
|
Merge pull request #14434 from sethalves/fix-throw-from-worker
catch QString exceptions that ModelCache can throw
|
2018-11-19 16:36:52 -08:00 |
|
David Back
|
249ebb2389
|
remove unneeded
|
2018-11-19 16:21:52 -08:00 |
|
Ryan Huffman
|
b7fe3d47be
|
Merge pull request #14433 from huffman/fix/entity-properties-styling
Fix several entity tool window styling issues
|
2018-11-19 16:17:50 -08:00 |
|
David Back
|
ff6d43d0e4
|
block updates during dragging
|
2018-11-19 16:15:11 -08:00 |
|
SamGondelman
|
372f4390e8
|
replicate default skybox
|
2018-11-19 19:14:07 -05:00 |
|
Seth Alves
|
26a50e1820
|
don't log urls!
|
2018-11-19 15:38:12 -08:00 |
|
Simon Walton
|
2a7e22bf31
|
Identify initial chunk of an upload so as to be more resilient
|
2018-11-19 15:26:08 -08:00 |
|
Seth Alves
|
cd177a4457
|
catch QString exceptions that ModelCache can throw
|
2018-11-19 15:25:14 -08:00 |
|
John Conklin II
|
378742f896
|
Merge pull request #14431 from Atlante45/fix/throttle
Turn off throttling behavior when not throttling
|
2018-11-19 14:48:05 -08:00 |
|
Ryan Huffman
|
007396346c
|
Fix grid tool styling
|
2018-11-19 14:07:24 -08:00 |
|
Simon Walton
|
987f5317a9
|
Merge pull request #14428 from birarda/bug/traits-in-budget
consider avatar traits bytes in budget and omit if over
|
2018-11-19 12:58:48 -09:00 |
|
Ryan Huffman
|
c87748830f
|
Merge pull request #14430 from thoys/fix/create/propertiesAutoScrollOnNewEntity
MS19903: don't trigger virtual keyboard scroll on non input focus.
|
2018-11-19 13:52:22 -08:00 |
|
Ryan Huffman
|
7694aa8e66
|
Fix draggable number going into edit too often
|
2018-11-19 13:51:25 -08:00 |
|
Ryan Huffman
|
193b9752b8
|
Fix styling of properties window when narrow
|
2018-11-19 13:50:56 -08:00 |
|
Clement
|
359a841f69
|
Turn off throttling behavior when not throttling
|
2018-11-19 12:28:04 -08:00 |
|
Thijs Wenker
|
84e8e21d85
|
don't trigger virtual keyboard scroll on non input focus.
|
2018-11-19 21:08:21 +01:00 |
|
birarda
|
a0a87e7170
|
consider avatar traits bytes in budget and omit if over
|
2018-11-19 10:55:05 -08:00 |
|
Jeff Clinton
|
484de06cf4
|
Merge pull request #14422 from SimonWalton-HiFi/entities-json-less-strict
Don't check for presence of particular keys in models json
|
2018-11-19 10:29:10 -08:00 |
|
John Conklin II
|
6b25179aa9
|
Merge pull request #14420 from danteruiz/fix-keyboard-loging-issue
Dismiss keyboard when backout of the login screen
|
2018-11-19 09:58:54 -08:00 |
|
John Conklin II
|
d63a850ec0
|
Merge pull request #14409 from danteruiz/keyboard-touchups
keyboard address some feedback
|
2018-11-19 09:48:00 -08:00 |
|
Jeff Clinton
|
870619b19d
|
Merge pull request #14412 from amantley/avatarPipelineOffsets
Avatar Pipeline Joint Rotation Offsets Handling
|
2018-11-19 08:54:29 -08:00 |
|
SamGondelman
|
0fccb4c73c
|
move to batch, try to use static
|
2018-11-17 01:45:16 -08:00 |
|
Seth Alves
|
b72f462028
|
Merge pull request #14406 from danteruiz/master-disable-interstitial
disable interstitial for master
|
2018-11-16 20:13:50 -08:00 |
|
Ryan Huffman
|
7701be0742
|
Merge pull request #14410 from thoys/fix/create/entityListDoubleClick
CreateApp Fix entity list double click rename / highlight and virtual keyboard issue
|
2018-11-16 18:41:47 -08:00 |
|
Simon Walton
|
3baebf55c5
|
Don't enforce key presence in models.json
|
2018-11-16 17:33:13 -08:00 |
|
Thijs Wenker
|
ba790ae470
|
fix behavior after merge.
|
2018-11-17 01:20:36 +01:00 |
|
Dante Ruiz
|
4388763c34
|
fixing keyboard not being dismissing when backout of the login screen
|
2018-11-16 16:04:40 -08:00 |
|
Simon Walton
|
2d2cc0eaca
|
Use a random session id for a sequence of chunks
|
2018-11-16 15:56:39 -08:00 |
|
Jason Najera
|
da3ea682ba
|
Merge pull request #14347 from r3tk0n/19550-oculus-store-v2
MS19550 - Don't show help for HMDs that aren't plugged in and active
|
2018-11-16 15:49:46 -08:00 |
|
Antonina Savinova
|
4fc43e197c
|
Merge pull request #14417 from birarda/feat/throttle-in-domain-settings
add throttle start and backoff to DS settings
|
2018-11-16 15:22:01 -08:00 |
|
SamGondelman
|
cbe5814c64
|
shader compilation prototype
|
2018-11-16 15:18:56 -08:00 |
|
Shannon Romano
|
6425a474ac
|
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading
Fixing case of interstitial not finishing loading
|
2018-11-16 14:53:01 -08:00 |
|
Simon Walton
|
5883035991
|
Gcc doesn't like QTemporaryFile in a map so store unique ptrs
|
2018-11-16 14:50:03 -08:00 |
|