Bradley Austin Davis
e024d23366
Instancing work, second pass
2015-09-21 13:27:02 -07:00
Brad Hefta-Gaub
ec87502f49
Merge pull request #5840 from jherico/bart
...
Instanced rendering for Box entities
2015-09-18 18:06:25 -07:00
Brad Davis
8a703d0363
Instanced rendering, first pass
2015-09-18 16:29:29 -07:00
Andrew Meadows
269e3d7f23
Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance
...
Entities.getEntityProperty() performance improvements
2015-09-18 15:19:06 -07:00
Brad Davis
2f0ba40347
Merge pull request #5844 from ZappoMan/cruftRemovalMachine
...
Cruft removal machine
2015-09-18 14:59:16 -07:00
Brad Hefta-Gaub
020fb25ace
CR feedback
2015-09-18 14:24:01 -07:00
Brad Hefta-Gaub
0d37511071
add support for scripts to call methods on entity scripts
2015-09-18 14:06:38 -07:00
Brad Hefta-Gaub
416acb1d4a
remove call to _entities.render() in displaySide()
2015-09-18 12:03:58 -07:00
Brad Hefta-Gaub
6edc817bf2
move the best zone logic out of EntityTreeRenderer::render()
2015-09-18 11:35:50 -07:00
Brad Hefta-Gaub
4a34b142d1
remove render element proxies
2015-09-17 22:05:14 -07:00
Brad Hefta-Gaub
d0a4622427
removed some debug code
2015-09-17 21:01:56 -07:00
Brad Hefta-Gaub
4e2cb00ec3
first cut at only returning type specific properties in getEntityProperties
2015-09-17 17:33:53 -07:00
Brad Hefta-Gaub
6fac447b97
Merge branch 'master' of https://github.com/highfidelity/hifi into getEntityPropertiesPerformance
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities-renderer/src/EntityTreeRenderer.h
libraries/script-engine/src/ScriptCache.cpp
libraries/script-engine/src/ScriptCache.h
2015-09-16 17:16:57 -07:00
Brad Hefta-Gaub
2021a15527
fix white space
2015-09-16 16:54:21 -07:00
Brad Hefta-Gaub
fa6396bbfa
fix white space
2015-09-16 16:53:20 -07:00
Brad Hefta-Gaub
7840f122dc
add reload all support for entity scripts
2015-09-16 16:46:46 -07:00
Brad Hefta-Gaub
248107c468
add reload all support for entity scripts
2015-09-16 16:45:26 -07:00
Brad Hefta-Gaub
e1cb041576
first cut at adding desiredProperties to getProperties
2015-09-16 15:00:42 -07:00
Brad Hefta-Gaub
70d2288407
CR feedback
2015-09-15 08:04:26 -07:00
Brad Hefta-Gaub
54a45f3173
Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029
more work on script engine
2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub
a3c0288eae
more work on proper threading of ScriptEngine
2015-09-14 20:26:04 -07:00
Brad Hefta-Gaub
18fbf896f1
first cut at moving entity scripts into ScriptEngine
2015-09-14 15:13:43 -07:00
Brad Hefta-Gaub
f85cb2c888
first cut at cleaning up ScriptEngine class
2015-09-11 19:12:09 -07:00
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Brad Davis
e458eb7ae9
Merge pull request #5734 from sethalves/octree-shared-pointers
...
octree uses shared pointers
2015-09-11 16:00:04 -07:00
Brad Hefta-Gaub
5c6d8da97b
Revert "Make sure all entity script callbacks happen on the Entities script engine thread"
2015-09-11 11:55:36 -07:00
Brad Davis
244795b629
Merge branch 'homer' into temp
...
Conflicts:
interface/src/Application.cpp
2015-09-11 11:21:29 -07:00
Brad Hefta-Gaub
20a733b9f5
prevent sending signals in the entities script engine
2015-09-11 10:06:06 -07:00
Brad Hefta-Gaub
b9d5412aad
prevent sending signals in the entities script engine
2015-09-11 09:48:42 -07:00
Brad Davis
b7ffb96adf
Working on thread safety for the entity tree
2015-09-10 22:28:50 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Brad Hefta-Gaub
92a5a999c6
quiet some debug
2015-09-10 19:52:44 -07:00
Brad Hefta-Gaub
ee30fe4a56
quiet some debug
2015-09-10 19:48:41 -07:00
Brad Hefta-Gaub
8eacdbf1c4
first cut at making sure entity scripts are called on the entities script engine thread
2015-09-10 13:02:02 -07:00
Seth Alves
9c4fdfd653
merge from upstream
2015-09-08 18:01:07 -07:00
Seth Alves
8a60bba4eb
Merge branch 'master' of github.com:highfidelity/hifi into octree-shared-pointers
2015-09-08 15:28:46 -07:00
Stephen Birarda
a3959109f1
resolve conflicts on merge with upstream/master
2015-09-08 15:18:39 -07:00
Brad Hefta-Gaub
152a86b0e9
Merge pull request #5735 from hyperlogic/tony/no-particle-fix
...
Fix for RenderableParticleffectEntityItem assert.
2015-09-08 15:13:38 -07:00
Brad Hefta-Gaub
8185a8da7f
Merge pull request #5732 from jherico/selma
...
Procedural skyboxes
2015-09-08 15:12:59 -07:00
Stephen Birarda
e1c395f5ea
resolve conflicts on merge with upstream/master
2015-09-08 14:56:23 -07:00
Brad Davis
5f1affaff9
Procedural skybox work
2015-09-08 14:31:16 -07:00
David Rowe
2325cb8ee0
Merge branch 'master' into 20669
2015-09-08 13:26:20 -07:00
Anthony J. Thibault
c728cd4c4c
Fix for RenderableParticleffectEntityItem assert.
...
When a particle system had no living particles, PendingChanges::updateItem
would assert, due to the access to _vertices[0]. In release this might be
harmless as this memory is never accessed, but different implementations of
std::vector might do different things here. So, let's be safe and early
return when the number of particles is 0.
2015-09-08 12:03:41 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Stephen Birarda
9878143661
repairs to ShaderCache for Resource changes
2015-09-08 08:58:35 -07:00
Stephen Birarda
25aeda2e18
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-08 08:40:51 -07:00
Brad Davis
743d79335d
Procedural shaders V2
2015-09-07 17:37:45 -07:00
David Rowe
cb9468c311
Add colorSpread entity particle property
2015-09-07 16:27:42 -07:00
Brad Davis
c4b1e6ecd3
Reducing debug spam
2015-09-05 12:22:25 -07:00
