Anthony Thibault
656051a6e0
Added coding standard doc to project
2019-03-29 14:57:09 -07:00
Shannon Romano
f926298020
Merge pull request #15297 from NissimHadar/21984-fixNitpickCMake
...
Case 21988: Use place holder instead of RCC file.
2019-03-29 13:16:56 -07:00
Shannon Romano
df97f595f2
Merge pull request #15279 from kitely/allow-emails-with-plus-sign
...
case 21982: Allow logging-in with an email that contains a '+' sign
2019-03-29 13:04:11 -07:00
NissimHadar
709515dd74
Use place holder instead of RCC file.
2019-03-29 11:48:15 -07:00
Sam Gondelman
968dbb825a
Merge pull request #15243 from SamGondelman/proceduralTime
...
Case 21876: New procedural uniforms for time, iEntityTime and iLocalCreatedTime
2019-03-29 11:35:41 -07:00
Shannon Romano
ec44f5fddf
Merge pull request #15156 from NissimHadar/21660-updateNitpickForQuest
...
Case 21660: unique command line to run Interface on Quest - v3.1.5
2019-03-29 11:09:36 -07:00
Shannon Romano
c4925ddfa0
Merge pull request #15259 from SimonWalton-HiFi/avatar-hero-zone-improvements
...
Avatar hero zone improvements
2019-03-29 10:49:06 -07:00
Shannon Romano
ac0130d4c7
Merge pull request #15234 from SimonWalton-HiFi/clear-connection-on-add-node
...
When adding new Node clear any dangling Connection objects
2019-03-29 10:46:22 -07:00
Shannon Romano
a83b90cdc6
Merge pull request #15044 from sethalves/lock-wearables
...
case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables
2019-03-29 10:41:21 -07:00
John Conklin II
56dde6e240
Merge pull request #15235 from Atlante45/fix/traits
...
Case 21108: Make traits easier to extend
2019-03-29 10:37:55 -07:00
Ken Cooke
201d115cb6
Merge pull request #15274 from kencooke/audio-server-echo-fix
...
Case 21947: Fix the audio level of server echo
2019-03-29 10:12:37 -07:00
Simon Walton
bc7fb10ab9
Fixes from review
2019-03-28 17:54:35 -07:00
NissimHadar
705e6432a7
Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest
2019-03-28 12:46:36 -07:00
NissimHadar
d230fc86db
CR comments.
2019-03-28 12:23:25 -07:00
Roxanne Skelly
73cf51182e
Merge pull request #15262 from roxanneskelly/Case20832
...
Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.
2019-03-28 12:01:24 -07:00
NissimHadar
de1c40e994
Changed version.
2019-03-28 11:27:35 -07:00
Anthony Thibault
65507cfe11
Merge pull request #15180 from luiscuenca/flowCppFixes
...
Fix Flow touch and scale issues
2019-03-28 11:11:08 -07:00
Anthony Thibault
b0d5a82c80
Merge pull request #15169 from hyperlogic/bug-fix/rig-assert-fix
...
Rig.cpp: Fix for index out of range assert in debug builds
2019-03-28 11:10:32 -07:00
Anthony Thibault
cee298acdf
Merge pull request #15205 from amantley/rootTransBug
...
Fixed Bug For Old FBX Files That Have An Exported Pose Different From The Bind Pose
2019-03-28 11:10:03 -07:00
Oren Hurvitz
3d5035886c
Allow logging-in with an email that contains a '+' sign.
...
Previously, attempts to login using an email such as "my+name@example.com" didn't work because the username wasn't
URL-encoded when it was sent to the server, so on the server the '+' was changed to a space.
2019-03-28 10:45:55 +01:00
NissimHadar
e95efc29e4
Bug fix after code review.
2019-03-27 19:00:28 -07:00
Clement
88a19f26e2
Use process function for overrides
2019-03-27 15:44:32 -07:00
Clement
3221e1dbd5
Simplify packing/unpacking for easier extension
2019-03-27 15:44:32 -07:00
Clement
d7d5938c20
Pack all simple traits
2019-03-27 15:44:32 -07:00
Clement
483b7a67b9
Fix simple traits vector bad init
2019-03-27 15:44:32 -07:00
Shannon Romano
8ff47659d3
Merge pull request #15273 from SamGondelman/transparency
...
Case 21949: Fix transparent shape flickering
2019-03-27 14:21:04 -07:00
Ken Cooke
abb0a166b1
Merge pull request #15260 from kencooke/audio-mixer-volume-control
...
Case 21902: System-wide independent volume controls
2019-03-27 13:19:30 -07:00
Simon Walton
e62270fccf
Fixes for inline jsdoc
2019-03-27 12:00:30 -07:00
SamGondelman
36921276c6
fix transparent shape flickering
2019-03-27 11:52:37 -07:00
Angus Antley
fcb45802bd
removed debug print
2019-03-27 11:19:28 -07:00
Ken Cooke
dae69ea4cd
Ensure server echo always has unity gain
2019-03-27 10:58:52 -07:00
Sam Gondelman
2005293b3f
Merge pull request #15269 from sethalves/audio-loopback-button-is-local
...
case 21932: the test-audio button causes a local audio-loopback rather than a server one
2019-03-27 10:54:57 -07:00
Simon Walton
6b21fc1af7
Merge remote-tracking branch 'upstream/master' into avatar-hero-zone-improvements
...
Fix jsdoc conflict, also minor clean-up.
2019-03-27 10:54:49 -07:00
Sam Gondelman
0a28090aa4
Merge pull request #15213 from MiladNazeri/Fix/avatarDominantHandChanged
...
Updated engine code to not emit if dominant hand isn't actually changed
2019-03-27 10:53:00 -07:00
Sam Gondelman
ffbf678695
Merge pull request #15217 from jherico/fix/framereader_files
...
Case 21793: Fix loading relative files
2019-03-27 10:52:35 -07:00
Sam Gondelman
0f99280c15
Merge pull request #15265 from hyperlogic/bug-fix/blendshape-precision
...
Improve blendshape precision for small models
2019-03-27 10:51:22 -07:00
Sam Gondelman
3c42cb34ed
Merge pull request #15251 from SamGondelman/animation82
...
Case 21888: Revert changes that impacted animation performance
2019-03-27 10:50:43 -07:00
Andrew Meadows
fb7daa185d
improved physics for grabbed AvatarEntities
2019-03-27 10:12:59 -07:00
Seth Alves
e085a00256
cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open
2019-03-27 10:12:58 -07:00
Seth Alves
d25d290394
refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term
2019-03-27 10:12:58 -07:00
Seth Alves
e6c279ee5b
unlock, rather than lock entities when adjust-attachments window is open, because the windows says you can adjust with hand-controllers
2019-03-27 10:12:58 -07:00
Seth Alves
5695c15809
avoid a deadlock when code invoked by onAddingEntity or onDeletingEntity runs more code that locks the entity tree
2019-03-27 10:12:57 -07:00
Seth Alves
fa36f12145
lock wearables when adjust-wearables page is opened
2019-03-27 10:12:57 -07:00
Seth Alves
4fe94a4b32
when new wearables are added or removed, rerun getWearablesLocked() and update UI
2019-03-27 10:12:57 -07:00
Seth Alves
29af3b1612
add a button to Avatar panel to lock or unlock wearables.
...
allow grabbing / adjusting others' wearables if they are unlocked.
2019-03-27 10:12:57 -07:00
Sam Gondelman
5f76c96340
Merge pull request #15196 from sethalves/fix-equip-drops
...
case 21740: make equipping of clonables more reliable
2019-03-27 09:55:12 -07:00
Shannon Romano
d464415e0b
Merge pull request #15255 from AndrewMeadows/fix-owningAvataID
...
Case 21897: fix bug where AvatarEntities vanish after going to serverless and back
2019-03-27 09:11:36 -07:00
Simon Walton
b8f79d3364
Guard against Node linked-data being null
2019-03-26 17:41:22 -07:00
Seth Alves
5f8139a44c
audio-loopback test ignores mute
2019-03-26 16:56:10 -07:00
Seth Alves
16f842b2ac
missed one
2019-03-26 16:07:18 -07:00
