Seth Alves
6fe35ac0da
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
2016-12-12 16:04:41 -08:00
David Rowe
c87149cfc2
Tidying
2016-12-10 12:59:01 +13:00
Seth Alves
6c99b5e9ca
code review
2016-12-09 06:50:10 -08:00
Seth Alves
369f61e172
bring over some previous tablet-ui work
2016-12-08 16:54:39 -08:00
Faye Li Si Fi
9289dd36d4
Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property
2016-12-08 10:50:00 -08:00
Faye Li Si Fi
1fde68c86e
better code style
2016-12-07 16:10:03 -08:00
Faye Li Si Fi
b6798adb5c
yay
2016-12-07 15:40:37 -08:00
Faye Li Si Fi
0556661d13
getting rid of uneccessary flag, fix formatting, and getting it to work yay
2016-12-07 15:40:21 -08:00
Faye Li Si Fi
0fcb8803b6
attempt to expose last edited property to script
2016-12-07 12:27:31 -08:00
Brad Davis
5cbf7588ac
Fixes for building on MSVC 2015 / Qt 5.8
2016-12-02 14:58:09 -08:00
Seth Alves
d2b32c3084
Merge pull request #9057 from druiz17/childParent
...
fixed children of parent object not being added back when performing an undo
2016-12-01 16:59:06 -08:00
Dante Ruiz
348c0c95e5
conforming to coding standard and better variable naming
2016-12-01 22:22:17 +00:00
Chris Collins
942850293e
Merge pull request #9105 from druiz17/teleportBug
...
Fix for unable to teleport to areas that you should
2016-12-01 11:35:06 -08:00
Dante Ruiz
0c9cd5803a
added descendant checking
2016-12-01 10:54:26 -08:00
Dante Ruiz
c52f893273
isChildOfParent
2016-12-01 10:54:26 -08:00
Dante Ruiz
1b20cc8bd0
more clean up
2016-11-30 18:28:50 +00:00
Dante Ruiz
104cbbff7e
clean up
2016-11-30 18:26:06 +00:00
Dante Ruiz
34d24b947e
better implementation
2016-11-30 18:03:11 +00:00
Dante Ruiz
daf12047ca
removed unnessary comments
2016-11-22 18:55:20 +00:00
Dante Ruiz
2dfb745443
made some chnages
2016-11-22 18:53:03 +00:00
samcake
dfc0b7beac
adressed reveiw comments
2016-11-22 10:15:49 -08:00
Dante Ruiz
a176c624ab
fixed teleport bug
2016-11-21 23:04:07 +00:00
Dante Ruiz
1ba769b0ef
teleportBug
2016-11-21 10:38:20 -08:00
samcake
9031e65aa5
Merge and fix the bug!!!
2016-11-16 19:12:56 -08:00
Dante Ruiz
66ff81f450
Another function name change
2016-11-16 22:32:15 +00:00
Dante Ruiz
9c4ae9df5a
function name change
2016-11-16 22:09:22 +00:00
Dante Ruiz
ff7c11d48c
Fixed avatar parent delete issue
2016-11-16 13:03:34 -08:00
samcake
982664dac5
Merging with upstream
2016-11-15 18:14:25 -08:00
Brad Hefta-Gaub
84573d373b
Merge pull request #9070 from huffman/fix/docs
...
Add jsdoc to Camera
2016-11-15 13:46:16 -08:00
Ryan Huffman
5fd1ae64b0
Begin adding entities jsdoc
2016-11-14 16:54:55 -08:00
samcake
a05e42138c
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-14 09:58:12 -08:00
Seth Alves
15c247fc5e
quiet warnings
2016-11-11 06:37:22 -08:00
Seth Alves
899dec8b10
Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by
2016-11-11 06:11:49 -08:00
samcake
00addcad9e
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-10 17:57:34 -08:00
Seth Alves
850361f222
lastEditedBy property for entities
2016-11-10 15:26:28 -08:00
Chris Collins
5b91c8f32b
Merge pull request #8984 from sethalves/fix-setLocalJointRotation-name
...
fix names of model-entity joint setters
2016-11-10 13:39:14 -08:00
samcake
784a0540ed
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-10 10:05:03 -08:00
Brad Hefta-Gaub
8758e4a9ba
add support for whitelist entity scripts
2016-11-09 19:17:24 -08:00
Seth Alves
51f6b5af78
code review
2016-11-05 10:35:21 -07:00
Seth Alves
339d6a55cf
getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation
2016-11-03 10:06:07 -07:00
samcake
6926cd274c
Merge with upstream
2016-11-02 18:15:08 -07:00
Seth Alves
844cc03dcb
fix names of model-entity joint setters
2016-11-02 10:24:01 -07:00
Seth Alves
9b7086b1fb
added EntityItemProperties.merge function. when sending edits for avatar-entities, don't call setProperties on the entity. Fix currentFrame bug in AnimationPropertyGroup::copyToScriptValue
2016-10-17 16:11:37 -07:00
Seth Alves
fe09a1a57c
make sure interface accepts server adjustment to lifetime, even for imported entities
2016-10-13 16:45:37 -07:00
Seth Alves
01c1cb328f
don't change UNKNOWN_CREATED_TIME to 1 during addition of LAST_EDITED_SERVERSIDE_BUMP
2016-10-13 15:05:13 -07:00
samcake
8a44140e6b
cleaning up the comments from review and trying something to adress the issue that showed up on i5
2016-10-07 16:04:19 -07:00
samcake
92d71a2e37
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-10-07 10:13:24 -07:00
Ryan Downe Karpf
ed2571704f
Merge pull request #8735 from huffman/feat/teleport-improvements
...
Update teleport.js to ignore invisible or collisionless objects and disallow teleporting to certain surfaces
2016-10-07 09:56:30 -07:00
samcake
56eb322b7d
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-10-06 15:14:31 -07:00
Chris Collins
583332d502
Merge pull request #8734 from huffman/feat/allow-editing-unknown-entities
...
Update entity scripting interface to allow modifications to unknown e…
2016-10-06 09:51:35 -07:00
samcake
6f7f949343
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-10-06 09:35:48 -07:00
Clément Brisset
d18394f249
Merge pull request #8596 from huffman/feat/my-avatar-self-id
...
Add ability to parent overlays to MyAvatar for use across servers
2016-10-05 12:03:01 -07:00
Ryan Huffman
16d535c495
Move EntityTree RayArgs back to header
2016-10-04 20:20:48 -07:00
Ryan Huffman
ee50469213
Add collidableOnly arg to findRayIntersection
2016-10-04 20:19:54 -07:00
Ryan Huffman
da6afb605b
Fix default findRayIntersection surfaceNormal to be in world space
2016-10-04 20:19:54 -07:00
Ryan Huffman
b0c7e91737
Disable ray picking against invisible objects in far grab and teleport
2016-10-04 20:19:51 -07:00
Ryan Huffman
17c63eb722
Add the ability to ignore invisible entities in findRayIntersection
2016-10-04 20:19:32 -07:00
samcake
81e0266e7e
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-09-28 09:34:29 -07:00
Seth Alves
90adb5f67e
fix an AC script's ability to delete entities
2016-09-26 17:14:45 -07:00
samcake
11c6bb7d80
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-09-13 17:44:42 -07:00
Ryan Huffman
5e8c8f84b5
Handle edge cases of AVATAR_SELF_ID being used with entities
2016-09-13 16:34:05 -07:00
David Rowe
fe8b3b4d0d
Merge branch 'master' into 21040
2016-09-13 09:12:47 +12:00
samcake
3bcea4310d
Fixing the vizualisation shader for world to cluster space
2016-09-10 10:41:18 -07:00
samcake
108910052a
Adding the reverse transformation
2016-09-09 19:00:54 -07:00
David Rowe
68499f49ad
Fix count of textures
2016-09-10 10:15:13 +12:00
Brad Davis
ecfe56085d
GLM update and GLI integration
2016-09-09 10:18:15 -07:00
David Rowe
38c2efa22f
Implement Entities.findInFrustum() method
2016-09-09 18:57:48 +12:00
David Rowe
28cfca993f
Add and wire up "search in view" JavaScript API stub
2016-09-08 14:58:48 +12:00
Anthony J. Thibault
dc0d0c2d5c
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-07 09:49:55 -07:00
sam
248f172832
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-09-06 23:37:16 -07:00
David Rowe
f83599f855
Merge branch 'master' into 21040
2016-09-07 10:08:51 +12:00
David Rowe
17d30796cc
Use count of textures actually rendered
...
Textures specified in model may be invalid and so not actually rendered.
2016-09-03 13:07:00 +12:00
Seth Alves
b8b1127d55
merge from upstream
2016-09-02 15:11:21 -07:00
Anthony J. Thibault
0128d7c61b
Merge branch 'master' into feature/tablet-ui-foundation
2016-09-02 12:16:25 -07:00
samcake
7b68f1439f
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-09-02 09:28:35 -07:00
Anthony J. Thibault
21bf931559
eventBridge for web entities.
2016-09-01 16:32:06 -07:00
Brad Hefta-Gaub
e1845e2c3f
add support for renderInfo properties to model entities
2016-08-31 15:00:21 -07:00
samcake
b563e280e4
Commuting the LIghtEntityItem changes correctly to the LightRenderItem
2016-08-31 13:55:41 -07:00
samcake
3755a3fc32
Add batch timing information vs gpu
2016-08-29 17:54:17 -07:00
Seth Alves
3fb10d0eea
action for arrow flight, etc
2016-08-28 19:08:13 -07:00
Andrew Meadows
19cd4648ad
scale collision render mesh correctly
2016-08-24 22:26:56 -07:00
Andrew Meadows
acaa77b75a
remove cruft from debug efforts
2016-08-24 22:26:56 -07:00
Andrew Meadows
b0a0293e6e
move compoundResource out of Model class
2016-08-24 22:26:56 -07:00
Andrew Meadows
3b772d2fe6
fallback to SIMPLE_COMPOUND when can't do COMPOUND
2016-08-24 22:26:56 -07:00
Andrew Meadows
b2dfa49a6f
stubbery for alerting entity that shape changed
2016-08-24 22:25:45 -07:00
Anthony J. Thibault
31ed378dbf
Added dpi entity property for web-entities
2016-08-23 10:10:26 -07:00
Anthony J. Thibault
6704ae9ad4
Added dpi parameter to userData (this is temporary)
2016-08-23 10:09:17 -07:00
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
Seth Alves
9bcda1bb45
merge from upstream
2016-08-20 15:25:04 -07:00
Anthony J. Thibault
8bb6bb7c6f
generalized keyboard focus interface
...
Removed dynamic casts to RenderableWebEntityItem, instead
virtual methods were added to EntityItem to facilitate this.
* bool wantsKeyboardFocus()
* void setProxyWindow()
* QObject* getEventHandler()
2016-08-19 10:56:52 -07:00
James B. Pollack
98f0290565
Merge pull request #8436 from huffman/feat/more-user-activity-data
...
Add more user activity data
2016-08-19 10:48:28 -07:00
Brad Hefta-Gaub
1cec7b2db0
Merge pull request #8429 from SamGondelman/loadingFade2
...
Don't do fade effect once physics kick in
2016-08-18 12:46:24 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
Ryan Huffman
d46af500c1
Fix wrong property name in entity activity tracking
2016-08-17 17:00:56 -07:00
Ryan Huffman
25b9d756ca
Update entity edit tracking to track count rather than bool
2016-08-17 16:54:04 -07:00
Anthony J. Thibault
7b248b440a
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-17 13:55:12 -07:00
Anthony J. Thibault
d4e1f53581
Fix for inconsistent override warning in WebEntityItem.h
2016-08-16 17:48:28 -07:00
Anthony J. Thibault
7de8cc6422
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-16 16:49:57 -07:00
Seth Alves
7bc1235c54
local velocity and angular velocity in scripts is now handled the way local position and rotation are
2016-08-16 16:47:13 -07:00
Anthony J. Thibault
36d87ddd7c
Added EntityItem::wantsHandControllerPointerEvents method
2016-08-16 16:23:45 -07:00
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
