Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 06:54:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85615 commits 24 branches 28 tags 1.2 GiB
Commit graph

4263 commits

Author SHA1 Message Date
Sam Gateau
dd53ace114 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-07 17:21:02 -07:00
Andrew Meadows
052a0c3ebe remove cruft, add comments, change variable name 2019-10-07 16:23:30 -07:00
jennaingersoll
47aa43f56a
Merge pull request #16251 from ctrlaltdavid/DOC-155 
DOC-155: EntityViewer JSDoc
 2019-10-07 15:45:42 -07:00
Sam Gateau
521ce3936b I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion... 2019-10-07 15:19:23 -07:00
Andrew Meadows
8ab70225d9 apply delete rules down linked hierarchy 2019-10-07 14:38:36 -07:00
Andrew Meadows
470a45c012 EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities 2019-10-07 14:38:36 -07:00
Andrew Meadows
99d0579007 remove updateEntitiesInternal(), make updateEntities() virtual 2019-10-07 14:38:36 -07:00
Andrew Meadows
9557ba80c9 all delete pass through EntitySimulation::prepareEntityForDelete() 2019-10-07 14:38:36 -07:00
Andrew Meadows
03db88009f simplify add/removal to EntitySimulation 2019-10-07 14:38:36 -07:00
Andrew Meadows
72ba94f2cd unravel more spaghetti into PhysicalEntitySimulation 2019-10-07 14:35:28 -07:00
Andrew Meadows
86c60204fd move entity Action serialization to PhysicalEntitySimulation 2019-10-07 14:35:28 -07:00
jennaingersoll
aab66a2675
Merge pull request #16266 from ctrlaltdavid/DOC-107 
DOC-107: Fix description of entity acceleraton property and deprecate
 2019-10-04 15:17:21 -07:00
David Rowe
be3947f6a7 Fix description of entity acceleraton property and deprecate 2019-10-01 11:16:15 +13:00
David Rowe
8b2d9427bb Update description of the entities available to the Entities API 2019-09-26 10:54:12 +12:00
David Rowe
16c33ebbec Clarify frustum property values used by Entities.findEntitiesInFrustum() 2019-09-25 19:29:20 +12:00
David Rowe
605d272392 Merge branch 'master' into DOC-111 2019-09-20 10:25:21 +12:00
David Rowe
d5e08d19e3 Fix JSDoc for miscellaneous white space issues 2019-09-20 08:17:24 +12:00
Andrew Meadows
ab419ddd23 beware null sessionID 2019-09-19 08:25:01 -07:00
Andrew Meadows
54d3ceda28 update QueryAACube of kinematic things with known parentage 2019-09-17 15:31:16 -07:00
David Rowe
dff37a71eb Fix JSDoc markup HTML issues 2019-09-17 16:26:09 +12:00
Shannon Romano
79d845d127
Merge pull request #16190 from danteruiz/fix-html 
BUGZ-1398: HMD Tablet Apps blocked by Web access error
 2019-09-13 12:35:29 -07:00
danteruiz
8491a37923 fixing WebEntities html 2019-09-13 09:57:51 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc 
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
 2019-09-11 13:04:01 -07:00
Zach Fox
b39e527b5b DEV-555: Ensure 'href' entity property supports relative paths (coordinates and named paths) 2019-09-10 11:57:02 -07:00
Andrew Meadows
227b99859d fix api for checking EntityItem grab status 2019-09-06 17:23:38 -07:00
Andrew Meadows
580b6a3b2c small optimization: check before lock 2019-09-06 17:23:38 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
David Rowe
672e61c49d Fix typo in Entities.EntityProperties-Material example 2019-09-04 21:06:49 +12:00
David Rowe
4e274347b4 Fix typo in Entities.getAbsoluteJointRotationInObjectFrame() JSDoc 2019-09-04 21:05:36 +12:00
Andrew Meadows
81eaf157a6 tighter bounding box when rendering PolyLines 2019-08-22 08:13:11 -07:00
Brad Hefta-Gaub
b0b406adda
Merge pull request #16015 from HifiExperiments/renderUpdate 
BUGZ-902: Drastically reduce locking and branching necessary for render updates
 2019-08-15 09:35:17 -07:00
