Commit graph

3944 commits

Author SHA1 Message Date
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
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