samcake
adfc935fdb
Merge with master
2018-04-24 13:04:16 -07:00
samcake
33bbbcef83
Merging with master
2018-04-24 11:49:34 -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
samcake
f686ef1f25
Exposing more uniforms to ui for refining the controller
2018-04-23 18:02:09 -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
Sam Gateau
99a0e42b5d
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-22 20:26:49 -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
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
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