Shannon Romano
9e0e6f9d5e
Merge pull request #16003 from ctrlaltdavid/DOC-84 
DOC-84: Update JSDoc with glTF
 2019-08-06 13:22:04 -07:00
David Rowe
2939610eae Fix link to TextEffect type 2019-08-06 11:00:24 +12:00
David Rowe
1abf0eb207 Merge branch 'master' into DOC-124 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
 2019-08-06 10:59:50 +12:00
HifiExperiments
1b84244210 merge with master 2019-08-05 09:35:56 -07:00
MiladNazeri
ae7b415152
Merge pull request #16008 from HifiExperiments/text 
Supporting text effects + fonts on Text Entities
 2019-08-02 14:25:28 -07:00
Seth Alves
f1dee1e7f8 fix uninitialized variables 2019-08-01 14:50:21 -07:00
HifiExperiments
62bb4e1d46 simplify render update check, threadsafety 2019-07-31 21:02:21 -07:00
HifiExperiments
7b29f0f718 reduce locking necessary for render updates 2019-07-31 11:21:29 -07:00
HifiExperiments
078ca7edea supporting text effects + fonts on text entities 2019-07-30 09:59:45 -07:00
David Rowe
ade85ad8c0 Update API JSDoc with glTF 2019-07-30 10:41:07 +12:00
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04:00
David Rowe
8c92f972e5 Merge branch 'master' into DOC-124 
# Conflicts:
#	interface/src/scripting/Audio.h
 2019-07-23 12:53:35 +12:00
David Rowe
8a6a4041d9 Tidy key light property's shadow values JSDoc 2019-07-23 11:28:57 +12:00
David Rowe
39ae575ef3 Tidy entities' "unlit" properties 2019-07-23 11:02:43 +12:00
David Rowe
0a32386f45 Merge branch 'master' into DOC-102 2019-07-20 09:13:52 +12:00
kasenvr
e9e9607a3b modkit core changes initial commit 
whitespace corrections + warnings
updated cmake plugin
rework with focus on JS API integration example
cleanup edit_filter scope
separate-out edit_filter wantsScope stuff
-plugin metadata
split scriptengines out separately
cleanup __url/__filename sets
additional cleanup
fix typo; consolidate ScriptInitializerMixin inits
add more example API protoypes
cleanup pass; fix entity_server / agent init
fix whitespace
remove technically unnessary plugin filtering
+EDIT_FILTER_SCRIPT; cleanup
reorder public/slot/private
use std::count_if
formatting
better debug output; cleanup
fix msvc compiler warning
cleanup
eradicate QtScript references from API Example
updated header comments
Updated KasenAPIExample
 2019-07-14 21:35:13 -04:00
SamGondelman
60600779c9 merge with master 2019-07-12 11:01:17 -07:00
David Rowe
2cb3425740 Merge branch 'master' into DOC-102 2019-07-11 16:38:23 +12:00
David Rowe
a45d8924fa Miscellaneous minor JSDoc fixes noticed in passing 2019-07-11 16:31:09 +12:00
SamGondelman
72f52b069e cleanup, fix shadow qml 2019-07-03 16:21:47 -07:00
Sam Gondelman
0d9f639331
Merge branch 'master' into bias 2019-07-03 10:20:16 -07:00
SamGondelman
692c776be5 expose shadow bias and max distance wip 2019-07-02 15:18:28 -07:00
SamGondelman
fa416adaf6 adding unlit property to text, fixing transparency, normals, other cleanup 2019-07-02 10:28:36 -07:00
David Rowe
2d6d3eb4fe Doc review 2019-06-28 17:05:36 +12:00
SamGondelman
9c1b139d5f merge with master 2019-06-25 23:46:39 -07:00
Andrew Meadows
20376c9542
Merge pull request #15823 from ctrlaltdavid/DOC-79 
DOC-79: Entities JSDoc Update
 2019-06-25 14:18:13 -07:00
