Ryan Downe Karpf
|
bc8ea1be17
|
Merge pull request #12421 from druiz17/RC64
don't update avatar entities if the avatars ID is AVATAR_SELF_ID
|
2018-02-16 08:41:10 -08:00 |
|
Dante Ruiz
|
52f576e6f6
|
don't update avatar entities if the avatars ID is AVATAR_SELF_ID
|
2018-02-15 15:48:29 -08:00 |
|
John Conklin II
|
db399a47eb
|
Merge pull request #12405 from ElderOrb/FB12297
Fix for privacy screen not displayed during wallet creation on step 3, while user entering password for the wallet
|
2018-02-15 09:47:45 -08:00 |
|
Alexander Ivash
|
611c67bf2f
|
FB12297 - HMD: Disabled preview mode only occurs during step 2 of the wallet setup wizard
|
2018-02-15 02:00:51 +03:00 |
|
John Conklin II
|
5a59e04096
|
Merge pull request #12381 from samcake/RC64
RC64 : Fixing the bad ambient lighting on scattering surfaces
|
2018-02-09 15:59:37 -08:00 |
|
samcake
|
522c577e73
|
FIxing the bad ambient lighting on scattering surfaces
|
2018-02-09 14:08:55 -08:00 |
|
John Conklin II
|
5b63c0523d
|
Merge pull request #12375 from druiz17/lasers-64
RC64 - fix lasers going to origin
|
2018-02-09 11:11:07 -08:00 |
|
John Conklin II
|
858e3e987c
|
Merge pull request #12372 from zfox23/RC64_commerce_inspectionCertRedesign_v2
RC64: Commerce: Inspection Certificate Redesign (Fixed!)
|
2018-02-09 10:12:53 -08:00 |
|
Seth Alves
|
6471780e21
|
allow overlay children to follow avatar from one domain to another
|
2018-02-08 17:43:08 -08:00 |
|
Dante Ruiz
|
7c21db93a3
|
fixing case when grabbed target is destroyed
|
2018-02-08 17:42:58 -08:00 |
|
Dante Ruiz
|
13ce6bbabd
|
fix lasers going to origin
|
2018-02-08 17:42:43 -08:00 |
|
John Conklin II
|
199321a5f2
|
Merge pull request #12373 from jherico/rc64_deadlocks
Deadlock fixes from master
|
2018-02-08 14:38:36 -08:00 |
|
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
|
ba92191fbb
|
Merge pull request #12362 from sethalves/pr-12312-for-rc64
undo part of #12312
|
2018-02-08 10:42:03 -08:00 |
|
Zach Fox
|
ecc0a2f43b
|
Bugfix.
|
2018-02-08 10:41:22 -08:00 |
|
Zach Fox
|
704d4255a5
|
Comment change
|
2018-02-08 10:41:17 -08:00 |
|
Zach Fox
|
679d53e2cf
|
This works, but is it correct?
|
2018-02-08 10:41:10 -08:00 |
|
Zach Fox
|
3a7e626463
|
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign
Commerce: Inspection Certificate Redesign
|
2018-02-08 10:41:04 -08:00 |
|
Seth Alves
|
a63393bc55
|
undo part of #12312
|
2018-02-07 14:50:59 -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 |
|