Gabriel Calero
58c135a74d
Merge remote-tracking branch 'upstream/master' into enable_aec_by_default
2018-11-05 11:25:09 -03:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm
...
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-11-02 16:44:31 -07:00
Howard Stearns
be17ed0910
Merge pull request #14327 from roxanneskelly/gift-update
...
Case 18794 - updates were being reported as gifts in the wallet
2018-11-02 16:42:03 -07:00
Chang Xing
67252467d8
Merge pull request #14317 from zfox23/moveSecuritySettings
...
Move Wallet Security tab to new dialog; fixup Login dialog
2018-11-02 16:29:05 -07:00
Ken Cooke
77988e400e
Merge pull request #14247 from sethalves/dont-let-checkdevices-swap-pool
...
don't let checkDevices swamp thread pool
2018-11-02 14:25:39 -07:00
Zach Fox
917fc4ad58
Update language
2018-11-02 09:23:31 -07:00
Roxanne Skelly
1f8dde6756
Transaction string was assuming items given to the
...
marketplace/highfidelity were Gifts and was reporting them as such.
Items given to the marketplace are in exchange for updates, and the memo
indicates such.
2018-11-01 15:44:11 -07:00
Zach Fox
0a15e94fe4
New colors
2018-11-01 13:27:31 -07:00
Zach Fox
581a19b13e
Merge branch 'master' of github.com:highfidelity/hifi into moveSecuritySettings
2018-11-01 13:15:54 -07:00
Zach Fox
d6477993a1
Make it work better with the tablet
2018-11-01 13:08:00 -07:00
Anthony Thibault
5c78a463de
Merge pull request #14270 from luiscuenca/softEntitiesLooseJointsFix
...
Extra joints on soft entities keep their local transform
2018-11-01 09:29:16 -07:00
Zach Fox
162a08b993
Restore certain images
2018-10-31 16:14:26 -07:00
Zach Fox
d4e9a70564
Almost there
2018-10-31 16:12:16 -07:00
John Conklin II
25be635b76
Merge pull request #14314 from birarda/bug/reliable-through-loss
...
avoid ambiguous RTT calcs and enable udt fast retransmit
2018-10-31 15:49:23 -07:00
David Kelly
e6c3e7e67f
initial purge of security tab from wallet
2018-10-31 15:33:28 -07:00
Zach Fox
41a0d09389
First pass
2018-10-31 15:31:51 -07:00
sabrina-shanman
643026abd6
Change local variable in TestFbx for clarity
2018-10-31 14:15:39 -07:00
sabrina-shanman
0b7ddca5f6
Change naming for straggler names in model loading debug dumps
2018-10-31 14:03:20 -07:00
Stephen Birarda
41ec026f8d
cleanup packet times, avoid ambiguous RTT calcs, allow fast re-transmit
2018-10-31 13:32:27 -07:00
Sam Gondelman
312f336210
Merge pull request #14302 from SamGondelman/queryAACube
...
Don't update QueryAACube in setParentID if _parentID didn't change
2018-10-31 11:46:16 -07:00
sabrina-shanman
becee7f010
Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-10-30 17:28:42 -07:00
SamGondelman
e64a4d0536
try to fix unnecessary queryAACube updates
2018-10-30 12:47:44 -07:00
Sam Gondelman
2dc761a57a
Merge pull request #14295 from SamGondelman/shape
...
Fix shape not getting marked changed
2018-10-30 11:04:32 -07:00
SamGondelman
df005eedbf
fix shape not getting marked changed
2018-10-29 17:43:16 -07:00
John Conklin II
db87fe9696
Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix
...
Fix avatars remain stuck in place for other users intermittently
2018-10-29 15:03:43 -07:00
John Conklin II
e01401294f
Merge pull request #14286 from ctrlaltdavid/M17988
...
Fix Interface eating memory when minimized
2018-10-29 12:52:10 -07:00
luiscuenca
e49e9cdc56
Set avatar client sooner
2018-10-29 07:25:22 -07:00
luiscuenca
056fe338e1
Apply transit logic if avatar instance is client side
2018-10-27 07:15:31 -07:00
luiscuenca
767f4e9d6d
Return server position
2018-10-26 17:16:43 -07:00
luiscuenca
62e4b3fead
Avatar mixer gets the updated position
2018-10-26 16:02:17 -07:00
David Rowe
1cca975b37
Fix Interface eating memory when minimized
2018-10-27 11:40:02 +13:00
Sam Gateau
439452f9ee
Merge pull request #14123 from jherico/fix/mac_gl2
...
Additional Mac OpenGL work
2018-10-26 15:38:23 -07:00
Ryan Huffman
c6403a44cb
Merge pull request #14281 from dback2/collidesPropertyFix
...
Fix Collides With subproperties
2018-10-26 13:46:52 -07:00
John Conklin II
fa2fb3a87a
Merge pull request #14246 from sethalves/sync-grab-props
...
keep userData and new grab properties in sync
2018-10-26 11:52:47 -07:00
Brad Davis
a3a952265a
Fix android crash
2018-10-26 11:23:30 -07:00
Brad Davis
36edb939c3
Try to fix android crash
2018-10-26 11:23:30 -07:00
Brad Davis
7ca8b54039
Fix crash on startup on windows / android
2018-10-26 11:23:30 -07:00
Brad Davis
9a30073f27
Only enable debug GL context on demand
2018-10-26 11:23:29 -07:00
Brad Davis
405ec228b8
Fix mac warning
2018-10-26 11:23:29 -07:00
Bradley Austin Davis
28b45ce1d9
Resolve compositing glitches
2018-10-26 11:23:29 -07:00
Bradley Austin Davis
95d160a170
Working on mac GL issues
2018-10-26 11:23:29 -07:00
Sam Gondelman
7339a43536
Merge pull request #14278 from SamGondelman/macbs
...
Mac: Possibly fix a completely different blendshapes bug
2018-10-26 09:26:30 -07:00
David Back
13acfb325a
fix collides with properties, fix ordering for start/finish/spread properties
2018-10-25 15:06:15 -07:00
John Conklin II
2dfd63f4e7
Merge pull request #14229 from thoys/feat/create/tooltips
...
MS19052 [CreateApp]: Tooltips
2018-10-25 14:52:16 -07:00
SamGondelman
7dff015585
maybe?
2018-10-25 14:40:58 -07:00
John Conklin II
7227547b6a
Merge pull request #14279 from dback2/removeParticleExplorer
...
Remove particle explorer
2018-10-25 13:37:22 -07:00
Jeff Clinton
946d68af6a
Merge pull request #14262 from SamGondelman/particleLoad
...
Fix and expose Particle Entity emitRadiusStart
2018-10-25 12:41:02 -07:00
John Conklin II
2eb801bdc6
Merge pull request #14035 from SimonWalton-HiFi/avatar-mixer-improvements
...
Further avatar-mixer improvements
2018-10-25 12:25:32 -07:00
David Back
eb347c5596
remove particle explorer
2018-10-25 11:30:18 -07:00
SamGondelman
faff5f11e8
Merge remote-tracking branch 'upstream/master' into particleLoad
2018-10-25 10:56:11 -07:00