Brad Davis
aefa43bd11 Prevent duplicates from accumulating in EntityTree::_needsParentFixup 2019-06-24 13:02:28 -07:00
Sam Gondelman
e4847cc4ae
Merge branch 'master' into proceduralMesh 2019-06-24 10:16:45 -07:00
David Rowe
4c8f281383 Typos etc. 2019-06-22 14:16:17 +12:00
David Rowe
eb227c6b9a Document Entities entity methods 2019-06-22 11:59:07 +12:00
David Rowe
e3f971a304 Update Entities examples to have a delay after creation before editing 2019-06-22 09:23:07 +12:00
David Rowe
3c53cb2e90 Add missing grabDelegetToParent property to JSDoc 2019-06-21 15:21:16 +12:00
David Rowe
52860adc1c Add callEntityMethod() and similar examples 2019-06-21 14:27:51 +12:00
David Rowe
a858314898 Remainder of Entities signals' JSDoc 2019-06-21 11:25:10 +12:00
David Rowe
0945bdaac7 Remainder of Entities methods' JSDoc 2019-06-20 15:11:01 +12:00
David Rowe
72fdbc0aa8 Entity information and manipulation 2019-06-19 10:18:48 +12:00
David Rowe
23785b5406 Regularize links to individual entity types 2019-06-15 14:06:49 +12:00
David Rowe
9c752c9964 Fix up descriptions in EntityType table 2019-06-15 11:07:40 +12:00
David Rowe
b16086de74 Revise JSDoc for key Entities methods plus entity properties 2019-06-15 10:44:56 +12:00
Andrew Meadows
eee52deefe destroy WebSurfaces on shutdown 2019-06-12 16:07:15 -07:00
SamGondelman
37feb7f027 merge with master 2019-06-10 10:29:39 -07:00
SamGondelman
129d96a997 get rid of lightmapMap 2019-06-07 14:53:31 -07:00
David Rowe
6299d38673 Distinguish between Uuid API and Uuid type in JSDoc 2019-06-05 14:39:05 +12:00
Seth Alves
8a32d230a8 avoid div by zero 2019-06-04 13:00:26 -07:00
Sam Gondelman
16a56dc1ec
Merge branch 'master' into proceduralMesh 2019-06-04 09:56:25 -07:00
SamGondelman
f4a7b27042 cleaning up name lookups 2019-05-31 12:04:54 -07:00
Andrew Meadows
bfe809f3f7 local entities should not be in physics 2019-05-29 20:19:12 -07:00
Sam Gondelman
3d05a954bc
Merge branch 'master' into proceduralMesh 2019-05-23 09:35:14 -07:00
David Rowe
ca7ddece8b Add missing Script JSDoc 2019-05-21 10:32:12 +12:00
SamGondelman
6d3e23a7fe merge with master 2019-05-16 20:03:10 -07:00
SamGondelman
283cc18269 Merge remote-tracking branch 'upstream/master' into proceduralMesh 2019-05-16 16:33:16 -07:00
SamGondelman
da254c2ccc (¬‿¬) 2019-05-15 23:48:04 -07:00
Sabrina Shanman
fbe947c8ac
Merge pull request #15558 from AndrewMeadows/fix-crash-bugz178 
BUGZ-178: avoid crash for RenderableModelEntityItem with invalid model
 2019-05-14 13:07:40 -07:00
Shannon Romano
c677f71650
Merge pull request #15514 from zfox23/privateUserData 
New Entity Property: Private User Data
 2019-05-14 10:24:39 -07:00
Andrew Meadows
5a257eb137 avoid crash for RenderableModelEntityItem with invalid model 2019-05-14 09:48:06 -07:00
Seth Alves
8b2d12e2f7 when an avatar entity is deleted, also delete its descendants 2019-05-13 17:33:10 -07:00
jennaingersoll
4c6c0acc56
Merge pull request #15454 from ctrlaltdavid/M22246 
Case 22246: Picks, PickType, RayPick JSDoc update
 2019-05-13 16:16:17 -07:00
