David Rowe
7087abd201
Merge branch 'master' into 21815
2018-04-21 10:49:56 +12:00
samcake
0f4aa7e27e
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-20 09:31:36 -07:00
MiladNazeri
7e780ed55a
Merge pull request #12915 from ctrlaltdavid/21849
...
Add Entities materialData JSDoc
2018-04-19 13:49:24 -07:00
samcake
a6bd589f4f
Merging upstream
2018-04-19 12:20:10 -07:00
John Conklin II
cad4d45941
Merge pull request #12871 from Atlante45/fix/dead-octree-code
...
Remove dead Octree code
2018-04-19 09:58:20 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
John Conklin II
db99d12736
Merge pull request #12919 from kitely/fix-import-entities-distance
...
Fixed crash when importing entities from JSON multiple times
2018-04-18 11:52:46 -07:00
Clement
2e8a6e1961
Remove more dead octree code
2018-04-17 18:21:51 -07:00
samcake
d6b6645630
exposing feedback of timing
2018-04-17 18:03:45 -07:00
Stephen Birarda
95c172f418
Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66
2018-04-17 15:34:46 -07:00
Zach Fox
3b8e52ea41
Merge pull request #12862 from zfox23/discovery_April2018
...
Discovery: April 2018 (Huge PR; see description)
2018-04-17 15:11:50 -07:00
SamGondelman
527d71c379
CR
2018-04-17 10:58:54 -07:00
Oren Hurvitz
3ae65bba15
Fixed crash when importing entities from JSON multiple times
...
This happened because the Clipboard wasn't being completely cleared between uses.
This bug can also manifest in another way (if Interface doesn't crash): the imported entities appear very far away, instead of right in front of the user. This happens for the same reason as the crash: the Clipboard still contains some previously-imported entities. That causes us to calculate the wrong dimensions for the newly-imported entities which is why they are added to the domain far away.
2018-04-17 15:51:41 +03:00
Oren Hurvitz
91e27db9b0
When importing entities from JSON: fixed a null pointer exception if addEntity() failed on any of the entities
2018-04-17 12:32:28 +03:00
David Rowe
f36a5289c9
Add Entities materialData JSDoc
2018-04-17 14:33:11 +12:00
milad
988dca437d
added case-sensitive search
2018-04-16 18:30:00 -07:00
David Rowe
c1ede6ef58
Merge branch 'master' into 21815
...
# Conflicts:
# tools/jsdoc/plugins/hifi.js
2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9
Controller API JSDoc
2018-04-17 11:46:40 +12:00
samcake
b32be91bb1
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-16 13:22:58 -07:00
John Conklin II
5705bac87f
Merge pull request #12723 from ctrlaltdavid/21801
...
HMD API JSDoc
2018-04-16 11:12:26 -07:00
Zach Fox
071bf35683
Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018
2018-04-16 10:11:44 -07:00
samcake
5d34329873
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-16 09:21:26 -07:00
Seth Alves
7f285c5f90
Merge pull request #12571 from Atlante45/fix/es-concurrent-traversal
...
Fix unprotected tree traversals
2018-04-14 14:33:25 -07:00
SamGondelman
c8afaf27e5
Merge remote-tracking branch 'upstream/master' into scaleAssert
2018-04-13 17:30:03 -07:00
SamGondelman
b71a06a18e
min dim = 1 mm
2018-04-13 15:26:37 -07:00
Seth Alves
0e081a3944
code review
2018-04-13 10:42:22 -07:00
Sam Gateau
79e92a52ea
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-12 23:51:23 -07:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate
...
Migrate materials from userData to materialData
2018-04-12 18:24:33 -07:00
Sam Gateau
27e728ff67
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-12 18:11:18 -07:00
John Conklin II
ec10fcb7b7
Merge pull request #12868 from SamGondelman/missingAlpha
...
Fix for missing alpha on server restart
2018-04-12 16:42:34 -07:00
samcake
bfdde6513f
Mergin with master
2018-04-12 15:45:27 -07:00
John Conklin II
67a8e6c82e
Merge pull request #12824 from SamGondelman/matFix
...
Fix non-client-only material entities applied to avatar by session ID not being removed on domain switch
2018-04-12 15:30:11 -07:00
John Conklin II
40ae2913eb
Merge pull request #12847 from SamGondelman/clientMat
...
Fix client-only materials on non-avatars
2018-04-12 14:53:34 -07:00
SamGondelman
284364683d
Merge remote-tracking branch 'upstream/master' into scaleAssert
2018-04-12 14:46:40 -07:00
SamGondelman
9f3a431c5d
minimum entity dimension
2018-04-12 14:12:52 -07:00
John Conklin II
1834325970
Merge pull request #12788 from sethalves/fix-immediate-last-edited-by
...
set lastEditedBy in local tree whenever a script adds or edits an entity
2018-04-12 13:02:05 -07:00
samcake
e2f9eef5e2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-12 12:27:27 -07:00
John Conklin II
e47dca77ec
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership
...
entity-server will expire stale simulation ownership
2018-04-12 12:04:52 -07:00
Sam Gateau
6a7ae55d9c
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-11 19:08:57 -07:00
John Conklin II
5c26166bd6
Merge pull request #12841 from SamGondelman/simAssert
...
Fix asserts on domain switch
2018-04-11 16:02:45 -07:00
David Rowe
7a9e3388fa
Merge branch 'master' into 21801
2018-04-12 09:48:51 +12:00
SamGondelman
3270409b7b
possible fix for missing alpha on server restart
2018-04-11 14:06:30 -07:00
John Conklin II
88a151481d
Merge pull request #12763 from sethalves/ess-can-edit-localX
...
allow ESS to make relative-to-parent edits when entity is not in ESS's octree
2018-04-11 12:08:35 -07:00
Andrew Meadows
a0f3e3a031
add simulation ownership expiry
2018-04-11 09:40:32 -07:00
Zach Fox
a9b9a1cb10
Commerce: Gifts
2018-04-10 15:54:19 -07:00
Seth Alves
f81836c830
support specification of named landing-points in serverless-domain json files
2018-04-10 14:25:59 -07:00
SamGondelman
bba47ba2b4
materials on client only entities
2018-04-10 11:35:24 -07:00
SamGondelman
8f65813924
fix asserts on domain switch
2018-04-09 17:10:49 -07:00
SamGondelman
9b07880aab
migrate materials from userData to materialData
2018-04-09 12:49:03 -07:00
Sam Gateau
476b75488c
Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate
...
Workload: low hanging fruit optimization: don't unneccessarily update() entities
2018-04-06 17:38:54 -07:00
Andrew Meadows
9c84f05275
rollback change to MaterialEntityItem, we'll fix later
2018-04-06 17:32:57 -07:00
Andrew Meadows
353afb47b3
more correct needsToCallUpdate() implementations
2018-04-06 16:53:08 -07:00
SamGondelman
5503c7909a
fix materials not disappearing on deletion in certain cases
2018-04-06 15:18:21 -07:00
Andrew Meadows
299f2a92e0
merge 'master' into 'workload'
2018-04-05 12:01:19 -07:00
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003
...
cleanup around simulation-ownership
2018-04-05 10:58:45 -07:00
milad
4adc8928f0
added Entities.findbyName
2018-04-05 09:58:54 -07:00
Atlante45
895023ca4b
Fix unprotected tree traversals
2018-04-04 14:54:21 -07:00
Seth Alves
2545e67b14
set lastEditedBy in local tree whenever a script adds or edits an entity
2018-04-04 12:27:41 -07:00
Simon Walton
692ccfc09b
Create HIFI_FCDEBUG(_ID) variants that require a category
...
Original macros use default settings.
2018-04-04 09:49:15 -07:00
Seth Alves
db82c464eb
Merge pull request #12741 from ctrlaltdavid/21816
...
Remove Entities.currentAvatarEnergy and related from the API
2018-04-04 08:07:46 -07:00
Andrew Meadows
d57cb0b5d7
use list.empty() instead of comparing list.size()
2018-04-03 22:15:57 -07:00
Andrew Meadows
6d7574cab9
use std::numeric_limtis<uint64_t>::max() instead of -1
2018-04-03 22:13:25 -07:00
Andrew Meadows
70d6aa99e8
more 'const uint64_t&' purges
2018-04-03 21:55:31 -07:00
samcake
fa35d659dc
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
2018-04-03 17:56:41 -07:00
Simon Walton
7d16ca9c1c
Remove uses of addRepeatedMessageRegex() and its implementation
...
Change to new log-message ID scheme.
2018-04-03 17:54:01 -07:00
Seth Alves
71d6dbf9bf
allow ESS to edit local version of properties even if the entity isn't in the ESS's local octree
2018-04-02 15:52:28 -07:00
samcake
59a081bcdb
merge with upstream
2018-03-30 18:08:38 -07:00
Andrew Meadows
5a5376c3d5
untangle 'bidding' from 'owned'
2018-03-30 13:18:32 -07:00
Andrew Meadows
dcf5110caa
clarify hardcoded constant
2018-03-30 13:18:32 -07:00
Andrew Meadows
4e0f307dc0
quint8 --> uint8_t
2018-03-30 13:18:32 -07:00
Andrew Meadows
d6ac294f39
use uint8_t instead of quint8
2018-03-30 13:18:32 -07:00
Andrew Meadows
4501033861
add description of simulation ownership rules
2018-03-30 13:18:32 -07:00
Andrew Meadows
6746e08206
faster EntitySimulation::takeDeadEntities()
2018-03-30 13:18:32 -07:00
Andrew Meadows
e1d2a5e5f3
more cleanup for deleting entities
2018-03-30 13:18:32 -07:00
Andrew Meadows
5854a36ff7
more correct handling of simulated entity
2018-03-30 13:18:32 -07:00
Andrew Meadows
a05c753e03
only process changed entities when simulated
2018-03-30 13:18:32 -07:00
Andrew Meadows
738e1267ab
small optimization in EntitySimulation::changeEntity()
2018-03-30 13:18:32 -07:00
Andrew Meadows
f20c9d3c5b
EntitySimulation::removeEntityInternal isn't pure virtual
2018-03-30 13:18:32 -07:00
Andrew Meadows
5649748b17
make EntitySimulation::changeEntityInternal() pure virtual
2018-03-30 13:18:32 -07:00
Andrew Meadows
bd434e3f18
make EntitySimulation::addEntityInternal() pure virtual
2018-03-30 13:18:32 -07:00
Andrew Meadows
6837d042ad
move entityCollisionWithEntity to PhysicalEntitySimulation
2018-03-30 13:18:32 -07:00
David Rowe
7027ccb6d8
Remove unused code
2018-03-30 09:35:25 +13:00
David Rowe
3b90078097
Remove Entities.currentAvatarEnergy and related from the API
2018-03-30 08:36:18 +13:00
SamGondelman
afe39aba46
fix octal code char issue
2018-03-29 10:05:08 -07:00
David Rowe
1bcb9738f0
Miscellaneous fixes noticed in passing
2018-03-28 12:26:08 +13:00
David Rowe
b35ee5ce8a
Fix JSDoc links to Vec3 constants
2018-03-28 12:25:49 +13:00
John Conklin II
0bc23456c3
Merge pull request #12682 from ctrlaltdavid/21807
...
JSDoc that an entity's clientOnly property can be set at entity creation
2018-03-22 17:55:45 -07:00
Seth Alves
4033af9b11
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-21 11:11:43 -07:00
David Rowe
541d798a6b
Update code comment
2018-03-20 09:53:57 +13:00
David Rowe
4b52c21d1c
JSDoc that an entity's clientOnly property can be set at entity creation
2018-03-20 09:51:10 +13:00
SamGondelman
8ddf360c79
support relative paths for material images
2018-03-19 09:59:11 -07:00
Seth Alves
98e9f1168a
allow href to be set to a serverless domain
2018-03-16 10:50:03 -07:00
Seth Alves
e3022da787
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 09:34:38 -07:00
Stephen Birarda
0c0ce1d6b8
Merge pull request #12508 from SimonWalton-HiFi/server-script
...
Stop server-script URLs when deleted from entity properties (case 11244)
2018-03-14 14:01:01 -07:00
samcake
f8acca76e2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-13 09:31:50 -07:00
Seth Alves
b39c7eadd2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-13 09:24:18 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709
...
Entities API JSDoc
2018-03-12 14:40:09 -07:00
samcake
9bec8cdd0b
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-12 12:01:00 -07:00
Seth Alves
c781f88239
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-09 15:43:14 -08:00
Seth Alves
58bc42990c
merge from upstream
2018-03-09 12:03:26 -08:00
Andrew Meadows
858b02f29d
more readable code
2018-03-09 08:35:18 -08:00
Andrew Meadows
9fbe7ec194
time-box Picks and solve in round-robin sequence
2018-03-09 08:35:18 -08:00
Andrew Meadows
7a19f48b9c
move rayHitsSphere logic to AABox method
2018-03-09 08:35:18 -08:00
Andrew Meadows
2750f3ee71
remove unused cruft and avoid useless work
2018-03-09 08:35:18 -08:00
Andrew Meadows
6ab85d5800
cleanup and a few small optimizations
2018-03-09 08:35:18 -08:00
Andrew Meadows
81de668c1e
faster per-entity raypick culling
2018-03-09 08:35:18 -08:00
David Rowe
f1ef085b4b
Add canCastShadows and castShadows properties
2018-03-09 15:34:56 +13:00
David Rowe
b461a422c6
Merge branch 'master' into 21709
2018-03-09 14:18:42 +13:00
samcake
a0db5c6135
Merge with master
2018-03-08 15:35:58 -08:00
David Rowe
d4487e92b8
Further JSDoc tweaks
2018-03-08 12:23:13 +13:00
David Rowe
e2bf84224a
Add further examples.
2018-03-08 10:59:12 +13:00
Dante Ruiz
8382d842e1
changing to resources path
2018-03-07 12:51:26 -08:00
David Rowe
dba0c1046e
Fix typo
2018-03-08 08:17:26 +13:00
David Rowe
a62b6b7150
Merge branch 'master' into 21709
2018-03-07 17:34:53 +13:00
David Rowe
eeb7f5ca8d
Doc review
2018-03-07 17:29:39 +13:00
Seth Alves
bdd926f89e
cleanups
2018-03-02 10:38:35 -08:00
Seth Alves
45157a16f2
merge from upstream
2018-03-02 09:57:27 -08:00
samcake
d4d5f3a7f0
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
2018-03-02 08:50:47 -08:00
NissimHadar
000b08f7c0
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-02 08:07:01 -08:00
Brad Hefta-Gaub
d24cea2f07
Merge pull request #12521 from sethalves/no-prelocked-for-non-lockers
...
if a node can't change locks, don't allow it to create an already-locked entity
2018-03-01 14:56:29 -08:00
NissimHadar
0f2cf8ea85
Re-implemented shadow controls.
2018-03-01 14:24:20 -08:00
David Rowe
5e311a86ee
Document the "Image" pseudo-entity type
2018-03-02 10:20:13 +13:00
Andrew Meadows
1e1d9907a4
also clear _staleProxies when clearing all else
2018-03-01 12:22:42 -08:00
Seth Alves
2d374583b4
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-01 11:07:50 -08:00
Seth Alves
33065fb51c
more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port
2018-03-01 11:07:37 -08:00
Andrew Meadows
67c78a2df1
remember list of stale proxies
2018-03-01 10:21:25 -08:00
Andrew Meadows
f9db9e999e
Merge 'master' into 'workload'
2018-03-01 10:19:06 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update
...
Image entity has correct orientation and is collisionless
2018-03-01 09:57:08 -08:00
David Rowe
f9086e31de
Deprecate Entities.getMeshes() in favor of using the new Graphics API
2018-03-01 10:08:50 +13:00
David Rowe
d82a300f5f
Miscellaneous JSDoc improvements
2018-03-01 09:58:35 +13:00
David Rowe
3275846882
Material entity JSDoc
2018-03-01 09:57:42 +13:00
Andrew Meadows
3ca21dda67
Merge hifi/master of into hifi/workload
2018-02-28 10:28:31 -08:00
Seth Alves
31115b3cb6
make sure rezzer doesn't ignore adjustment
2018-02-27 20:14:00 -08:00
Seth Alves
9d131a6547
if a node can't change locks, don't allow them to create an already-locked entity
2018-02-27 19:53:54 -08:00
David Rowe
1bb8a0fb18
Fix up entity script calling JSDoc
2018-02-28 12:54:49 +13:00
David Rowe
a782b6779a
Merge branch 'master' into 21709
...
# Conflicts:
# interface/src/ui/overlays/Overlays.h
# interface/src/ui/overlays/Shape3DOverlay.cpp
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/EntityScriptingInterface.h
2018-02-28 12:42:05 +13:00
Elisa Lupin-Jimenez
17ddf21028
fixed line length
2018-02-27 15:05:51 -08:00
David Rowe
9c1fa7a8d2
Miscellaneous JSDoc tidying and fixes
2018-02-28 11:44:03 +13:00
Seth Alves
a44ddbbc26
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-27 14:09:05 -08:00
David Rowe
9f6f6a9b0d
Entities scripts JSDoc
2018-02-28 10:31:34 +13:00
John Conklin II
b4000c04bc
Merge pull request #12432 from highfidelity/feat/content-settings
...
Add content archives to domain server web interface
2018-02-27 13:30:53 -08:00
David Rowe
483688a6e1
Web entity EventBridge functions JSDoc
2018-02-28 08:40:36 +13:00
SamGondelman
0fca56eef0
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
...
This reverts commit 3201d2ba21
, reversing
changes made to c0f20900a0
.
2018-02-27 11:33:05 -08:00
Stephen Birarda
9cc348ef27
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-27 09:59:37 -08:00
Simon Walton
051d4c0d35
Merge branch 'master' into server-script
2018-02-27 09:57:58 -08:00
Seth Alves
636c271dc3
merge from upstream
2018-02-27 09:21:08 -08:00
John Conklin II
abe7c29b5e
Merge pull request #12492 from thoys/fix/exportBooleanPropertiesProperly
...
Export boolean entity properties properly
2018-02-27 09:18:46 -08:00
David Rowe
1fb02d15d7
Entities actions JSDoc
2018-02-27 14:12:20 +13:00
Stephen Birarda
aa7bd2066a
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-26 17:02:00 -08:00
Simon Walton
40f0e63af0
Merge branch 'master' into server-script
2018-02-26 16:39:03 -08:00
Dante Ruiz
ced500f23e
Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains
2018-02-26 15:41:51 -08:00
Dante Ruiz
be52b66874
be able to delete entities in serverless domain
2018-02-26 15:41:35 -08:00
Seth Alves
642e7b7c37
Merge pull request #24 from druiz17/serverless-domains
...
Some bug fixes
2018-02-26 15:25:59 -08:00
Dante Ruiz
c83a8e9a25
minimize diff
2018-02-26 14:51:36 -08:00
Dante Ruiz
5031d94c6d
small changes
2018-02-26 14:50:34 -08:00
Elisa Lupin-Jimenez
b56c78d36c
image has correct orientation and is collisionless
2018-02-26 14:44:46 -08:00
Dante Ruiz
a23c425f5e
actions and serverless status fixes
2018-02-26 14:24:51 -08:00
Seth Alves
666fa77be2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-26 13:53:20 -08:00
Seth Alves
eed388e7c9
avoid a crash if entityTree is null
2018-02-26 13:53:14 -08:00
Simon Walton
e81fba22ed
EntityServer should update a previously matched entity.
...
EntityServer currently keeps a per-Node set of entities that matched
the JSON filter. This commit will send an update for an entity that
no longer matches then remove it from the set.
https://highfidelity.fogbugz.com/f/cases/11244/
2018-02-26 13:43:35 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork
...
Shadow control for zones, models and shapes
2018-02-26 10:13:40 -08:00
David Rowe
c2d8c96463
Entities collisions JSDoc
2018-02-26 14:10:33 +13:00
David Rowe
2d9d6035fc
Entities mouse and controller events JSDoc
2018-02-26 10:20:31 +13:00
Seth Alves
f946ce48d6
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-23 16:46:55 -08:00
Sam Gondelman
e10af9b83d
Merge pull request #12462 from SamGondelman/entityDelete
...
Fix EntityItems not getting destroyed
2018-02-23 16:17:52 -08:00
Dante Ruiz
07b0431215
fix merge conflict
2018-02-23 14:00:36 -08:00
Seth Alves
3ee979fc34
don't send entity-edits to a server when in a serverless domain
2018-02-23 12:09:35 -08:00
Thijs Wenker
a27a5a7e1f
export boolean properties properly
2018-02-23 18:16:38 +01:00
Seth Alves
99893d81e2
merge from upstream
2018-02-23 09:14:48 -08:00
David Rowe
895c354257
Entities properties JSDoc fixes
2018-02-23 19:27:40 +13:00
David Rowe
26404a6ce8
Entities functions JSDoc bulk
2018-02-23 19:27:13 +13:00
Atlante45
c106fee659
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
2018-02-22 19:45:43 -08:00
NissimHadar
bb04f3f533
CR corrections.
2018-02-22 13:57:46 -08:00
Seth Alves
f17fa684f5
fix import of zones with skyboxes
2018-02-22 10:27:30 -08:00
Zach Fox
90f05f4db7
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-22 09:23:49 -08:00
SamGondelman
4b1217f1f6
move all entity items to main thread
2018-02-21 15:54:07 -08:00
Nissim Hadar
af484d0af6
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-20 23:48:12 -08:00
Seth Alves
c5d6f0e10f
don't queue up edit packets while connected to a serverless domain
2018-02-20 17:48:14 -08:00
Andrew Meadows
e7495d830b
maintain Space proxies for entities
2018-02-20 17:39:05 -08:00
Andrew Meadows
76d2e9bc78
fix comment
2018-02-20 17:38:01 -08:00
Zach Fox
2daa30f125
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-20 12:41:12 -08:00
Andrew Meadows
7ed68ced62
Merge master into highfidelity/workload
2018-02-20 12:31:37 -08:00
ZappoMan
76d611d563
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-02-19 19:15:33 -08:00
Nissim Hadar
b2a06cdb98
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/ShapeEntityItem.h
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2018-02-19 13:05:57 -08:00
David Rowe
9e37230aa1
Miscellaneous code tidying
2018-02-19 12:21:56 +13:00
David Rowe
67cfe783be
Entity properties JSDoc
2018-02-19 12:17:31 +13:00
Nissim Hadar
81c9e449e6
Models casting shadows (again). (Something stupid happened...)
2018-02-18 10:19:17 -08:00
Nissim Hadar
a69816f885
WIP.
2018-02-17 15:21:57 -08:00
Nissim Hadar
4c1f22f84e
Models and Avatar cast shadows (box doesn't, yet).
2018-02-16 14:01:33 -08:00
Andrew Meadows
6d347cf44f
revert deadlock, remove Space stubbery in EntityTree
2018-02-15 17:40:15 -08:00
SamGondelman
2d0b85af72
workaround bug
2018-02-15 17:28:59 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
Nissim Hadar
72e89851f3
Added READ_ENTITY_PROPERTY_TO_PROPERTIES
2018-02-15 14:16:56 -08:00
Andrew Meadows
f35469c0de
give EntityTree a workload/Space instance
2018-02-15 12:57:58 -08:00
Nissim Hadar
777862f253
can cast shadow flag now works correctly (UI/JS aspects).
2018-02-15 11:50:38 -08:00
Ryan Huffman
2a667fcd60
Cleanup entity -> ds persist
2018-02-15 10:09:21 -08:00
Ryan Huffman
cb9327e030
Add entity file sync and domain content backups
2018-02-15 10:09:20 -08:00
Nissim Hadar
7e99570824
Fixed Ubuntu warnings.
2018-02-15 07:54:55 -08:00
Nissim Hadar
adb02d69f9
WIP -adding canCastShadow flag.
2018-02-14 21:45:56 -08:00
Nissim Hadar
054b2bf3e2
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# scripts/system/html/js/entityProperties.js
2018-02-14 17:10:07 -08:00