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
|
67891abf17
|
Merge pull request #7877 from Atlante45/fix/asset-client
Fix Asset Client crash
|
2016-05-18 11:37:34 -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
|
0878d87ac7
|
remove some unnecessary dependencies
|
2016-05-14 14:50:02 -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 |
|