Zach Fox
2ce9e9ee10 The right way to restrict private user data: 2019-05-13 16:07:29 -07:00
Zach Fox
e87381f431 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-13 14:13:34 -07:00
Zach Fox
55138ed088 CR feedback 2019-05-13 14:12:51 -07:00
Andrew Meadows
a28d185afc make explicit: zones shouldn't be in physics simulation 2019-05-07 10:39:44 -07:00
Andrew Meadows
8e6394c95f ParticleEffectEntityItem should not be in physics simulation 2019-05-06 17:37:35 -07:00
Andrew Meadows
f6916edac4 cleanup and removing some accidental C++-20-isms 2019-05-06 17:37:35 -07:00
Andrew Meadows
e770bd6142 build CollisionShapes and load RigidBodies even when not yet stepping 2019-05-06 17:37:35 -07:00
Andrew Meadows
915cbb69df split work out of EntityTree::update(), call it preUpdate() 2019-05-06 17:37:35 -07:00
Andrew Meadows
3c8c68d187 track EntityItem adds to physcis with pending shape 2019-05-06 17:35:57 -07:00
Andrew Meadows
deee159892 unravel physics-vs-entities lib dependencies part 1 2019-05-06 17:35:57 -07:00
Andrew Meadows
7dfa8a26a3 cleanup EntityItem::shouldBePhysical() and derivations 2019-05-06 17:35:57 -07:00
Andrew Meadows
514d598797 remove unhelpful profiling with wrong category 2019-05-06 17:35:57 -07:00
Zach Fox
d53b528994 Some fixes - i don't think this code is complete 2019-05-06 13:38:09 -07:00
Zach Fox
6033058d54 Comment 2019-05-06 11:51:59 -07:00
Zach Fox
1c9a4fd322 Fix build error 2019-05-06 11:37:15 -07:00
Zach Fox
a68da2bca7 Finish out the feature, i think 2019-05-06 11:08:23 -07:00
Zach Fox
fb77928652 Private user data is accessible to all right now 2019-05-01 15:29:04 -07:00
Clement
281f92e3ea Query shape type outside lock 2019-05-01 14:31:53 -07:00
SamGondelman
0bcd8b81e1 trying and failing to fix models 2019-05-01 12:01:49 -07:00
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
David Rowe
73fd61dcf0 Picks, PickType, RayPick JSDoc update 2019-04-25 13:19:07 +12:00
Clement
0f2dbd7b6a Fix mac warnings 2019-04-19 20:14:15 -07:00
Ryan Huffman
f2474b4d2b Fix lack of ranges on numerical types in Create 2019-04-11 14:20:52 -07:00
Sam Gateau
51d1c4b1f3
Merge pull request #15357 from SamGondelman/cauterize 
Case 21417: Fix cauterization of entities that are children of MyAvatar's head
 2019-04-10 12:29:40 -07:00
Sam Gateau
c33efdf9e0
Merge pull request #15282 from kitely/fix-ray-local-entities 
Case 21883: Fix safe landing code improperly finding local entities
 2019-04-10 12:28:07 -07:00
SamGondelman
a50cca006e use # instead of ? for material URL name selection 2019-04-08 23:45:47 -07:00
SamGondelman
27338c3639 fix cauterization of entities that are children of MyAvatar's head 2019-04-08 19:48:11 -07:00
Roxanne Skelly
029eab73cb Lambda capture was referencing something on the local stack 
which may go out of scope when lambda was called.
 2019-04-04 16:00:15 -07:00
Sam Gondelman
1cc2cd3194
Merge pull request #15237 from SamGondelman/particleShapes 
Case 21859: Particle Entity emitter shapes, including model
 2019-04-03 11:03:33 -07:00
Shannon Romano
f2ff5bebc7
Merge pull request #15275 from howard-stearns/ddv-all 
DDV all, including domainUnlimited
 2019-04-03 11:03:16 -07:00
Andrew Meadows
1860e61a30 more correct collision group during grabs 2019-04-03 07:42:56 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes 2019-04-01 22:20:13 -07:00
Oren Hurvitz
0b822b2cbc Fixed calls to addingWearable() and deletingWearable(). 
The calls used a parameter type of QUuid instead of EntityItemID. This resulted in the following warnings in the log:

[04/01 18:16:11.012] [WARNING] [default] [53296] QMetaObject::invokeMethod: No such method EntityScriptingInterface::addingWearable(QUuid)
[04/01 18:16:11.012] [WARNING] [default] [53296] Candidates are:
[04/01 18:16:11.012] [WARNING] [default] [53296]     addingWearable(EntityItemID)
 2019-04-01 18:26:00 +03:00
