David Rowe
b2b7a6ae99
Merge branch 'master' into DOC-79
2019-06-22 12:11:22 +12:00
Roxanne Skelly
001eae784a
Add locks to OctreeEditPacketSender to protect various members
2019-06-21 11:42:27 -07:00
David Rowe
0945bdaac7
Remainder of Entities methods' JSDoc
2019-06-20 15:11:01 +12:00
Andrew Meadows
915cbb69df
split work out of EntityTree::update(), call it preUpdate()
2019-05-06 17:37:35 -07:00
Roxanne Skelly
ac97a82bad
Address a CR comment.
2019-04-02 17:25:00 -07:00
Roxanne Skelly
2d71ec1c75
Case20410 Automatic Content Archives doesn't restore correctly with old Tutorial content set
...
The tutorial content set had a content set Id of Null, which caused a failure
to parse the content set.
2019-04-02 13:19:06 -07:00
Roxanne Skelly
88b7687183
Case 21726 - Domain lost recent entity edits upon restart
...
When an entity server starts up, grabs the version of the models.json
file locally, and then queries the domain server for its copy of the
models.json file...iff the domain server version is newer.
There was a bug in this process in that the comparison was made between
the wrong version, specifically the 'file format version' which doesn't
change unless there was a protocol change...and not the data version,
which increments every time a change is made to a domain.
Therefore, the version of the models.json on the domain server was never
downloaded to the entity server, even when it was newer.
It would be newer if the entity server assignment was moved to a machine
with an old version of the models.json file, which was in fact the case
on distributed3 during this period of time.
2019-03-28 13:19:16 -07:00
SamGondelman
3e6061e435
try to not clear my avatar entities on domain switch
2019-03-01 13:45:00 -08:00
Andrew Meadows
1d7265f668
trust the data in the packet, Luke
2019-02-04 09:45:06 -08:00
SamGondelman
13cb70a6a5
Merge remote-tracking branch 'upstream/master' into NOverlays12
2019-01-28 11:37:15 -08:00
Jeff Clinton
b5a1dc599b
Merge pull request #14725 from SamGondelman/NOverlays11
...
Case 20700: Add missing pulse properties to certain Entity types
2019-01-28 10:51:00 -08:00
Shannon Romano
fc12975231
Merge pull request #14780 from davidkelly/dk/20362
...
Transmit octree string parameters as utf-8 strings
2019-01-25 17:29:02 -08:00
SamGondelman
a10f52c66d
merge with master
2019-01-25 14:16:07 -08:00
David Kelly
05d56a5fe9
Transmit octree string parameters as utf-8 strings
2019-01-25 08:43:56 -07:00
Adam Smith
dadd49f535
Merge pull request #14667 from SamGondelman/NOverlays9
...
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
2019-01-24 14:36:27 -08:00
SamGondelman
9a734b2011
merge with master
2019-01-23 17:48:24 -08:00
SamGondelman
ac513df103
ring gizmo entities
2019-01-23 17:46:04 -08:00
SamGondelman
611998f799
add pulse group properties to shapes, particles, text, web, image, and grid
2019-01-16 13:34:10 -08:00
Dante Ruiz
e7d3844620
making pre review requests
2019-01-14 11:14:57 -08:00
Dante Ruiz
8252481ce7
Delete domain entities only
2019-01-11 16:00:10 -08:00
Andrew Meadows
320ba9177c
remove cruft
2019-01-09 17:27:14 -08:00
Andrew Meadows
6c81e8845b
cleanup
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
SamGondelman
45ec7fe3e1
working on ignorePickIntersection and web entities
2019-01-09 12:03:35 -08:00
SamGondelman
1b5c1d0677
working on primitiveMode and groupCulled
2019-01-08 10:02:03 -08:00
SamGondelman
b609cfaa2b
renderLayer
2019-01-07 15:43:35 -08:00
Antonina Savinova
a493f01012
Merge pull request #14551 from Atlante45/fix/headers
...
Fix non self-sufficient headers.
2019-01-03 15:04:39 -08:00
Clement
d179b91f69
Fix non self-sufficient headers.
2018-12-07 15:26:49 -08:00
SamGondelman
3ce6f7f3d6
real image entities
2018-12-03 11:50:59 -08:00
Simon Walton
3baebf55c5
Don't enforce key presence in models.json
2018-11-16 17:33:13 -08:00
Simon Walton
452c212c4f
Add Paths entry parsing to json parser
2018-11-13 17:58:12 -08:00
Simon Walton
82e21e89e4
Merge remote-tracking branch 'upstream/master' into max-json-size
2018-11-13 17:26:20 -08:00
Simon Walton
167a8fdc04
Merge branch 'master' into max-json-size
2018-11-13 14:57:06 -08:00
Simon Walton
a65466f154
Use traditional C strings rather than raw strings
2018-11-13 13:33:36 -08:00
Simon Walton
df2bc6ba5c
Remove unused function
2018-11-13 10:18:30 -08:00
Simon Walton
6ee837d47c
OctreeDataUtils - use new json from DS also; allow upload of large domains
2018-11-12 15:43:09 -08:00
Simon Walton
8c347fae70
Fixes for domain server use of changed OctreeDataUtils
2018-11-12 12:45:01 -08:00
Simon Walton
d183968175
Add skipThoseWithBadParents functionality to octree visitor; reviewer suggestions
2018-11-08 18:20:20 -08:00
Zach Fox
142dfab9ac
CR round 1
2018-11-08 10:05:57 -08:00
Roxanne Skelly
cef7000a72
Case 19754 - Remove logging URLs and related file locations.
...
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
2018-11-06 16:24:32 -08:00
Kerry Ivan Kurian
a1bb685176
Remove cruft
2018-10-22 14:00:08 -07:00
Zach Fox
493262052c
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
2018-10-22 13:59:52 -07:00
Zach Fox
2f37a2b1a1
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-18 11:12:26 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
Simon Walton
be279f08dc
Restore the addMarketplaceIDToDocumentEntities() hack
...
Fixes for Linux compiles; other improvements
2018-10-17 15:43:38 -07:00
Sam Gondelman
3f117cd3e0
Merge branch 'master' into scriptvec3
2018-10-17 13:57:21 -07:00
Simon Walton
c031769c67
Faster JSON entities parser
2018-10-16 18:08:07 -07:00
Simon Walton
f5f34e8e7d
Pasre Entities JSON with our own top-level parser
...
Use QJsonDocument for each individual entity.
2018-10-15 18:14:40 -07:00
Simon Walton
e86d1691ce
Cache the local Entities file to avoid reading 2 or 3 times
2018-10-12 17:26:46 -07:00
Simon Walton
ad9f7f3a1d
Include the skipDefaults option in case we ever need it
...
Also print errors from parsing entities file; other tweaks
2018-10-12 11:18:38 -07:00
