Commit graph

1141 commits

Author SHA1 Message Date
Heather Anderson
ab4d70760e review and cleanup of "#include <QtCore/QSharedPointer>" 2021-09-10 21:40:54 -07:00
David Rowe
4d11d1d515 Convert all "/**jsdoc" occurrences to "/*@jsdoc" 2021-05-12 10:54:45 +12:00
HifiExperiments
b296fff197 add text alignment property 2021-02-10 21:45:53 -08:00
kasenvr
2b511d8c45
Merge pull request #613 from odysseus654/pr/registerListener
[enhancement] transition listener registration from member string name to member string pointer
2020-10-29 17:13:05 -04:00
kasenvr
dd3152a2e4
Merge pull request #349 from daleglass/fix_warnings
Fix warnings emitted by GCC
2020-09-24 17:06:16 -04:00
David Rowe
d8a119c1b3 Support relative JSON URLs in model textures poperty 2020-09-08 22:10:24 +12:00
David Rowe
2bfdaa31ab Add FIXME for missing relative URL handling case 2020-09-02 09:20:35 +12:00
David Rowe
4214182b2f Tidy JSON relative URLs importing 2020-09-01 21:08:52 +12:00
Dale Glass
5a8be4de4b Fix -Wclass-memaccess warnings 2020-08-27 19:49:48 +02:00
Heather Anderson
2e5244663e transition listener registration from member string name to member string pointer 2020-08-09 14:57:00 -07:00
Maki
3783c98976 Allow resolving relative urls when importing entities json 2020-08-04 01:33:19 +01:00
kasenvr
f22c56038c
Update libraries/octree/src/Octree.h
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-07-06 22:21:39 -04:00
Kasen IO
afc23954c5 Import entities now works on domains that you do not have rights on. 2020-07-03 16:37:02 -04:00
HifiExperiments
6eacc5c8c2 Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion 2020-04-03 14:37:14 -07:00
David Rowe
46173439ed Enable serverless domains via HTTP and HTTPS 2020-02-01 12:46:28 +13:00
HifiExperiments
bc319cb340 zone occlusion 2020-01-11 22:29:07 -08:00
Roxanne Skelly
82522b04ab missing space 2019-08-26 13:20:56 -07:00
Roxanne Skelly
b4679aa44a BUGZ-1276 - crash in soloNodeOfType
This is suspected to be a race condition during shutdown
where a static destructor may be called before the ScriptEngine
thread stops running.  On OSX there is the possability of this.
2019-08-26 13:05:19 -07:00
Shannon Romano
1011880698
Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation
(BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away
2019-08-09 17:28:46 -07:00
sabrina-shanman
07ea79689e Fix build warnings 2019-08-09 13:34:55 -07:00
sabrina-shanman
1571c2be27 Fix LOD math 2019-08-08 13:03:20 -07:00
sabrina-shanman
9c16fcfdef Make the LOD half angle the definitive LOD variable 2019-08-07 17:23:04 -07:00
Roxanne Skelly
2e5127fa98 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz1046 2019-08-07 10:40:23 -07:00
sabrina-shanman
0d5260bccc More LOD renaming with focus on angles 2019-08-06 16:35:41 -07:00
sabrina-shanman
bc3acfa3c0 Clean up and re-name to reflect what uses octreeSizeScale and what uses
visibilityDistance
2019-08-06 15:46:10 -07:00
Sam Gateau
eb616452ec An afternounwatchign code 2019-08-05 17:54:46 -07:00
Roxanne Skelly
a991b6d619 BUGZ-1046 - send entity packets reliably for initial query 2019-07-31 16:59:21 -07:00
HifiExperiments
078ca7edea supporting text effects + fonts on text entities 2019-07-30 09:59:45 -07:00
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