Oren Hurvitz
32406b8399 Fixed Safe Landing interaction with Local entities. 
Local entities are collisionless, so they shouldn't affect Safe Landing since it specifies that it only wants
to find COLLIDABLE entities. However, due to the requirement to support legacy behavior, picks for COLLIDABLE
entities *do* intersect Local entities. In order to prevent this, we have to explicitly request only intersections
with Domain or Avatar entities.

For more information about this, see this Pull Request:
https://github.com/highfidelity/hifi/pull/15282
 2019-03-28 18:54:14 +01:00
Oren Hurvitz
81f28b3b2c Fixed ray intersections with Local entities. 
Previously, rays *always* intersected with Local entities, regardless of whether the pick filter requested
to hit on collidable or noncollidable entities. But Local entities are always collisionless, so a pick filter
for collidable entities shouldn't intersect with Local entities.
 2019-03-28 08:42:11 +01:00
SamGondelman
6cc95fe8ac CR 2019-03-27 15:46:25 -07:00
Howard Stearns
489fadda6e and now it's a list that cleans up after itself 2019-03-27 14:58:58 -07:00
Howard Stearns
f6ee77a6ae an entity list of one 2019-03-27 12:23:02 -07:00
Howard Stearns
71111936a2 prep for entity lists 2019-03-27 11:42:16 -07:00
Andrew Meadows
fb7daa185d improved physics for grabbed AvatarEntities 2019-03-27 10:12:59 -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
Howard Stearns
57da21cec2 more about challenges use entity id as id, not cert id 2019-03-26 17:12:28 -07:00
Howard Stearns
c9b79b24e3 track nonces by entity id instead of by cert 2019-03-26 15:23:13 -07:00
Howard Stearns
be74218d93 eliminate copy of hash table 2019-03-26 12:05:10 -07:00
Howard Stearns
91a165b4c3 separate out the certified entity map stuff (no-op refactor) 2019-03-26 11:49:08 -07:00
Howard Stearns
02129e0543 no-op refactor in prep for multiple entities per cert 2019-03-25 16:14:48 -07:00
Sam Gondelman
40f5a0263c
Merge pull request #15201 from SamGondelman/emit 
Case 21756: Entities.emitScriptEvent works now
 2019-03-21 18:05:17 -07:00
SamGondelman
3ff0770441 model emitters! 2019-03-20 21:25:14 -07:00
Andrew Meadows
9d11e44b4b update AvatarEntity trait when parentID changes 2019-03-20 11:37:16 -07:00
SamGondelman
194008c77a box shapeType 2019-03-19 14:14:37 -07:00
SamGondelman
432a3f1610 uniform sampling of ellipsoid points 2019-03-19 12:59:03 -07:00
SamGondelman
ea50133146 working on adding particle shape types 2019-03-18 12:05:17 -07:00
SamGondelman
d4e1ec9741 fix emitScriptEvent 2019-03-15 16:20:01 -07:00
SamGondelman
83bac723ef fix wearable duplication on domain switch 2019-03-15 13:38:25 -07:00
Shannon Romano
c0240d2431
Merge pull request #14932 from AndrewMeadows/allow-kinematic-mesh 
Case 21227: don't enforce MOTION_TYPE_STATIC on mesh shapes
 2019-03-11 15:33:32 -07:00
Roxanne Skelly
e94d248ac5
Merge pull request #15126 from howard-stearns/domainUnlimited 
unlimited certified copies in a domain
 2019-03-08 10:23:42 -08:00
Shannon Romano
45ab5efcef
Merge pull request #15121 from danteruiz/fix-stylus-gizmo 
Case 21603: Tablet x button is nearly impossible to hit with stylus
 2019-03-07 16:03:13 -08:00
Howard Stearns
d309995aef spell domainUnlimited right, and track challenges so that we don't reap 2019-03-07 14:48:57 -08:00
John Conklin II
abb61b7e90
Merge pull request #15124 from SamGondelman/shapes 
Case 21605: Fix shapes app and debugAvatarMixer
 2019-03-07 11:07:45 -08:00
