Stephen Birarda
e16a3859c2
reset silent check in packet check on domain connection reset
2018-02-02 13:47:48 -08:00
Seth Alves
64a46bf5df
merge from upstream
2018-01-31 10:43:41 -08:00
Atlante45
bc819c698e
Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back
2018-01-30 16:09:30 -08:00
John Conklin II
215d03c4ce
Merge pull request #12269 from sethalves/backtrace-for-rc-63
...
Backtrace for rc 63
2018-01-30 15:13:01 -08:00
Atlante45
db08f1dda6
Move backtrace to interface
2018-01-30 11:39:48 -08:00
Anthony Thibault
1e8a5485c1
8x shader compilation optimization and watchdog disable
...
addPlumberPipeline in RenderPipelines.cpp would recompile
a single program 7 more times then necessary. This was
causing startup times on Mac OS X to trigger the deadlock
watchdog.
Even with this fix, compiling shaders is still too slow,
As a workaround, we disable the watchdog thread during
rendering pipeline setup.
2018-01-30 10:27:06 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
Dante Ruiz
a670a0b9a2
Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark
2018-01-29 11:25:26 -08:00
Seth Alves
b7303414f2
unmangle merges
2018-01-26 11:57:30 -08:00
Seth Alves
19409cc6ce
fix merge/cherry-pick error
2018-01-26 10:45:18 -08:00
Seth Alves
dbe9fd290e
comment out code that would set annotations after StartHandler is called
2018-01-26 09:23:29 -08:00
Seth Alves
c550620cb4
backtrace for rc-63
2018-01-26 09:23:24 -08:00
Atlante45
39f26e35f0
backtrace for rc-63
2018-01-26 09:22:14 -08:00
Sam Gateau
51dac04374
Introducing the tag in lieu of the vsisiblity mask
2018-01-26 02:59:43 -08:00
Sam Gateau
23b99f04cd
Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch
2018-01-25 18:33:37 -08:00
Brad Davis
867bb99b51
Fix help screen URL
2018-01-25 13:04:08 -08:00
ZappoMan
cb01bd14b9
Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription
2018-01-25 10:39:43 -08:00
Andrew Meadows
a0e07a2c4b
Merge pull request #12232 from luiscuenca/showHelp
...
Fix Interface first launch should show help
2018-01-24 12:11:34 -08:00
Seth Alves
1cbc2e31cf
merge from upstream
2018-01-23 15:21:03 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
luiscuenca
3c12ae8925
Fix Edit/Asset Browser in HMD mode
2018-01-22 20:52:18 -07:00
luiscuenca
6d6950deca
Fix Interface first launch should show help
2018-01-22 16:25:58 -07:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
John Conklin II
22ee57db74
Merge pull request #12214 from 1st-BrainStormer/master
...
Fix lockup when no midi devices present.
2018-01-22 11:25:46 -08:00
ZappoMan
4ad5d34a10
more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel
2018-01-20 17:20:42 -08:00
Bruce Brown
f7caba5295
de-bounce Midi::USBchanged signal.
...
Debounced USBchanged signal to prevent pauses.
2018-01-20 11:17:47 -08:00
Brad Davis
d53b8b38ac
Merge remote-tracking branch 'upstream/master' into android
2018-01-19 14:35:20 -08:00
Brad Davis
686393d62f
Load built-in resources earlier
2018-01-19 14:35:04 -08:00
Seth Alves
9be2c67f00
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 11:46:34 -08:00
Zach Fox
9d6e62d6bf
Merge pull request #12163 from ElderOrb/FB11109
...
FB11109 Preview disabled image swap (Commerce only)
2018-01-19 11:40:05 -08:00
Seth Alves
bce9b5f459
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 09:53:54 -08:00
Brad Davis
bdfa1273ba
Merge remote-tracking branch 'upstream/master' into android
2018-01-18 17:33:10 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702
...
Add Window.protocolSignature() as a replacement for location.protocolVersion()
2018-01-18 15:20:03 -08:00
Sam Gateau
aec99db4fc
Merge pull request #12157 from AndrewMeadows/lod-debug-ui
...
add scripted/qml debug UI for render LOD
2018-01-18 15:00:50 -08:00
Brad Hefta-Gaub
c9cedcb2c0
Merge pull request #12183 from SamGondelman/pointerCrash
...
Destroy PointerManager before PickManager
2018-01-18 14:58:20 -08:00
Alexander Ivash
a74b093b60
FB11109 Preview disabled image swap (Commerce only)
2018-01-18 23:26:43 +03:00
Andrew Meadows
82cab5e4a1
add scripted/qml debug UI for render LOD
2018-01-18 08:53:45 -08:00
Sam Gateau
7a9740d258
visible-perview
2018-01-18 02:18:46 -08:00
Brad Davis
cbb2d9d854
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 17:51:39 -08:00
Zach Fox
1d747bc0e4
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-17 11:56:00 -08:00
Bradley Austin Davis
9f6c2c3cdd
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 11:44:00 -08:00
Dante Ruiz
ebb09f4271
Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark
2018-01-17 11:04:46 -08:00
David Back
92c0fd4877
Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS
...
Merge Account & GlobalServices follow-up
2018-01-17 10:50:54 -08:00
Brad Davis
6a06bf405a
Merge remote-tracking branch 'upstream/master' into android
2018-01-16 18:24:44 -08:00
Sam Gateau
d4571bd86a
Merge pull request #12181 from humbletim/rename-model-graphics
...
Rename libraries/model -> libraries/graphics
2018-01-16 18:12:25 -08:00
David Rowe
2883e24285
Add Window.protocolVersion() as a replacement for location's
2018-01-17 12:00:35 +13:00
Bradley Austin Davis
b4223215ef
Use old style resources on OSX for now
2018-01-16 14:44:05 -08:00
Clément Brisset
1949471dad
Merge pull request #12182 from highfidelity/stable
...
Merge stable (RC62) to master
2018-01-16 11:01:07 -08:00
SamGondelman
c3eb4b5ecd
destroy pointermanager before pickmanager
2018-01-16 10:31:42 -08:00
humbletim
b91d536dd0
rename model:: -> graphics::
2018-01-16 12:46:16 -05:00
