Brad Davis
|
7d5502eb92
|
Migrating QML rendering off the main thread
|
2018-02-06 11:53:09 -08: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 |
|
Seth Alves
|
b3250ff4b6
|
Merge pull request #12158 from sethalves/cauterize-head-av-entities-1
don't draw head-descendant entitys with 1st-person camera
|
2018-02-02 11:57:49 -08:00 |
|
Stephen Birarda
|
ffd10b79bf
|
refuse to handle positional audio streams with NaN position
|
2018-02-02 11:21:50 -08:00 |
|
Zach Fox
|
f26477b3e1
|
Slight wording change to Optional Message placeholder
|
2018-02-02 11:00:32 -08:00 |
|
Zach Fox
|
2f3448ed1f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle
|
2018-02-02 10:59:49 -08:00 |
|
Zach Fox
|
19235b8d94
|
Fix a bug where hover events incorrectly propagate under popups
|
2018-02-02 10:50:35 -08:00 |
|
Olivier Prat
|
03daba9bac
|
Removed duplicate shader include
|
2018-02-02 18:18:24 +01:00 |
|
Seth Alves
|
861497e907
|
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
|
2018-02-02 08:56:18 -08:00 |
|
Seth Alves
|
14d5029f4d
|
only update cauterization of child entities when something relevant changes
|
2018-02-02 08:56:11 -08:00 |
|
Olivier Prat
|
a44c5c9814
|
Merge branch 'master' of http://github.com/highfidelity/hifi into trnormalmap
|
2018-02-02 08:46:38 +01:00 |
|
Melissa Brown
|
bf5b875382
|
Merge pull request #12241 from 1P-Cusack/FogBugz/Case_4315_okbutton
[Case 4315] Edit menu color picker OK button is hard to use in HMD
|
2018-02-01 16:52:07 -08:00 |
|
John Conklin II
|
cbdbf51ccd
|
Merge pull request #12317 from hyperlogic/feature/remove-ik-hips-offset
Removal of hips offset shifting from AnimInverseKinematics node
|
2018-02-01 15:30:08 -08:00 |
|
Zach Fox
|
dd2b7eb107
|
Send Money Effect & Lightbox
|
2018-02-01 15:17:50 -08:00 |
|
Seth Alves
|
53f536c476
|
Merge pull request #12320 from ctrlaltdavid/21731
Bump avatar mixer packet version
|
2018-02-01 14:28:23 -08:00 |
|
Seth Alves
|
45ab2e9654
|
Merge pull request #12319 from hyperlogic/bug-fix/cauterization-on-rigid-bound-mesh
Fix for rigidly bound mesh not being properly cauterized.
|
2018-02-01 13:44:27 -08:00 |
|
samcake
|
9867b479fd
|
APplying review feedback
|
2018-02-01 13:12:28 -08:00 |
|
David Rowe
|
f46362906d
|
Bump avatar mixer packet version
|
2018-02-02 10:02:20 +13:00 |
|
Seth Alves
|
0a94af53fc
|
Merge pull request #12314 from ctrlaltdavid/21731
FBX fixes
|
2018-02-01 12:12:38 -08:00 |
|
Seth Alves
|
f7027b52e1
|
Merge pull request #12311 from ElderOrb/FB11511
FB11511 - position of log windows should be persistent between invocations of interface
|
2018-02-01 12:11:30 -08:00 |
|
Seth Alves
|
bdf6736a54
|
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
|
2018-02-01 12:04:56 -08:00 |
|
Anthony J. Thibault
|
a1b67afabf
|
Fix for rigidly bound mesh not being properly cauterized.
For example, sometimes in first person view, you can see the back of your avatar's eyes or the brim of your avatar's hat.
|
2018-02-01 11:57:50 -08:00 |
|