Shannon Romano
d11c04a19d
Merge pull request #15117 from SamGondelman/wearables 
Case 21596: Fix wearable scale on position change
 2019-03-07 10:29:47 -08:00
Howard Stearns
97bfa538ff unlimited certified copies in a domain 2019-03-07 09:51:20 -08:00
Sam Gondelman
dc4e2645da
even better! 2019-03-07 08:05:32 -08:00
SamGondelman
380df059ff fix shapes app 2019-03-06 18:18:39 -08:00
danteruiz
a0bd2f67ec fix stylus gizmo intersection 2019-03-06 17:20:36 -08:00
SamGondelman
0f3e1b9157 fix wearable scale on position change 2019-03-06 14:53:21 -08:00
Roxanne Skelly
a54171d60c
Merge pull request #15104 from roxanneskelly/79hero-master 
merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master
 2019-03-06 13:06:45 -08:00
Shannon Romano
4f3d593d90
Merge pull request #15072 from SamGondelman/clear 
Case 11775: Don't clear my avatar entities on domain switch
 2019-03-05 15:42:51 -08:00
Roxanne Skelly
fae6393663 Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42' 2019-03-05 15:11:25 -08:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
Sam Gondelman
94cc5b83ac
Merge pull request #15088 from SamGondelman/create 
Case 21541: Fix mouse on create in HMD
 2019-03-05 13:07:49 -08:00
amer cerkic
fab343a1d4 correcting spacing 2019-03-05 10:52:54 -08:00
amer cerkic
36e9c604e9 fixed based on comment 2019-03-05 10:45:15 -08:00
amer cerkic
29a308dcaa adding modelScale initialization so that it does not fail the validScale check assert 2019-03-05 10:07:33 -08:00
SamGondelman
f2c248c0a2 disable href and entity script events when in edit mode 2019-03-04 17:10:20 -08:00
Simon Walton
83c9381575 Convert avatarPriority to trivalued (inherit, crowd, hero) 
Also tweaks from original reviewer comments.
 2019-03-01 17:25:46 -08:00
SamGondelman
3e6061e435 try to not clear my avatar entities on domain switch 2019-03-01 13:45:00 -08:00
Shannon Romano
33e061b09b
Merge pull request #15022 from danteruiz/fix-tablet-scaling 
Case 21424: Tablet does not properly resize when scaling avatar.
 2019-03-01 09:37:47 -08:00
Shannon Romano
d68f82eb7d
Merge pull request #15060 from AndrewMeadows/avoid-mem-leaked-entities 
Case 21494: Avoid mem leaked entities
 2019-03-01 09:34:20 -08:00
Andrew Meadows
8a7853a701 remove crufty comment 2019-02-28 14:38:13 -08:00
Andrew Meadows
33d6e2ce3b avoid mem-leaked entities when clearing tree 2019-02-28 14:21:35 -08:00
danteruiz
f715dbe243 fix tablet scaling 2019-02-28 13:32:12 -08:00
Simon Walton
17c0e40347 Add ability to filter on zone-type with JSON filter 2019-02-27 16:42:36 -08:00
SamGondelman
4d591e0624 fix web interaction and debug print filling logs 2019-02-26 16:30:31 -08:00
Simon Walton
d6f755955d Add _avatarPriorityChanged to EntityItemProperties::markAllChanged() 2019-02-25 16:24:12 -08:00
Simon Walton
e5091e7f59 Fixes for EntityItem contains test, add MixerAvatar class and use in sort 2019-02-25 15:44:52 -08:00
Simon Walton
16bc667b95 Looks like serialization order must be same a flag enum order!? 
Also resuscitate EntityItem debug dumps.
 2019-02-22 18:17:30 -08:00
Shannon Romano
5f99158c25
Merge pull request #14977 from SamGondelman/rot 
Case 21354: Add "modelScale" property to fix pal
 2019-02-22 16:36:17 -08:00
SamGondelman
6d6cd42adb fix bound scaling 2019-02-22 12:00:00 -08:00
SamGondelman
544f54e69a fix model scale 2019-02-21 14:10:36 -08:00
SamGondelman
4fdf556d5d fix billboard mode in secondary camera 2019-02-21 10:29:21 -08:00
SamGondelman
c8ffb130a3 only update sub items on change 2019-02-19 17:38:47 -08:00
Simon Walton
8033e93eda Add avatar-priority boolean to zone entities 
RC-79 version
 2019-02-19 17:38:37 -08:00
