David Rowe
|
2f3fa80b96
|
Add Clipboard.getContentsDimensions() JavaScript method
|
2016-05-26 09:52:22 +12: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 |
|