Howard Stearns
71cff45fbb
Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2
2018-09-24 14:38:21 -07:00
Roxanne Skelly
16dba169c5
Tray Notifier code review fixes
2018-09-24 14:36:54 -07:00
John Conklin II
55848e6959
Merge pull request #14008 from sethalves/fix-local-angular-velocity
...
fix bug that caused localAngularVelocity to get zeroed out
2018-09-24 14:32:57 -07:00
SamGondelman
ad73cb3996
fix avatar highlighting
2018-09-24 14:02:35 -07:00
Howard Stearns
2b1e581571
Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2
2018-09-24 14:01:42 -07:00
Wayne Chen
ac5814a1f8
Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect
2018-09-24 13:57:23 -07:00
John Conklin II
a602bff217
Merge pull request #13981 from gcalero/android_settings
...
Android settings (AEC)
2018-09-24 13:55:30 -07:00
Howard Stearns
d3391b9273
Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2
2018-09-24 13:50:52 -07:00
Roxanne Skelly
6f4c376d9f
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-24 13:45:24 -07:00
Roxanne Skelly
d5baadbefa
Modify --url hifiapp: behavior to trigger through appUI when first
...
starting interface.
Also, menu names and order follow UX documentation.
2018-09-24 13:43:55 -07:00
John Conklin II
1f6f51993d
Merge pull request #14029 from huffman/fix/keyboard-logging-in-edit
...
Remove verbose logging of keyboard messages in edit.js and gridTool.js
2018-09-24 12:54:43 -07:00
John Conklin II
45b206d748
Merge pull request #14065 from SamGondelman/blendshapeCrash
...
Fix blendshape crash on avatar removal
2018-09-24 12:39:52 -07:00
Andrew Meadows
c1d65f5118
update avatar shape after it loads
2018-09-24 12:07:08 -07:00
John Conklin II
d520152a95
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements
...
Small Improvements to Anim Stats
2018-09-24 11:56:01 -07:00
Anthony Thibault
b467267e40
Fix for bad static_pointer_cast on exit.
...
Identified by Address Sanatizer on Linux.
On exit ~Applicaiton calls AvatarManager::deleteAllAvatars. This iterates over all avatars remaining in the _avatarHash.
Typically this includes the MyAvatar instance. In this case the previous code would attempt to static cast an AvatarData pointer to an instance
of OtherAvatar. This might be harmless, but could also lead hard to diagnose issues such as memory corruption.
2018-09-24 11:47:05 -07:00
luiscuenca
012cd207b3
No data sent during basic transit
2018-09-24 11:39:10 -07:00
Stephen Birarda
b31837168d
fix bad lock, optimize some operations, clarify comment
2018-09-24 11:27:20 -07:00
sabrina-shanman
e15f22d6ca
Add pick parenting markdeep doc
2018-09-24 11:13:38 -07:00
sabrina-shanman
a5950156cc
Add markdeep for docs
2018-09-24 11:13:13 -07:00
David Back
15051364dc
Merge branch 'master' into newEntityListView
2018-09-24 11:04:38 -07:00
John Conklin II
9916496118
Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74
...
Fix entity list selection failing when selecting entities not in list
2018-09-24 11:02:36 -07:00
David Back
df48c60a8f
further improvements/fixes
2018-09-24 10:28:37 -07:00
SamGondelman
d772cdb34a
please
2018-09-24 10:16:35 -07:00
Zach Fox
57c303440b
Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps
2018-09-24 09:32:53 -07:00
David Back
074c3f2c7c
Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView
2018-09-24 09:23:44 -07:00
Dante Ruiz
5a8ab61426
Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial
2018-09-24 09:21:36 -07:00
Sam Gateau
4210ce46aa
bringing the tex corrd transform in the Material struct and shaving one ubo
2018-09-23 23:10:56 -07:00
David Rowe
5ff2c36917
Get play area displaying and working again
2018-09-24 15:53:47 +12:00
David Rowe
e29b403abc
Merge branch 'master' into M18586
...
# Conflicts:
# interface/src/raypick/PointerScriptingInterface.cpp
# interface/src/raypick/PointerScriptingInterface.h
# interface/src/raypick/StylusPointer.h
# libraries/pointers/src/Pointer.h
# scripts/system/controllers/controllerModules/teleport.js
2018-09-24 11:44:28 +12:00
NissimHadar
ee0f901aa7
Merge branch 'addDailyTests' of https://github.com/NissimHadar/hifi into addDailyTests
2018-09-22 18:39:15 -07:00
NissimHadar
516a0bfb8b
Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests
2018-09-22 18:39:00 -07:00
Sam Gateau
b3112f898a
Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis
2018-09-22 18:04:24 -07:00
NissimHadar
6e538319b2
Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests
2018-09-22 11:24:20 -07:00
luiscuenca
82b14b6e9b
Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport
2018-09-22 05:47:05 -07:00
luiscuenca
01f87a0645
lerp myavatar
2018-09-22 05:34:17 -07:00
NissimHadar
6fe106089a
Decreased threshold a wee bit.
2018-09-21 17:34:37 -07:00
sam gateau
d8984dafa0
ui allows to enable/disable the deformer componenets
2018-09-21 16:45:21 -07:00
Dante Ruiz
d4450ac780
fix equip and keeping new functionallity
2018-09-21 15:59:00 -07:00
David Kelly
fe9b972c80
Do not have active buy button on invalidated items
2018-09-21 15:46:57 -07:00
Seth Alves
86e502637e
Make Settings thread safe
2018-09-21 15:46:35 -07:00
NissimHadar
2a1e3e93a5
Fixed a couple of bugs.
2018-09-21 14:52:32 -07:00
Wayne Chen
3f9c8a266d
reszing unameField/showing flavorText
2018-09-21 14:36:13 -07:00
Roxanne Skelly
61cbee72af
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-21 12:31:36 -07:00
John Conklin II
ea7bc26ad8
Merge pull request #14038 from wayne-chen/fixInterstitialButton
...
Fix Interstitial GoTo button stretch
2018-09-21 11:44:48 -07:00
John Conklin II
fa5bb84628
Merge pull request #14043 from huffman/fix/entity-list-sort-visible-lock-74
...
Fix sorting of entity list not working as expected
2018-09-21 11:44:17 -07:00
Dante Ruiz
d3368146ce
saving work
2018-09-21 11:42:26 -07:00
John Conklin II
428ace17e1
Merge pull request #14001 from wayne-chen/fixLoginFailTwiceCall
...
Fixing double loginFailed
2018-09-21 11:36:06 -07:00
Gabriel Calero
f4be767d22
Android sign up
2018-09-21 14:58:11 -03:00
Zach Fox
6284074ff9
Don't show banner when app is open but continue updating data
2018-09-21 10:47:59 -07:00
Seth Alves
6eb3fa251d
guard against null deref
2018-09-21 10:39:41 -07:00