SamGondelman
6765268998 Merge remote-tracking branch 'upstream/master' into wearables 2019-02-19 16:52:00 -08:00
SamGondelman
06ac2b291b attachments and wearables cull with avatar parent 2019-02-17 17:52:10 -08:00
Andrew Meadows
2fdc9bce77 remove velocity restrictions on SHAPE_TYPE_STATIC_MESH 2019-02-15 16:59:18 -08:00
SamGondelman
c92b82e744 merge with master 2019-02-15 12:43:30 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping 
Case 20242: FST materialMapping supports our material JSON format
 2019-02-15 11:21:51 -08:00
SamGondelman
25b31cfc72 merge with master 2019-02-15 11:08:24 -08:00
Shannon Romano
f267043953
Merge pull request #14838 from SamGondelman/billboardMode 
Case 20962: Billboard mode improvements
 2019-02-14 17:44:48 -08:00
Sam Gateau
6168001ad4
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80 
Case 21159: fixes for more grab bugs
 2019-02-14 16:52:03 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
SamGondelman
bed2732d34 start moving materials to rendering only 2019-02-14 12:59:16 -08:00
SamGondelman
dd0d7f0118 merge with master 2019-02-14 09:57:13 -08:00
Andrew Meadows
72b5fa1968
Merge pull request #14857 from Atlante45/fix/ess-parenting 
Case 15420: Fix ESS sometimes not getting the parents/children of entities with scripts.
 2019-02-13 17:26:57 -08:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00
SamGondelman
3f8bfc5475 CR and fix deadlock 2019-02-13 16:19:39 -08:00
Andrew Meadows
ed8481ead9 fix grab bugs 2019-02-12 14:04:56 -08:00
Andrew Meadows
9f9f512c59 undoing markDirty() overhead because _flags is atomic 2019-02-12 13:22:22 -08:00
SamGondelman
77a8ddb3f0 Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-11 16:35:05 -08:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
Andrew Meadows
ff746c3141 flag collision group/mask dirty after grab 2019-02-11 12:19:33 -08:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
John Conklin II
851b968501
Merge pull request #14737 from SamGondelman/zone 
Case 19291: Fix zone bugs
 2019-02-08 14:07:26 -08:00
SamGondelman
f7a487a020 move materialcache et al to material-networking library 2019-02-08 10:28:07 -08:00
Jeff Clinton
54109deab9
Merge pull request #14825 from SamGondelman/fall 
Case 20829: Always fall when flying is not allowed
 2019-02-07 14:39:46 -08:00
John Conklin II
dda310c0b9
Merge pull request #14835 from SamGondelman/textures 
Case 20944: Fix Model textures property
 2019-02-07 14:19:01 -08:00
SamGondelman
e74ff18bef Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:49:27 -08:00
SamGondelman
25ca52d892 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:48:13 -08:00
Jeff Clinton
2c666aed5e
Merge pull request #14821 from SamGondelman/owningAvatarID 
Case 20932: Fix getEntityProperties
 2019-02-06 14:43:31 -08:00
Sam Gateau
9ff9117a34
Merge pull request #14811 from jherico/feature/quest_frame_player 
Case 20884: Quest frame player and Oculus libraries
 2019-02-06 13:15:39 -08:00
Clement
8b32a62e2f Simplify filter check 2019-02-05 17:03:19 -08:00
Clement
5945823606 Honor full scene resends 2019-02-05 17:03:19 -08:00
SamGondelman
31cf623252 fix keyboard focus 2019-02-04 12:44:04 -08:00
SamGondelman
17cafe7cce fix getEntityProperties 
(cherry picked from commit 6e61c02d04)
 2019-02-04 10:41:10 -08:00
