Commit graph

75111 commits

Author SHA1 Message Date
Andrew Meadows
9f404ef006 Agent bots can manipulate AvatarEntities again 2019-01-09 17:28:00 -08:00
Andrew Meadows
9b253690db bump packet version number 2019-01-09 17:28:00 -08:00
Andrew Meadows
43fc86fe54 restore non-human-readable avatarEntityDataSettings format 2019-01-09 17:27:14 -08:00
Andrew Meadows
dedc14434b fix compile warnings on windows 2019-01-09 17:27:14 -08:00
Andrew Meadows
d622635a71 fix wording in comment to reflect new 'HostType' parameter 2019-01-09 17:27:14 -08:00
Andrew Meadows
320ba9177c remove cruft 2019-01-09 17:27:14 -08:00
Andrew Meadows
121a591023 delete old AvatarEntities on domain reset on login 2019-01-09 17:27:14 -08:00
Andrew Meadows
c4115bece3 remove unused ScriptEngine instance 2019-01-09 17:27:14 -08:00
Andrew Meadows
09f3b8f485 add bit of sanity checking for incomming AvatarEntities data 2019-01-09 17:27:14 -08:00
Andrew Meadows
0083c77280 add EntityTypes::extractEntityTypeAndID(), remove one spaghetti 2019-01-09 17:27:14 -08:00
Andrew Meadows
1815d71158 fix data corruption bug 2019-01-09 17:27:14 -08:00
Andrew Meadows
6da8c5545e remove debug code 2019-01-09 17:27:14 -08:00
Andrew Meadows
ce660bee9b fix compile errors after rebase 2019-01-09 17:27:14 -08:00
Andrew Meadows
61b8d005b5 scripts can edit AvatarEntities again 2019-01-09 17:27:14 -08:00
Andrew Meadows
6c81e8845b cleanup 2019-01-09 17:27:14 -08:00
Andrew Meadows
fe2ee68b79 add EntityItemProperties::copyFromJSONString() 2019-01-09 17:27:14 -08:00
Andrew Meadows
ec384d7dbb more correct reload AvatarEntityData from settings 2019-01-09 17:27:14 -08:00
Andrew Meadows
0ed936520d MyAvatar saving to settings works again 2019-01-09 17:27:14 -08:00
Andrew Meadows
e37b5b52f0 correctly load AvatarEntities from settings redux 2019-01-09 17:27:14 -08:00
Andrew Meadows
026c6301a6 correctly load AvatarEntities from settings 2019-01-09 17:27:14 -08:00
Andrew Meadows
263d6cb7ad only change parentID=AVATAR_SELF_ID for non-clientOnly case 2019-01-09 17:27:14 -08:00
Andrew Meadows
e4cc3fa976 minor cleanup 2019-01-09 17:27:14 -08:00
Andrew Meadows
01fc442695 save AvatarEntities settings as strings 2019-01-09 17:27:14 -08:00
Andrew Meadows
d1927340f5 remove redundant addToNeedsParentFixupList() 2019-01-09 17:27:14 -08:00
Andrew Meadows
d3fea94540 send AvatarEntities via raw data packet 2019-01-09 17:27:14 -08:00
John Conklin II
816de0d684
Merge pull request #14672 from SimonWalton-HiFi/avatar-mixer-entities-stats
Track avatar-mixer send-stats with finer granularity
2019-01-09 17:14:51 -08:00
Simon Walton
1245abbb53
Merge branch 'master' into avatar-mixer-entities-stats 2019-01-09 16:07:26 -08:00
John Conklin II
2757590158
Merge pull request #14633 from roxanneskelly/Case20377
Trait-level flow control
2019-01-09 15:57:13 -08:00
Shannon Romano
87f966773c
Merge pull request #14601 from SimonWalton-HiFi/reliable-service-min-timeout
Set minimum timeout for retransmits within reliable network service
2019-01-09 15:35:40 -08:00
John Conklin II
e4abb66199
Merge pull request #14627 from AndrewMeadows/fewer-avatar-entity-updates
case 20304: please don't flood the avatar-mixer with unnecessary AvatarEntity udpates
2019-01-09 14:55:23 -08:00
Simon Walton
5bcdf143b9 Add per-destination-avatar traits-rate stats 2019-01-09 13:45:07 -08:00
John Conklin II
100c88e800
Merge pull request #14669 from kencooke/audio-mixer-mastergain-solo-fix
Apply master volume to audio streams when solo is active
2019-01-09 12:03:02 -08:00
Simon Walton
cb6b86a236 Tweak web display 2019-01-09 09:36:17 -08:00
Simon Walton
73d688610f Track stats for total AvatarData bytes, traits bytes and identity bytes 2019-01-08 18:33:00 -08:00
Jamil Akram
39f4af505c
Merge pull request #14671 from SamGondelman/lightFix
Case 20534: Fix light crash
2019-01-08 14:43:11 -08:00
Jamil Akram
ce05dcd59e
Merge pull request #14670 from thoys/feat/create/textEntityAddMissingProperties
MS20150: add missing Text properties to Create App
2019-01-08 13:02:38 -08:00
SamGondelman
928ea55d95 fix light crash? 2019-01-08 11:47:28 -08:00
Thijs Wenker
24022f0ccc add missing Text properties to Create App 2019-01-08 20:38:31 +01:00
Roxanne Skelly
910c359443 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377 2019-01-08 10:50:45 -08:00
Roxanne Skelly
0297d337d5 Add some comments as per CR request 2019-01-08 10:50:16 -08:00
Ken Cooke
963269f3f6 Apply master volume to audio streams when solo is active 2019-01-08 10:50:11 -08:00
John Conklin II
00a9367f14
Merge pull request #14662 from dback2/addGridEntitiesToCreate
Add grid entities to create
2019-01-08 10:12:34 -08:00
Jamil Akram
4c6b14bf72
Merge pull request #14642 from dback2/propertyRangeAudit
Entity property range/step audit
2019-01-08 09:42:59 -08:00
John Conklin II
ed4f2d9c10
Merge pull request #14439 from AndrewMeadows/shaped-zones
Case 15518: shaped zones
2019-01-08 09:06:45 -08:00
David Back
0791443c5c Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-07 18:29:36 -08:00
David Back
d9e229d38e remove add Grid entity button, fix color 2019-01-07 18:20:20 -08:00
David Back
90e2feb977 replace placeholder icon with real icon from Alan 2019-01-07 18:20:20 -08:00
David Back
7581c77be8 update tooltips, use Cube icon for now 2019-01-07 18:20:20 -08:00
David Back
e0e9a7de15 tabs 2019-01-07 18:20:20 -08:00
David Back
9013eee352 add grid entities to create - icons pending 2019-01-07 18:20:19 -08:00