Anthony J. Thibault
c407818d63
send pointer events from handControllerGrab.js to webEntities
2016-08-16 15:26:14 -07:00
Anthony J. Thibault
1be434342b
Work In Progress snapshot
...
* Added new PointerEvent type.
* Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents
* All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents
* Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents
* Events from handControllerGrab.js to entities are currently broken.
2016-08-12 17:11:59 -07:00
SamGondelman
ccca6d935f
don't fade after physics kick in
2016-08-12 14:35:22 -07:00
Ryan Huffman
211da3c428
Add more user activity tracking data
2016-08-11 16:49:29 -07:00
Seth Alves
15e2140cb2
Merge branch 'master' of github.com:highfidelity/hifi into overlay-children
2016-08-11 15:06:58 -07:00
Anthony J. Thibault
1ddbd7022a
Moved keyboardFocus, mouse/touch event methods from Reticle to Entities
2016-08-11 11:52:04 -07:00
Brad Hefta-Gaub
a714f325fe
Merge pull request #8333 from SamGondelman/miscFixes
...
Miscellaneous cmake and render engine improvements
2016-08-10 11:06:50 -07:00
SamGondelman
36d9f92101
performance optimization to minimize calling usecTimestampNow
2016-08-09 13:10:02 -07:00
SamGondelman
ac9a80131a
refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes
2016-08-04 12:34:46 -07:00
SamGondelman
d63a0ef08f
working on making other entities transparent
2016-08-02 18:09:42 -07:00
Seth Alves
e4e86c245e
3d overlays can be children of entities or avatars
2016-07-31 14:11:56 -07:00
SamGondelman
676f4bdfcf
misc fixes from particles branch
2016-07-29 15:36:32 -07:00
Zander Otavka
c25b87c33f
Use custom dialog for asset server add to world
2016-07-22 17:14:45 -07:00
Seth Alves
5f6e608207
don't overwrite physical properties with those from the entity during editEntity -- only set those that the script didn't.
2016-07-19 11:23:21 -07:00
Brad Davis
03cb6175ab
Support triangle and hexagon shapes, add shape support to overlays.
2016-07-15 22:02:17 -07:00
Ryan Huffman
c0c060ef40
Add FIXME comment to change to allow uknown enity edits
2016-07-09 02:51:51 -07:00
Ryan Huffman
2f7e346f6a
Update entity scripting interface to allow modifications to unknown entities
2016-10-04 20:12:19 -07:00
Andrew Meadows
431043e195
declare new shape types
2016-07-06 10:50:51 -07:00
Seth Alves
b9f9b18083
if an edit packet doesn't include a change to lifetime, don't attempt to cap the lifetime
2016-06-30 15:41:58 -07:00
Zander Otavka
a4da63c1ff
Fix bug with Entities.addEntity returning bad id
...
If addEntity failed for whatever reason (eg. lack of permission), it
would return a non-null UUID.
Fixes [FogBugz case #365 ](https://highfidelity.fogbugz.com/f/cases/356/Entities-addEntity-can-return-a-UUID-even-when-unsuccessful ).
2016-06-24 16:39:57 -07:00
Zander Otavka
2786061d71
Fix bug with entity adding w/o permission
...
Entities could be added to the local tree, but be rejected by the server
because of a lack of permissions.
2016-06-24 16:34:54 -07:00
Brad Hefta-Gaub
2e8f6c2cc6
Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject
...
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
2016-06-24 14:08:29 -07:00
Seth Alves
2fd38c1585
when adding or editing an entity from a script, make the _lastEdited in the transmitted properties be the same as the one in the Entity in the local tree
2016-06-23 13:10:15 -07:00
Andrew Meadows
1d8d1240ca
remove override to avoid new Jenkins OSX warnings
2016-06-23 10:38:46 -07:00
Andrew Meadows
8009d23f70
more STATIC_MESH and dynamic overlap prevention
2016-06-22 15:20:45 -07:00
Seth Alves
c62b73bf61
when the entity-server caps a lifetime of an edit from a tmp-rez only interface, bump the lastEdited time forward so that the interface accepts the change back into its local tree
2016-06-22 11:42:57 -07:00
Seth Alves
9ca27f267d
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
2016-06-21 16:48:04 -07:00
Andrew Meadows
702e83ba6a
prevent incompatible entity properties combos
2016-06-21 14:03:21 -07:00
Andrew Meadows
937bd0c1be
SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH
2016-06-21 13:54:21 -07:00
Andrew Meadows
f41fb30ace
add "Static Mesh" option to edit.js
2016-06-20 17:29:20 -07:00
humbletim
e65e6dc9ce
Fix entity lifetime guards (re: canRez/canRezTmp)
2016-06-19 13:40:03 -04:00
Atlante45
fc7b271e50
Missed OS X Warning
2016-06-14 16:29:50 -07:00
James B. Pollack
1306417c8e
more verbose messaging about incorrect entity types
2016-06-13 17:48:58 -07:00
Seth Alves
99bfc76dd3
Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam
2016-06-13 11:14:26 -07:00
Brad Hefta-Gaub
da28b0f3e7
Merge pull request #8048 from ctrlaltdavid/20961
...
fix import of invalid JSON file failing silently
2016-06-12 19:42:53 -07:00
David Rowe
2953ca08cb
Fix import of invalid JSON file failing silently
2016-06-10 12:04:41 +12:00
Seth Alves
5650ef9d52
have code where physics guesses at server values also avoid doing simple simulation of children of avatars
2016-06-09 14:35:17 -07:00
Seth Alves
bade215907
maximum 'tmp' entity lifetime is now a domain-server setting, defaults to 1 hour
2016-06-09 10:41:30 -07:00
Seth Alves
d7fc789ea7
try harder to not do simple-simulation on things that have an avatar ancestor
2016-06-08 13:47:52 -07:00
Seth Alves
a1766539f4
don't do simple simulation on children of avatars
2016-06-08 12:17:07 -07:00
Seth Alves
1977efae4f
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-08 10:36:52 -07:00
Atlante45
71fb0e665f
Fix OSX warning
2016-06-07 16:46:32 -07:00
Seth Alves
b2f63a2132
hook up can-rez-tmp and can-write-to-asset-server
2016-06-07 16:17:58 -07:00
Brad Hefta-Gaub
30526374bc
Merge pull request #7996 from ctrlaltdavid/get-entity-children
...
add Entities.getChildrenIDs() method
2016-06-06 16:25:25 -07:00
Brad Hefta-Gaub
b4721ec57e
Merge pull request #7973 from ctrlaltdavid/clipboard-dimensions
...
add Clipboard.getContentsDimensions() JavaScript method
2016-06-06 12:03:10 -07:00
Andrew Meadows
c2317adf06
undo ambitious cleanup (try again another day)
2016-06-03 11:06:36 -07:00
Andrew Meadows
211bbb88e6
purge SHAPE_TYPE_ELLIPSOID which wasn't used
2016-06-03 10:47:54 -07:00
Andrew Meadows
c066b4d4ac
purge collision shape for ParticleEffectEntityItem
2016-06-03 10:47:54 -07:00
Andrew Meadows
5d9e320dd7
purge SHAPE_TYPE_LINE
2016-06-03 10:47:54 -07:00
Brad Hefta-Gaub
1075ba1599
CR feedback
2016-06-03 08:01:09 -07:00
Brad Hefta-Gaub
7ed35399e9
make the application of redundant physics update idempotent to improve action glitches
2016-06-02 18:01:23 -07:00
David Rowe
44fe7c1144
Add Entities.getChildrenIDs() method
2016-06-02 21:26:33 +12:00
David Rowe
7a8954d851
Merge branch 'master' into clipboard-dimensions
2016-06-02 12:55:23 +12:00
Brad Hefta-Gaub
0ec7eae58c
fix shapes to property polymorph and persist
2016-05-27 16:59:42 -07:00
David Rowe
2f3fa80b96
Add Clipboard.getContentsDimensions() JavaScript method
2016-05-26 09:52:22 +12:00
Brad Davis
b16e701ea3
Fix broken protocol for shapes
2016-05-25 13:53:28 -07:00
Brad Davis
8f3918b5ba
Fix primitive shape collisions
2016-05-25 11:21:05 -07:00
Brad Hefta-Gaub
b8b39b962d
Merge pull request #7868 from jherico/entity_shape
...
Add a generic shape primitive
2016-05-24 08:40:58 -07:00
Brad Davis
2c703e963c
More shapes
2016-05-22 19:48:59 -07:00
Brad Davis
cd1e910844
Add a generic shape primitive
2016-05-21 23:46:44 -07:00
Seth Alves
40e862cf9e
quiet gcc 5 warnings
2016-05-21 16:53:01 -07:00
Brad Hefta-Gaub
ac49feda22
Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS
...
Conflicts:
libraries/entities/src/EntityEditPacketSender.h
2016-05-21 09:23:45 -07:00
Seth Alves
637735bbc3
unmangle merge
2016-05-20 18:07:38 -07:00
Seth Alves
f91a2403be
merge from upstream
2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
18613908df
Merge pull request #7800 from sethalves/no-fly-zones
...
No fly zones
2016-05-20 16:59:55 -07:00
Seth Alves
ff36b39067
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-20 14:38:53 -07:00
Brad Hefta-Gaub
770fab956f
remove dead code
2016-05-20 12:23:06 -07:00
Seth Alves
7ea7bd3e1d
set created-time for imported entities to 'now'
2016-05-19 10:21:04 -07:00
Seth Alves
74520f5c92
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-19 09:49:44 -07:00
Seth Alves
419c744bd4
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 09:49:18 -07:00
Brad Hefta-Gaub
9a3b6bf081
Merge pull request #7858 from Atlante45/remove-deprecated-entity-props
...
removed dead code for overlays/entities glow level
2016-05-18 09:14:26 -07:00
Seth Alves
cf829f1bab
magic number
2016-05-17 19:14:44 -07:00
Seth Alves
3380b2a668
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-17 19:10:33 -07:00
Seth Alves
d77b3bf59a
fix some comments and debug pritns
2016-05-16 14:12:05 -07:00
Atlante45
38f74c1843
Remove the last of the glow level
2016-05-14 14:49:31 -07:00
Seth Alves
9bd4b4f8d8
Merge branch 'master' of github.com:highfidelity/hifi into fix-update-entity-operator
2016-05-13 07:12:11 -07:00
Seth Alves
2f93a38a6a
Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3
2016-05-12 11:17:18 -07:00
Seth Alves
63073301ee
try again to fix update logic
2016-05-12 11:16:42 -07:00
Seth Alves
c9c619916c
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-11 19:37:57 -07:00
Seth Alves
2101d7dea3
Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3
2016-05-11 18:50:01 -07:00
Seth Alves
ce3faa2916
fix logic in UpdateEntityOperator
2016-05-11 18:47:20 -07:00
Seth Alves
ac506dc4b7
where needed, copy clientOnly into properties before calling queueEditEntityMessage
2016-05-11 12:46:16 -07:00
Seth Alves
872f1b0c64
clear avatarEntity data for entities that are deleted
2016-05-10 17:48:55 -07:00
Seth Alves
e4e0be8fa3
relay owningAvatar from properties to entity on entity creation
2016-05-10 16:51:38 -07:00
Seth Alves
de12680ff1
don't put actions on other people's avatarEntities
2016-05-10 16:43:27 -07:00
Seth Alves
144715f00c
don't make changes to other avatar's avatarEntities
2016-05-10 16:05:40 -07:00
Seth Alves
4b13fd969e
split code that sends edits via avatar-mixer out of queueEditEntityMessage
2016-05-10 15:37:54 -07:00
Seth Alves
de4c9530c9
carry clientOnly flag over from properties when addEntity is called
2016-05-10 14:48:12 -07:00
Seth Alves
f90b9ec65d
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 12:08:45 -07:00
Brad Hefta-Gaub
350743454b
Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1
...
use smart pointers for entity simulations
2016-05-10 11:35:57 -07:00
Seth Alves
4c1f815870
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 10:09:40 -07:00
Brad Hefta-Gaub
d7eee98acc
Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum
...
resurrection of threadsafe ViewFrustum
2016-05-10 09:06:38 -07:00
Seth Alves
b761ecf44f
merge from upstream
2016-05-10 08:18:45 -07:00
Andrew Meadows
ffc3123467
Merge pull request #7658 from sethalves/grab-fixes
...
Grab fixes
2016-05-09 15:30:37 -07:00
Seth Alves
473010f634
addEntity has a clientOnly flag now
2016-05-07 16:45:09 -07:00
Seth Alves
0e6d9a1eec
avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them.
2016-05-07 14:48:31 -07:00
Seth Alves
a0771f8ee5
use smart pointers for entity simulations
2016-05-07 09:14:33 -07:00
Andrew Meadows
7d6424bdcc
Head::render() was cruft
2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074
use references not pointers for ViewFrustums
...
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Atlante45
07adef9465
Fix entities collision sounds
2016-05-05 14:55:28 -07:00
Seth Alves
cd934bab90
set _actionDataDirty when adding an action.
2016-05-05 14:16:13 -07:00
Seth Alves
ec50744aa1
Merge pull request #7817 from AndrewMeadows/ignore-echo-of-stale-data
...
fix bug preventing sim ownership release
2016-05-05 11:14:55 -07:00
Seth Alves
3c41df53e4
Merge branch 'ignore-echo-of-stale-data' of github.com:AndrewMeadows/hifi into grab-fixes
2016-05-05 11:00:55 -07:00
Andrew Meadows
967a67256e
fix bug preventing sim ownership release
2016-05-05 10:52:53 -07:00
Seth Alves
0c794cac5d
Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes
2016-05-05 10:13:07 -07:00
Seth Alves
929d831212
Merge pull request #7807 from AndrewMeadows/ignore-echo-of-stale-data
...
fix object position glitch of owned simulations on networks with long ping-time
2016-05-05 10:11:02 -07:00
samcake
a78719bc85
Merge pull request #7813 from ZappoMan/fixRecursiveMutex
...
fix recursive mutex in Entites.callEntityMethod()
2016-05-05 10:06:58 -07:00
Seth Alves
f5be64ed96
Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes
2016-05-05 09:52:33 -07:00
Seth Alves
d76b8f2335
action->locallyAddedButNotYetReceived is unneeded with isMine available
2016-05-05 06:44:52 -07:00
Andrew Meadows
be9a572fb0
fix grab motion glitch on long-ping connections
2016-05-04 16:50:42 -07:00
Seth Alves
91af732516
if we receive an update from the entity-server that doesn't include one of our actions, resend the action data
2016-05-04 16:30:38 -07:00
Seth Alves
9db839bc13
don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0
2016-05-04 15:01:00 -07:00
David Rowe
4b05d8ed95
Increase maximum friction to 10.0 - Bullet's maximum
2016-05-05 07:50:15 +12:00
Seth Alves
382a0c48da
fix warning
2016-05-04 12:09:26 -07:00
Brad Hefta-Gaub
2c9608489f
fix recursive mutex in Entites.callEntityMethod()
2016-05-04 10:01:20 -07:00
David Rowe
d1064bf5ea
Increase maximum friction to 1.0 - bullet can handle it
2016-05-04 10:58:33 +12:00
Seth Alves
9e53055d43
parentID and parentJointIndex are now protected by simulation ownership
2016-05-03 15:48:50 -07:00
David Rowe
bc04d1b477
Increase maximum friction value from 0.99 to 0.9999
2016-05-04 09:01:26 +12:00
Andrew Meadows
ba226b9cb4
promote priority immediately when already owned
2016-05-03 13:43:08 -07:00
Brad Hefta-Gaub
eb209c7483
Merge pull request #7752 from Geenz/master
...
Correction To sRGB Conversions
2016-05-03 08:01:51 -07:00
Seth Alves
1da041de9b
don't consume the physics related property changes from the packet that informs us that we are the simulationOwner of an entity
2016-05-02 15:09:08 -07:00
Seth Alves
ae8f502808
keep track of actions we are editing and ignore updates from server for these actions
2016-05-02 14:23:36 -07:00
Seth Alves
0fe4e42511
added zone properties to allow flying/ghosting or not
2016-05-01 13:53:44 -07:00
Zach Pomerantz
13945aa4d9
Annotate all virtual fns with override
2016-04-30 13:48:59 -07:00
Geenz
85e0620261
Merge branch 'master' of https://github.com/highfidelity/hifi
2016-04-30 15:40:28 -04:00
Andrew Meadows
b5ad989811
more optimized uses of EntityItem::getDimensions()
2016-04-27 11:04:22 -07:00
Andrew Meadows
c686418be0
optimize use of EntityItem::getDimensions()
2016-04-27 10:34:29 -07:00
Geenz
83d6f7f1e3
Quick fix for incorrect conversion.
...
We want sRGB to linear, not linear to sRGB.
2016-04-26 18:49:03 -04:00
Geenz
ef7098b39a
Missed a few.
2016-04-26 17:12:04 -04:00
Seth Alves
16bf59f8a6
fix a crash in RenderableModelEntityItem::getModel
2016-04-25 10:26:32 -07:00
Brad Hefta-Gaub
8c7ef31636
Merge pull request #7746 from AndrewMeadows/supress-spurious-logs
...
reduce warnings about truncated kinematic timesteps
2016-04-23 09:34:45 -07:00
Brad Hefta-Gaub
04dab65b59
Merge pull request #7727 from ZappoMan/supportLargeClockSkew
...
support for larger than 35 minute clock skew
2016-04-23 08:42:38 -07:00
Andrew Meadows
d984ce4792
properly update _lastSimulated for kinematic objs
2016-04-22 17:19:00 -07:00
Andrew Meadows
34d622e498
add warning about truncated kinematic timestep
2016-04-22 13:10:23 -07:00
Andrew Meadows
872622c6f7
fix acceleration of for server-side kinematics
2016-04-22 09:38:43 -07:00
Andrew Meadows
14abb15216
set kinematic accel before stepping
2016-04-22 09:38:43 -07:00
Andrew Meadows
8efb07cfd8
correctg measured acceleration for kinematics
2016-04-22 09:38:43 -07:00
Andrew Meadows
a79f49a5cd
don't stop slow kinematic objs when sending updates
2016-04-22 09:38:43 -07:00
Andrew Meadows
ad045bc439
remove second-order term from kinematic motion
2016-04-22 09:38:43 -07:00
Andrew Meadows
3639ffe53e
optimize kinematic motion math
2016-04-22 09:38:43 -07:00
Brad Hefta-Gaub
31f9d592e0
support for larger than 35 minute clock skew
2016-04-20 18:42:00 -07:00
Howard Stearns
9ff9682b2a
Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange
...
Reset entities script engine on domain change
2016-04-19 11:14:28 -07:00
Seth Alves
4bf98a80b9
Merge pull request #7667 from AndrewMeadows/fix-entity-server-crash
...
fix entity-server crash when entity moves out of bounds
2016-04-18 14:09:21 -07:00
Brad Hefta-Gaub
374ba10524
more CR feedback
2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
1c111e20bd
fix possible thread issue with Entities.callEntityMethod()
2016-04-18 11:20:26 -07:00
Brad Hefta-Gaub
91334d6a39
Merge pull request #7664 from ZappoMan/reduceJointProperties
...
only export joint values if they've been explicitly set by scripts
2016-04-14 15:30:04 -07:00
Andrew Meadows
a263091c94
fix entity-server crash for out of bounds
2016-04-14 15:23:14 -07:00
Zach Pomerantz
e80898f095
Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache
2016-04-14 10:12:16 -07:00
Brad Hefta-Gaub
7b5075cce5
Merge pull request #7645 from sethalves/dont-run-bullet-too-soon
...
add a heuristic for deciding when it's safe to enable bullet
2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub
b48503a82d
only export joint values if they've been explicitly set by scripts
2016-04-13 19:52:50 -07:00
Zach Pomerantz
7a15339631
Use AnimationCache for models
2016-04-13 15:44:47 -07:00
Seth Alves
3288bff963
don't flood log with messages about expired actions. also, try to remove such actions
2016-04-13 09:47:07 -07:00
Seth Alves
e4c91e5064
add a heuristic for deciding when it's safe to enable bullet
2016-04-12 11:46:00 -07:00
Seth Alves
1d63f6d354
Merge branch 'master' of github.com:highfidelity/hifi into make-fixupMissingParents-more-thread-safe
2016-04-11 09:58:08 -07:00
Brad Hefta-Gaub
47ff5c090d
Merge pull request #7623 from ZappoMan/fixAnimationFrameExport
...
fix export of animation properties
2016-04-11 09:37:47 -07:00
Brad Hefta-Gaub
cc418c615f
Merge pull request #7631 from sethalves/parent-equipping-and-platform-hack
...
treat children of avatars and children of entities differently until velocity handling is fixed
2016-04-10 14:55:03 -07:00
Seth Alves
43f735dd21
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
2016-04-09 22:18:43 -07:00
Seth Alves
2aa3e5d418
re-enabled EntityItem::simulateKinematicMotion for things with parents
2016-04-09 09:06:18 -07:00
Brad Hefta-Gaub
f1f8fd8a24
fix export of animation properties
2016-04-08 14:40:06 -07:00
Seth Alves
95f446183f
use for loop rather than iterator
2016-04-08 13:32:33 -07:00
Seth Alves
6088612ce0
guard access to _missingParent vector with a lock to allow safe access from multiple threads
2016-04-08 13:16:30 -07:00
Brad Hefta-Gaub
e7d75cb22e
Merge pull request #7573 from sethalves/update-collision-hulls-of-avatar-children
...
Update collision hulls of avatar children
2016-04-07 14:47:44 -07:00
Brad Hefta-Gaub
7f164a7959
CR feedback
2016-04-07 08:42:40 -07:00
Seth Alves
5375fdd0f0
don't do simple kinematic simulation on things that have parents
2016-04-06 16:42:14 -07:00
Brad Hefta-Gaub
8c15116190
fix auto-hide logic in depthReticle
2016-04-06 11:00:43 -07:00
Seth Alves
af05b97c1e
put back accidently deleted line. cleanups
2016-04-04 17:31:59 -07:00
Seth Alves
d814d7b35d
merge from upstream
2016-04-04 16:32:49 -07:00
Seth Alves
69bb0ebd74
Revert "faster kinematic motion for entities"
2016-04-04 16:11:54 -07:00
Seth Alves
b8587e0711
update collision shapes of entities which are children of avatars
2016-04-04 16:06:53 -07:00
Seth Alves
c48a67b933
Merge pull request #7544 from AndrewMeadows/faster-kinematics
...
faster kinematic motion for entities
2016-04-04 15:26:32 -07:00
Andrew Meadows
a08ab8e127
restore setFlag in simulateKinematicMotion()
2016-04-04 11:48:45 -07:00
Andrew Meadows
a53cb2e532
use _gravity rather than _acceleration
...
also tweaks and comments about supporting low gravity
2016-04-04 11:10:50 -07:00
Andrew Meadows
74058ac049
more correct moving test for ballistic kinematics
2016-04-03 19:15:16 -07:00
Andrew Meadows
0830c55bcf
getLocalEverything->getLocalTransformAndVelocities
2016-04-01 17:48:56 -07:00
howard-stearns
cec4175e9d
whitespace
2016-04-01 15:00:51 -07:00
howard-stearns
b5cbd7720e
Lock entity tree on export, and clipboard on import.
2016-04-01 14:56:56 -07:00
Andrew Meadows
442b52313f
faster kinematic motion calculations
2016-04-01 13:14:03 -07:00
Zach Pomerantz
54b8a9278d
Guard model texs
2016-03-30 14:11:45 -07:00
Brad Hefta-Gaub
6fdedb8f34
Merge pull request #7508 from howard-stearns/import-export-parents
...
Make export/import and copy/paste be parent/child-clean.
2016-03-30 09:06:33 -07:00
howard-stearns
5381be6902
Whitespace
2016-03-29 17:06:19 -07:00
howard-stearns
86a77d4f55
Remove unused/non-existent include.
2016-03-29 16:55:17 -07:00
howard-stearns
eef9de4d4f
Remove obsolete remapIDs.
2016-03-29 16:28:02 -07:00
howard-stearns
4ebf816166
cleanup
2016-03-29 16:17:19 -07:00
howard-stearns
bcb729eac2
Abstract out globalizeProperties.
2016-03-29 15:21:06 -07:00
howard-stearns
4a28dadae5
Working, but not cleaned up.
2016-03-29 13:26:50 -07:00
Howard Stearns
5db1c33e4d
kill offsets
2016-03-29 09:18:29 -07:00
howard-stearns
1b3d9d7ab6
Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents
2016-03-28 16:59:20 -07:00
howard-stearns
b09b9a4a0a
snapshot after using tree from entity item.
2016-03-28 16:58:20 -07:00
howard-stearns
7a066afa26
Checkpoint for freakin edit.js again.
2016-03-28 14:25:51 -07:00
Zach Pomerantz
2de94e672b
Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching
2016-03-28 14:08:30 -07:00
howard-stearns
c6347eb92a
checkpoint for debugging/comparing edit.js
2016-03-28 13:39:43 -07:00
Andrew Meadows
5ac0640cbe
check for time machine
2016-03-27 16:33:53 -07:00
Philip Rosedale
dfb09f134a
Merge pull request #7476 from ZappoMan/bugFixes
...
fix a couple of model bugs
2016-03-25 15:58:52 -07:00
Seth Alves
d97ab1e2fc
Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking
2016-03-25 13:53:01 -07:00
Zach Pomerantz
c5e5195db1
Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching
2016-03-25 12:07:00 -07:00
Brad Hefta-Gaub
4ebb114a8e
also fix joint simulation from 3rd party editors
2016-03-25 11:43:32 -07:00
Andrew Meadows
d3d724530a
minor optimiztion
2016-03-24 21:12:22 -07:00
Seth Alves
1b88284bf7
more threading cleanups
2016-03-24 19:14:25 -07:00
Zach Pomerantz
3e9e083df5
Update users of NetworkGeometry
2016-03-24 11:35:41 -07:00
Seth Alves
bd178640f1
Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking
2016-03-24 09:51:31 -07:00
Seth Alves
462da3aaf3
don't call getMesh from render
2016-03-23 22:46:43 -07:00
Seth Alves
2d7f32a554
redo polyvox locking
2016-03-23 22:03:27 -07:00
Brad Hefta-Gaub
62a56ecbfa
fix typos
2016-03-23 17:45:22 -07:00
Brad Hefta-Gaub
fdd0b48ae1
reduce log spam
2016-03-23 17:06:03 -07:00
Chris Collins
ed3a9cb24b
Merge pull request #7415 from howard-stearns/thread-safe-entityToElementMap
...
Possible fix for getContainingElement crash.
2016-03-21 15:30:04 -07:00
howard-stearns
8858559247
Make access to entityToElementMap thread safe.
2016-03-21 14:02:18 -07:00
Brad Hefta-Gaub
492e71345a
Revert "Revert "Fix ModelBlender crash""
...
This reverts commit f274cdcc7f
2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f
Revert "Fix ModelBlender crash"
2016-03-21 10:47:31 -07:00
Brad Hefta-Gaub
2ef5b3727e
Merge branch 'master' of https://github.com/highfidelity/hifi into fixBlenderCrash
2016-03-18 14:04:45 -07:00
Seth Alves
1e02c8d9d3
minimize diff
2016-03-17 17:28:36 -07:00
Seth Alves
cbfde2032c
fix bug which caused observers of a parenting grab to not see the entity in the grabber's hand
2016-03-17 17:09:32 -07:00
Brad Hefta-Gaub
7483b8546b
remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it
2016-03-17 17:05:35 -07:00
Brad Hefta-Gaub
d5bf65cc8f
Merge pull request #7379 from sethalves/fix-crashes-0
...
possibly fix a couple of crashes
2016-03-17 15:51:27 -07:00
Seth Alves
db5c6d80d2
possibly fix a couple of crashes
2016-03-17 10:31:54 -07:00
Clément Brisset
17e5b441cf
Merge pull request #111 from huffman/atp-manager-name
...
Add atp filename to entities added to world
2016-03-15 10:19:53 -07:00
Stephen Birarda
72c64532f5
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-15 09:12:49 -07:00
Ryan Huffman
7823882aa1
Add atp filename to entities added to world
2016-03-14 16:13:33 -07:00
ZappoMan
1a17de6dbb
reduce log spam
2016-03-14 14:02:25 -07:00
Seth Alves
5292e537ea
further unmangle merge
2016-03-14 11:22:01 -07:00
Seth Alves
908481d5d4
merge from upstream
2016-03-14 11:15:16 -07:00
Seth Alves
7641b1e99d
remove debug print
2016-03-13 08:45:23 -07:00
Seth Alves
415f21c189
be more aggressive about putting entities into the missing-its-parent list
2016-03-13 08:35:21 -07:00
Seth Alves
0a2fb77698
delete child entities when parent is deleted
2016-03-13 07:04:50 -07:00
Seth Alves
01659cf93b
try, try again
2016-03-11 16:21:20 -08:00
Seth Alves
5f05d576cc
move checkAndAdjustQueryAACube into SpatiallyNestable
2016-03-11 15:55:42 -08:00
Seth Alves
1e8706b1da
remove debug print
2016-03-11 14:47:53 -08:00
Seth Alves
2ad15f7568
try harder to get queryAABoxes to be correct
2016-03-11 14:38:31 -08:00
Seth Alves
7a4dad8e51
allow entity-server to patch up broken queryAACubes
2016-03-11 13:20:52 -08:00
Seth Alves
f611d8f747
if needed, set querryAACube when dimensions are updated
2016-03-11 12:41:18 -08:00
Stephen Birarda
5ad4645b47
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-10 13:28:59 -08:00
Ryan Huffman
b42bec78dc
Add Entities.addModelEntity
2016-03-10 10:25:20 -08:00
Philip Rosedale
ee1e4b898e
Merge pull request #7278 from AndrewMeadows/simulation-priority
...
adjust simulation priorities
2016-03-10 08:52:18 -08:00
Andrew Meadows
9157ff6eda
more correct notion of desired simulation priority
2016-03-09 11:02:50 -08:00
Brad Hefta-Gaub
1c07276501
fix a couple bugs
2016-03-09 09:45:55 -08:00
Andrew Meadows
99a1310711
change properties at 127 priority, grab at 128
2016-03-08 22:17:44 -08:00
Brad Hefta-Gaub
8d4ef28411
CR feedback
2016-03-08 15:29:04 -08:00
Brad Hefta-Gaub
35d6afbe77
Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable
2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub
6d211dd4e5
first cut at fixing the scene not stable bug
2016-03-08 14:52:21 -08:00
Seth Alves
dcb720a832
fix polyvox hull when registration changes.
2016-03-06 14:09:45 -08:00
Seth Alves
9346171695
if entity registration isn't default, adjust physics shapes to match
2016-03-04 16:47:30 -08:00
Philip Rosedale
3eabf0d451
Merge pull request #7209 from sethalves/auto-unhook-stuck-to-hand
...
when trigger is squeezed, check for things stuck to hand and unhook them
2016-02-29 12:59:02 -08:00
Clément Brisset
2ffaa1f2e7
Merge pull request #7196 from AndrewMeadows/simulation-ownership
...
no expiry for simulation ownership
2016-02-29 08:26:53 -08:00
Andrew Meadows
a933935e2d
lock mutex in clearEntitiesInernal()
2016-02-28 15:13:49 -08:00
Seth Alves
5bf8670bc2
fix SpatiallyNestable::getChildren
2016-02-28 12:16:41 -08:00
Seth Alves
6c9cf386a6
when trigger is squeezed, check for things stuck to hand and unhook them
2016-02-26 10:14:09 -08:00
Andrew Meadows
acef6642c9
fix logic typo
2016-02-25 18:09:35 -08:00
Andrew Meadows
5d1e283508
namechange TouchesKeyhole to IntersectsKeyhole
2016-02-25 18:09:35 -08:00
Andrew Meadows
dfdf375853
use shapeInFrustum() names again
...
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
2016-02-25 18:09:35 -08:00
Brad Hefta-Gaub
202a456e1a
Merge pull request #7126 from AndrewMeadows/cleanup
...
cleanup ViewFrustum method names
2016-02-25 16:12:25 -08:00
Brad Hefta-Gaub
82cbf19bca
Merge pull request #7078 from zzmp/fix/light-intensity
...
Reimplement light attenuation for spot and point lights
2016-02-25 16:08:28 -08:00
Andrew Meadows
b4edfe2390
no expiry for simulation ownership
2016-02-25 12:07:20 -08:00
Zach Pomerantz
32ce7c6eab
Rename light surfaceRadius->falloffRadius
2016-02-25 10:02:33 -08:00
Andrew Meadows
9c927ea36b
ViewFrustum method renames and whitespace cleanup
...
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
2016-02-25 09:11:28 -08:00
Zach Pomerantz
13153bcf08
Fix keyLight.ambientURL capitalization
2016-02-23 16:53:16 -08:00
Zach Pomerantz
1e3cfd6baf
Detect changes for surfaceRadius
2016-02-22 19:27:35 -08:00
Zach Pomerantz
8688bf2abb
Move light entity defaults to light
2016-02-22 15:56:10 -08:00
Zach Pomerantz
77ad4039bc
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
2016-02-22 15:11:12 -08:00
Zach Pomerantz
6d7bf7d423
Add PROP_SURFACE_RADIUS to LightEntity
2016-02-22 15:07:07 -08:00
Thijs Wenker
58539171a3
give particle trails a nice smooth path between frames
2016-02-20 22:46:19 +01:00
Seth Alves
af1640ac4e
adjust avatar-energy code to avoid editing local tree and then not telling the entity-server about it
2016-02-17 14:36:18 -08:00
samcake
545f276fdf
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-15 09:29:00 -08:00
Brad Hefta-Gaub
9160758af7
make sure forced reload still works
2016-02-12 15:09:50 -08:00
Brad Hefta-Gaub
550b9a98b1
fix error in preload logic
2016-02-12 14:45:55 -08:00
samcake
f12030c1a4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 18:41:02 -08:00
James B. Pollack
2889bdd8b2
Merge pull request #7083 from ZappoMan/fixDoublePreload
...
handle two corner cases where preload would get called twice
2016-02-11 16:08:43 -08:00
Chris Collins
a4afa03fe5
Merge pull request #7077 from sethalves/clean-up-grab-signaling
...
Clean up grab signaling + various fixes
2016-02-11 10:20:56 -08:00
samcake
31230e81bb
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 10:05:58 -08:00
Brad Hefta-Gaub
a40a562db2
handle two conner cases where preload would get called twice
2016-02-11 09:33:52 -08:00
Seth Alves
3a2b082a7f
remove incorrect assert
2016-02-10 20:47:22 -08:00
Seth Alves
ffce38769f
properties hold local velocities, not world-frame ones
2016-02-10 19:16:08 -08:00
Seth Alves
6a646f1c24
put isMoving back and change all uses to isMovingRelativeToParent
2016-02-10 19:01:41 -08:00
Seth Alves
3fe01ccf10
cleanups
2016-02-10 18:32:05 -08:00
Seth Alves
3e71efcdbb
all code that asks isMoving appears to mean relative to parent
2016-02-10 18:21:44 -08:00
Seth Alves
1ae47b17f0
size-cull parent entities by their queryAABox rather than their dimensions to avoid having the entity-server send a child but not the parent
2016-02-10 16:41:35 -08:00
Seth Alves
49f2724608
don't return void
2016-02-10 13:49:03 -08:00
samcake
51bacdebdd
Trying to notify the entity changes to the render item correctly, need more work
2016-02-10 11:52:37 -08:00
Seth Alves
9d21c3d549
Merge branch 'master' of github.com:highfidelity/hifi into grab-then-equip
2016-02-10 11:35:25 -08:00
Anthony J. Thibault
727e289ecd
SpatiallyNestable: bug fixes for kinematic entities
...
* Kinematic entities were being simulated with position in the local frame but velocity in the global frame.
* Also, because getVelocity() was returning non-zero values when the parent was moving, kinematic objects were being simulated even if they should have been at rest.
* Bug fix for calculating velocity direction was incorrect, if the parent frame was rotated.
2016-02-09 17:58:54 -08:00
Seth Alves
251810edc5
only suppress location edits when they arrive over the network -- script can still update
2016-02-09 15:03:36 -08:00
Seth Alves
43592fd699
Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform
...
Better avatar animation when attached to a moving entity
2016-02-09 14:30:02 -08:00
Anthony J. Thibault
072172b1a2
SpatiallyNestable: now with velocity support!
...
Moved velocity and angularVelocity into the SpatiallyNestable base class.
Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.
MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
2016-02-08 19:43:23 -08:00
Seth Alves
d5f3447fbc
when updating queryAACubes for children, use the lastEdited from the parent's properties
2016-02-08 16:22:41 -08:00
Seth Alves
4f8a7a080f
remove debugging print
2016-02-08 15:33:03 -08:00
Seth Alves
82fcfc1d64
don't apply clock-skew to a lastEdited of 0
2016-02-08 15:31:32 -08:00
Seth Alves
e2098038f1
only setLastEdited on properties to be sent
2016-02-08 15:16:15 -08:00
Seth Alves
92d016f03a
debugging prints for queryAACube
2016-02-08 15:09:34 -08:00
Seth Alves
44ddfb8039
set last-edited when updating a child's queryAACube
2016-02-08 15:08:58 -08:00
Brad Hefta-Gaub
3f0ebf7732
Merge pull request #7031 from AndrewMeadows/simulation-ownership
...
server can clear simulation ownership
2016-02-06 19:19:39 -08:00
Andrew Meadows
2da46ff26a
server-side release ownership
2016-02-04 13:26:07 -08:00
Andrew Meadows
959f924b1d
flag entity as changed when changing simulatorID
2016-02-04 13:26:07 -08:00
Andrew Meadows
381049acb3
clear simulation ownership when owners vanish
2016-02-04 13:26:06 -08:00
Andrew Meadows
05fb866bb5
fix spelling typo in comment
2016-02-04 13:26:06 -08:00
Andrew Meadows
e3351c05a2
make some methods const
2016-02-04 13:26:06 -08:00
Babiuch, Ryan Nicholas
0069849da3
Consider existing velocity in calculating energy costs when editing entities.
2016-02-04 08:55:23 -06:00
Babiuch, Ryan Nicholas
dca7ff967c
Conform to coding standard.
2016-02-04 08:26:56 -06:00
Babiuch, Ryan Nicholas
142ec76600
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-04 08:18:47 -06:00
Andrew Meadows
63df34541d
Merge pull request #6802 from huffman/agent-simulation
...
Fix Agents bidding on simulation ownership
2016-02-03 13:45:12 -08:00
Babiuch, Ryan Nicholas
786400eb53
Merge branch 'WorkingEnergy'
2016-02-03 14:53:28 -06:00
Babiuch, Ryan Nicholas
3d727d76c2
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-03 13:39:13 -06:00
Babiuch, Ryan Nicholas
3cb2f9c4b7
Exposed energy cost multiplier to scripting.
...
- field: costMultiplier
2016-02-03 13:29:42 -06:00