SamGondelman
4b406bf41c fix getEntityObject and tablet highlighting (Overlays.findOverlays) 2019-02-01 16:23:06 -08:00
SamGondelman
50bfe84aa7 fix keyboard intersection, laser alpha 2019-02-01 12:11:00 -08:00
SamGondelman
0955512a80 add billboard mode to web entities and fix picking/culling 2019-01-31 15:45:10 -08:00
SamGondelman
ee1552661c fix textures 2019-01-31 12:04:46 -08:00
SamGondelman
2d0c1184e4 only domain zone entities control flying and ghosting 2019-01-30 18:27:17 -08:00
SamGondelman
6e61c02d04 fix getEntityProperties 2019-01-30 17:17:39 -08:00
Brad Davis
8a1a55189a CMake cleanup and modernization 2019-01-30 16:23:14 -08:00
Seth Alves
3ab2db96b6 deactivate grab action when grab is released 2019-01-30 14:43:11 -08:00
SamGondelman
57ee9786af fix picks vs. local entities 2019-01-30 11:42:05 -08:00
SamGondelman
a8dbe5e761 working on build errors 2019-01-28 21:10:24 -08:00
SamGondelman
6ad0b3412a showKeyboardFocusHighlight + fixes 2019-01-28 20:43:47 -08:00
SamGondelman
7b88efa42c trying to fix web surfaces?? 2019-01-28 18:29:09 -08:00
SamGondelman
0d1e4bed66 merge with master 2019-01-28 18:13:05 -08:00
Sam Gondelman
faeb5b36dc
Merge pull request #14764 from SamGondelman/NOverlays12 
Case 20722: Ring Gizmo Entities to replace Circle Overlays
 2019-01-28 18:09:23 -08:00
Shannon Romano
607ce00713
Merge pull request #14766 from AndrewMeadows/grab-it 
case 20701: fixes for grab
 2019-01-28 15:57:36 -08:00
SamGondelman
445608e163 fix entity selection tool 2019-01-28 15:30:19 -08:00
SamGondelman
2db45b3ec9 dante's keyboard changes + getProperty + some fixes 2019-01-28 14:03:43 -08:00
SamGondelman
13cb70a6a5 Merge remote-tracking branch 'upstream/master' into NOverlays12 2019-01-28 11:37:15 -08:00
SamGondelman
0dd729232b simplify keyboard focus highlight 2019-01-26 22:49:12 -08:00
SamGondelman
8f0bd2449b pointerevents are working! 2019-01-26 21:53:46 -08:00
SamGondelman
abd7d6bddf some stuff is working! 2019-01-26 01:39:13 -08:00
SamGondelman
bb5c556657 working on conversion 2019-01-25 19:15:53 -08:00
SamGondelman
a10f52c66d merge with master 2019-01-25 14:16:07 -08:00
Jeff Clinton
d92d256cfc
Merge pull request #14656 from SamGondelman/matFallthrough 
Case 20241: Material entity fallthrough
 2019-01-25 14:01:27 -08:00
Adam Smith
f651ad2f67
Merge pull request #14711 from SamGondelman/NOverlays10 
Case 20585: Add missing Web Overlay functionality to Web Entities
 2019-01-25 14:00:52 -08:00
SamGondelman
5ce8f566cc more overlay wip 2019-01-25 11:10:11 -08:00
Andrew Meadows
c9ef439a7f fix more grab bugs 2019-01-25 08:46:24 -08:00
Shannon Romano
66d5b16a5d
Merge pull request #14744 from dback2/shapeTypeFix 
Shape type and compound shape property fixes
 2019-01-24 16:18:34 -08:00
SamGondelman
ca8d64bc05 removing overlays wip 2019-01-24 14:59:45 -08: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
0bfcde67ea remove overlays from application.cpp 2019-01-24 14:11:24 -08:00
Andrew Meadows
965d0ccf60 reduced priority for AvatarEntities 2019-01-23 21:29:49 -08:00
Andrew Meadows
de68f6ca49 use Hold action 
use Hold action for any non-dynamic Entity with Body in phys simulation
also set DIRTY_MOTION_TYPE bit, add to changed list on add/remove grab
 2019-01-23 21:26:57 -08:00
SamGondelman
217ff2b1b2 keyboardFocusOverlay 2019-01-23 18:33:35 -08:00
SamGondelman
5d19666f60 merge with master 2019-01-23 17:58:56 -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