Bradley Austin Davis
|
7eecc47672
|
Prevent deadlock crashes when building shaders at startup
|
2018-02-08 11:12:51 -08:00 |
|
Bradley Austin Davis
|
d2f5645f96
|
Don't trigger a backtrace exception on quitting while in HMD
|
2018-02-08 11:12:28 -08:00 |
|
Bradley Austin Davis
|
725eb14163
|
Fix for deadlock triggering while loading QML engine
|
2018-02-08 11:12:10 -08:00 |
|
John Conklin II
|
40851b097f
|
Merge pull request #12324 from ElderOrb/FB11844
Fix the issue with not re-enabling preview after it was auto-disabled by wallet/marketplace
|
2018-02-07 14:31:20 -08:00 |
|
Seth Alves
|
8d35bcb3e5
|
Merge pull request #12347 from AndrewMeadows/quickfix-tractor
remove initial glitch in Tractor (grab) action
|
2018-02-07 14:22:12 -08:00 |
|
Seth Alves
|
84ed23f547
|
Merge pull request #12292 from ElderOrb/FB11855
FB11855 - Change bubble icon on tablet
|
2018-02-07 14:03:16 -08:00 |
|
Zach Fox
|
7c492ef1cd
|
Merge pull request #12358 from highfidelity/revert-12316-commerce_inspectionCertRedesign
Revert "Commerce: Inspection Certificate Redesign"
|
2018-02-07 13:51:20 -08:00 |
|
Zach Fox
|
3c34d13ec6
|
Revert "Commerce: Inspection Certificate Redesign"
|
2018-02-07 13:22:09 -08:00 |
|
Andrew Meadows
|
d056e606c1
|
Merge pull request #31 from sethalves/test-12347
fix near-grab
|
2018-02-07 10:49:49 -08:00 |
|
Seth Alves
|
3e516cd2dd
|
Merge branch 'quickfix-tractor' of github.com:AndrewMeadows/hifi into test-12347
|
2018-02-07 10:48:19 -08:00 |
|
Andrew Meadows
|
57aef54237
|
pull master into AndrewMeadows/quickfix-tractor
|
2018-02-07 10:46:15 -08:00 |
|
Seth Alves
|
3e913cfcfe
|
AvatarActionHold has positional and rotational targets
|
2018-02-07 10:45:13 -08:00 |
|
Zach Fox
|
a40244b5d2
|
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign
Commerce: Inspection Certificate Redesign
|
2018-02-07 10:19:30 -08:00 |
|
Seth Alves
|
b44ae6b671
|
Merge branch 'master' of github.com:highfidelity/hifi into test-12347
|
2018-02-07 09:48:07 -08:00 |
|
Sam Gateau
|
27c9b0f39e
|
Merge pull request #12083 from NissimHadar/zoneOrientation
Zone orientation effect on keylight, skybox and ambient light.
|
2018-02-07 09:05:04 -08:00 |
|
Seth Alves
|
8239949da5
|
Merge branch 'master' of github.com:highfidelity/hifi into test-12347
|
2018-02-07 08:47:19 -08:00 |
|
NissimHadar
|
d01f9cd1fb
|
Fixing git crap.
|
2018-02-06 23:51:08 -08:00 |
|
Sam Gateau
|
346626498d
|
Merge pull request #12349 from jherico/android_scribe
Use version IDs in scribe tool downloads
|
2018-02-06 15:49:19 -08:00 |
|
Bradley Austin Davis
|
0c37263d95
|
Use version IDs in scribe tool downloads
|
2018-02-06 14:51:51 -08:00 |
|
Andrew Meadows
|
672520f3bf
|
quickfix for velocity spike for Tractor action
|
2018-02-06 12:06:27 -08:00 |
|
Alexander Ivash
|
151f20a92f
|
define onWalletScreen in this marketplaces.js scope
|
2018-02-06 21:25:41 +03:00 |
|
Seth Alves
|
81f75925da
|
Merge pull request #12337 from druiz17/fix-sit-script
fixing teleport module for sit script
|
2018-02-06 09:40:36 -08:00 |
|
John Conklin II
|
0e3bcda859
|
Merge pull request #12336 from sethalves/bump-av-protocol-more
try harder to bump avatar-mixer protocol version
|
2018-02-06 09:12:03 -08:00 |
|
Seth Alves
|
d8ad3192fe
|
Merge pull request #12332 from sethalves/fix-tractor-action-initial-crazy
Fix tractor action initial crazy
|
2018-02-06 08:59:25 -08:00 |
|
Seth Alves
|
213dd61502
|
Merge pull request #12341 from sethalves/fix-polyvox-visible
make polyvox entities visible again
|
2018-02-06 08:59:01 -08:00 |
|
Andrew Meadows
|
96c97547f9
|
Merge pull request #12205 from jherico/no_widgets
Remove some unneeded Qt dependencies
|
2018-02-05 15:32:54 -08:00 |
|
Seth Alves
|
33ca1fd344
|
make polyvox entities visible again
|
2018-02-05 14:58:34 -08:00 |
|
Bradley Austin Davis
|
b658d4add2
|
Merge pull request #12338 from vladest/fix_build_gcc7
Add include with std::function
|
2018-02-05 13:34:48 -08:00 |
|
vladest
|
0715a7cae5
|
Add include with std::function
|
2018-02-05 21:02:44 +01:00 |
|
Seth Alves
|
14d8259a5e
|
try harder to bump avatar-mixer protocol version
|
2018-02-05 11:54:48 -08:00 |
|
Dante Ruiz
|
601914180d
|
fixing teleport module for sit script
|
2018-02-05 11:52:35 -08:00 |
|
Stephen Birarda
|
52e63db70b
|
Merge pull request #12249 from birarda/bug/god-voice
refuse to handle positional audio streams with NaN position
|
2018-02-05 12:50:56 -07:00 |
|
John Conklin II
|
9c1cb60a43
|
Merge pull request #12333 from ctrlaltdavid/fix-spectator-camera
Fix the spectator camera
|
2018-02-05 11:06:59 -08:00 |
|
Stephen Birarda
|
761321875c
|
Merge pull request #12195 from birarda/bug/connection-refused
clear silent connection attempt counter on DomainHandler soft reset
|
2018-02-05 11:35:02 -07:00 |
|
Anthony Thibault
|
819af96fcc
|
Merge pull request #12331 from ctrlaltdavid/21732
Fix scaling of avatar submeshes attached to joints
|
2018-02-05 10:19:18 -08:00 |
|
David Rowe
|
3af7701cac
|
Fix the spectator camera
|
2018-02-04 12:06:20 +13:00 |
|
Seth Alves
|
639f7a52d8
|
remove unneeded/repeated line
|
2018-02-02 18:24:38 -08:00 |
|
Seth Alves
|
a6978a6dec
|
Merge branch 'make-your-branch' of github.com:AndrewMeadows/hifi into fix-tractor-action-initial-crazy
|
2018-02-02 18:15:59 -08:00 |
|
David Rowe
|
9818674549
|
Fix scaling of avatar submeshes attached to joints
|
2018-02-03 15:06:47 +13:00 |
|
Andrew Meadows
|
83ab994181
|
avoid initial bad measure of tractor target's velocity
|
2018-02-02 16:42:51 -08:00 |
|
John Conklin II
|
c8bb26ae74
|
Merge pull request #12294 from samcake/pastel
Improve startup time by optimizing shader bookkeeping
|
2018-02-02 16:37:44 -08:00 |
|
Stephen Birarda
|
7a21ae8d89
|
re-send a connection token packet if the current one is null
|
2018-02-02 15:25:43 -08:00 |
|
Andrew Meadows
|
a5e968867e
|
Merge pull request #12302 from druiz17/fix-another-bootstrapping
Fix another bootstrapping and rename entityItem _dirtyFlags
|
2018-02-02 15:14:38 -08:00 |
|
John Conklin II
|
9f4820df3b
|
Merge pull request #12255 from Zvork/trnormalmap
Normal map support on translucent objects
|
2018-02-02 14:19:50 -08:00 |
|
Zach Fox
|
2a0d85a119
|
Merge pull request #12315 from zfox23/commerce_SendMoneyNearbyParticle
Commerce: Send Money Nearby particle effect!
|
2018-02-02 14:17:48 -08:00 |
|
Stephen Birarda
|
eb9d100fc8
|
reset count on conn refusal, soft reset DH in Interface on limit reached
|
2018-02-02 13:47:48 -08:00 |
|
Stephen Birarda
|
98d581acd1
|
fix debug lines in DomainGatekeeper with extra parens
|
2018-02-02 13:47:48 -08:00 |
|
Stephen Birarda
|
e16a3859c2
|
reset silent check in packet check on domain connection reset
|
2018-02-02 13:47:48 -08:00 |
|
Zach Fox
|
28c9cd15a4
|
Merge pull request #12326 from zfox23/commerce_fixPopUpHover
Fix a bug where hover events incorrectly propagate under popups
|
2018-02-02 13:23:36 -08:00 |
|
Seth Alves
|
00b184124d
|
Merge pull request #12308 from vladest/fix_progress_animation
Image overlay uses bounds property
|
2018-02-02 12:53:20 -08:00 |
|