MiladNazeri
ea26512793
Merge pull request #13147 from ctrlaltdavid/21872-a
...
Fix JSDoc function definitions specifying properties instead of params
2018-05-11 16:20:06 -07:00
John Conklin II
4129664368
Merge pull request #13145 from highfidelity/stable
...
Merge RC67 stable into master
2018-05-10 17:07:20 -07:00
David Rowe
fab85c3f6d
Fix JSDoc function definitions specifying properties instead of params
2018-05-11 09:52:48 +12:00
Seth Alves
7466d08f1f
more suppression of logging
2018-05-09 13:01:49 -07:00
Seth Alves
db03265a6b
when in serverless mode, short-circuit simulation ownership bids
2018-05-09 10:53:46 -07:00
Clement
5a3773ba72
Fix compile error on linux/windows
2018-05-04 18:18:46 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
Clement
b04c5bd0db
CR
2018-05-04 14:43:16 -07:00
Clement
d774dc2060
WIP Only use conical frustums on the server
2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av
...
Add support for multifrustum avatar queries
2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam
...
Add support for multifrustum entity queries
2018-05-03 18:13:51 -07:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d
...
List which contexts each namespace and class is available in
2018-05-03 01:29:14 -07:00
Ken Cooke
a4105f1081
Merge pull request #13052 from kitely/fix-gcc-warnings
...
Eliminated warnings in gcc
2018-05-02 06:43:32 -07:00
Oren Hurvitz
26ffb3213c
Changed "[[gnu::fallthrough]]" to "// FALLTHRU"
2018-05-02 07:06:47 +01:00
Clement
538f24162f
Define ViewFrustums type alias
2018-05-01 18:03:21 -07:00
Clement
d47ddbd6e4
CR
2018-05-01 18:02:29 -07:00
Atlante45
7a710093ac
Fix build error
2018-05-01 18:02:29 -07:00
Clement
3862a02cee
DRY traversal scan callbacks
2018-05-01 18:02:29 -07:00
Clement
49fad3d868
EntityServer traversal aware of all ViewFrustums
2018-05-01 18:02:29 -07:00
David Rowe
1aa28b7f54
Merge remote-tracking branch 'upstream/master' into 21856-d
...
# Conflicts:
# interface/src/LODManager.h
2018-05-02 07:50:55 +12:00
Oren Hurvitz
a226790295
Eliminated warnings in gcc
...
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
2018-04-30 15:05:27 +03:00
David Rowe
2cc3ed6287
List which contexts each namespace and object is available in
2018-04-28 20:00:28 +12:00
David Rowe
8d71d72258
Fix JSDoc for Entities.findEntitiesByName
2018-04-28 13:16:26 +12:00
Zach Fox
c163ae63b8
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
2018-04-27 10:28:59 -07:00
Zach Fox
0f36fb113d
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
2018-04-27 10:20:55 -07:00
David Rowe
08dc9b133f
Docs to JSDoc review
2018-04-26 21:10:28 +12:00
John Conklin II
cb7b03652b
Merge pull request #12796 from MiladNazeri/feature/add-findByName
...
added Entities.findbyName
2018-04-25 14:00:10 -07:00
Atlante45
d82333534c
Ensure the tree lock is always taken before the simulation lock
2018-04-24 13:46:05 -07:00
Sam Gateau
2cae294ab4
Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate
...
LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it
2018-04-24 11:22:48 -07:00
Sam Gateau
d3fccc4104
Merge pull request #12881 from SamGondelman/scaleAssert
...
Minimum entity dimension (1mm)
2018-04-23 13:40:53 -07:00
Andrew Meadows
577f9a03e6
fix bug: animation reset on 'hold'
2018-04-23 12:08:40 -07:00
Andrew Meadows
748af5a65f
worry about multi-threads when updating animation props
2018-04-23 12:08:40 -07:00
Andrew Meadows
8e51d66092
fix bug: animation should reset on start running
2018-04-23 12:08:40 -07:00
Andrew Meadows
b48e9495a5
rollback change to MaterialEntityItem, we'll fix later
2018-04-23 12:08:40 -07:00
Andrew Meadows
75508385cf
more correct needsToCallUpdate() implementations
2018-04-23 12:08:40 -07:00
Seth Alves
9e1bd69af3
Merge pull request #12918 from kitely/fix-addentity-failure
...
Fixed null pointer exception if importing an entity from JSON fails
2018-04-21 18:12:48 -07:00
David Rowe
7087abd201
Merge branch 'master' into 21815
2018-04-21 10:49:56 +12:00
MiladNazeri
7e780ed55a
Merge pull request #12915 from ctrlaltdavid/21849
...
Add Entities materialData JSDoc
2018-04-19 13:49:24 -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
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
