ericrius1
31fe5fa953
Bump version num, use different shader for additive blending effect
2015-11-03 17:15:10 -08:00
ericrius1
470f814776
Fixed glitches with large particles being sorted along wrong axis
2015-11-03 16:39:16 -08:00
ericrius1
60f35ce8c7
discarding pixel if alpha is below threshold
2015-11-03 15:46:58 -08:00
ericrius1
0c8a712935
removed comment
2015-11-03 15:36:11 -08:00
ericrius1
0ed868077d
Added additive blending as option for particle effect
2015-11-03 10:02:51 -08:00
ericrius1
f57f3c1138
Disabled writing to depth buffer for particles and no longer sorting the,
2015-11-02 15:25:42 -08:00
Seth Alves
3ac0fef1ea
merge from upstream
2015-11-01 15:22:57 -08:00
Brad Davis
036ae62dd3
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-29 14:00:52 -07:00
Andrew Meadows
0c5b4115ed
Merge pull request #6221 from huffman/physics-substep-fix
...
Physics substep fix
2015-10-29 12:39:15 -07:00
Brad Hefta-Gaub
1f53e425eb
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-29 12:28:28 -07:00
samcake
e4aab4bd97
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2015-10-28 15:32:13 -07:00
Brad Davis
3c1a0930da
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
Brad Davis
5cbb2562cd
Move GL utilities out to their own library
2015-10-27 15:53:42 -07:00
Ryan Huffman
913026280c
Fix EntityTreeRenderer dropping contact end events
2015-10-26 13:02:39 -07:00
samcake
ff57b73bd6
Creating the COlorUTils in shared to deal with all the standard color conversions
2015-10-26 10:53:21 -07:00
samcake
bc7ad9d3f7
Move the keyLIght properties in their own group and add the ambientURL in
2015-10-26 09:27:06 -07:00
Seth Alves
61269c3ce8
fix up entity constructors so that setProperties isn't called during the constructor
2015-10-23 13:52:50 -07:00
Seth Alves
d86d69aeba
keep track of children. use local position and orientation on the wire.
2015-10-22 15:36:03 -07:00
Brad Davis
21a3079a39
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-21 10:05:32 -07:00
Brad Hefta-Gaub
954afe45d3
Merge pull request #6112 from ericrius1/rayPickAdditions
...
Moved whitelist and raypicking code out of octree, fixed small bug with polylines
2015-10-21 09:08:56 -07:00
Brad Davis
0e419e3fbb
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-20 17:47:37 -07:00
Stephen Birarda
14aab4871d
Merge pull request #6119 from Atlante45/baseball
...
Fix autoresizing log spam
2015-10-20 13:45:50 -07:00
Brad Davis
bea6fdd890
Working on JSON parsing and cleanup
...
Conflicts:
libraries/controllers/src/controllers/Route.cpp
libraries/controllers/src/controllers/ScriptingInterface.cpp
libraries/controllers/src/controllers/StandardController.cpp
libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
2015-10-20 10:20:28 -07:00
Brad Davis
8d0148a1ca
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-20 10:13:31 -07:00
ericrius1
0373a481f8
Using EntityItemIDs instead of QUuids
2015-10-20 09:22:16 -07:00
Atlante45
1c46f2aa75
Fix autoresizing log spam
2015-10-19 18:22:44 -07:00
Seth Alves
113321184d
if model RegistrationPoint doesn't match entityItem's, update it
2015-10-19 12:21:26 -07:00
Seth Alves
742e48b0c8
try another way of fixing held object snagging at slow velocity
2015-10-19 09:48:34 -07:00
Seth Alves
1f3b92577d
update _model's location anytime it doesn't match the entity's location
2015-10-17 20:08:25 -07:00
Brad Davis
57be59935d
Move controller test to app
2015-10-17 19:13:38 -07:00
Brad Davis
5bac1aae2d
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-16 17:23:30 -07:00
Seth Alves
8338491c3b
Merge pull request #6095 from Atlante45/master
...
Fix export bug
2015-10-16 07:32:56 -07:00
Seth Alves
b18bb1e076
Merge pull request #6084 from AndrewMeadows/physics-cleanup
...
move DIRTY_FLAGS out of EntityItem namespace
2015-10-16 07:22:40 -07:00
Atlante45
a84fdecec9
Fix export bug
2015-10-15 18:43:32 -07:00
Ryan Huffman
7682ab00e3
Add ReceivedMessage and receive progress
2015-10-15 14:09:53 -07:00
Andrew Meadows
fa17b77d70
move DIRTY_FLAGS out of EntityItem namespace
2015-10-15 09:34:09 -07:00
Brad Davis
0063f9ae1d
Merging old and new controller interfaces
2015-10-14 15:16:54 -07:00
ericrius1
8d39f9c760
Syntax fixes
2015-10-12 15:02:03 -07:00
Brad Hefta-Gaub
f8956a853b
Merge pull request #6051 from jherico/marge
...
Cleanup CMake files
2015-10-11 16:22:56 -07:00
Brad Davis
6f5f6450df
Cleanup CMake files
2015-10-11 00:01:03 -07:00
Brad Davis
e5fc2e5525
Low level support for URL overrides when loading content
2015-10-10 23:00:15 -07:00
Atlante45
ae83dfe041
Move auto-resize to update
2015-10-09 12:23:19 -07:00
Atlante45
75f0a6442f
ModelEntities spawned with no dimension autoresize
2015-10-09 12:23:19 -07:00
Brad Hefta-Gaub
57cc7adbfe
standardize somethingChanged - CR feedback
2015-10-07 12:27:12 -07:00
Brad Hefta-Gaub
016bf4011d
cleanup
2015-10-06 16:07:36 -07:00
Brad Hefta-Gaub
be79101a93
Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings
2015-10-06 15:20:37 -07:00
Brad Hefta-Gaub
d5663ed773
Merge pull request #5946 from jherico/nelson
...
Improved procedural surfaces, textures and additional standard uniforms
2015-10-05 17:12:32 -07:00
Stephen Birarda
5989cad054
add override qualifier to suppress warnings in entities-renderer
2015-10-05 15:55:05 -07:00
Brad Hefta-Gaub
f30a94064f
make animation start/stop work
2015-10-05 15:50:55 -07:00
Howard Stearns
8153ad7f44
Merge pull request #5967 from AndrewMeadows/collision-group-hack
...
allow physical objects to be set collisionless
2015-10-02 16:08:52 -07:00
Brad Davis
de5e95f7dc
Improved procedural surfaces, textures and more standard uniforms
2015-10-02 11:57:13 -07:00
Anthony J. Thibault
fa864d29f9
Merge branch 'master' into transmit-joint-translation
2015-10-01 16:55:24 -07:00
Andrew Meadows
22b6607760
add polyvox entities to physics engine
2015-10-01 08:56:05 -07:00
ericrius1
1760720b2b
added check for normals and vertices
2015-09-29 17:42:20 -07:00
ericrius1
d1b016b483
untabbified lines
2015-09-29 16:38:21 -07:00
Eric Levin
36be35a836
Update RenderablePolyLineEntityItem.cpp
2015-09-29 16:30:42 -07:00
ericrius1
e7834365f5
Made polyline painting experience smoother- no more flickering
2015-09-29 15:33:39 -07:00
Seth Alves
d0a1e206ca
Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation
2015-09-29 13:55:13 -07:00
Brad Hefta-Gaub
2040fb4507
fix skybox not always loading when you haven't moved or if the texture is slow in loading
2015-09-29 09:32:34 -07:00
Brad Hefta-Gaub
bd52b17861
Merge pull request #5914 from jherico/homer
...
Remove duplicate DeferredBufferWrite.slh
2015-09-28 17:29:33 -07:00
Brad Davis
e284cbe355
Remove duplicate DeferredBufferWrite.slh
2015-09-28 13:24:47 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Seth Alves
50dd8eba45
Relay joint translations across network. Apply animation's root-joint translation to avatar.
2015-09-26 11:40:39 -07:00
David Rowe
a2c7b3bcc9
Orient particles to face camera but not roll with it
2015-09-23 17:00:07 -07:00
Brad Hefta-Gaub
5b00783f18
more warnings fixes
2015-09-22 20:54:36 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
Bradley Austin Davis
b3aeaba5f4
CR feedback
2015-09-21 15:44:47 -07:00
Bradley Austin Davis
84cea1ffd4
More CR comments
2015-09-21 14:33:32 -07:00
samcake
fa9b0930d2
Bring back the procedural skybox
2015-09-21 14:25:32 -07:00
Bradley Austin Davis
0c0af812c2
CR comments
2015-09-21 14:16:56 -07:00
Bradley Austin Davis
e12e4ece34
Fixing lighting and atmosphere
2015-09-21 13:51:08 -07:00
Bradley Austin Davis
e024d23366
Instancing work, second pass
2015-09-21 13:27:02 -07:00
samcake
d3b1bcb86d
Redistributing the files to create the model-networking lib and separate that from the redner-utils
2015-09-21 13:21:35 -07:00
samcake
c9cb768945
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-19 09:00:19 -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
Sam Gateau
d0f7ddd3a6
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-09-18 00:03:19 -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
Sam Gateau
d45547aa1a
Merge and update
2015-09-16 13:46:07 -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
Sam Gateau
3f2609e52a
merging
2015-09-14 09:59:04 -07:00
Sam Gateau
9074d0d6e1
very first version of the TextureStorage working
2015-09-14 09:29:46 -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
Brad Davis
9289a46112
Guarding against frequent userdata calls with no change.
2015-09-05 12:20:28 -07:00
Brad Davis
e8435b6218
Procedural rendering for box entities
2015-09-05 12:10:45 -07:00
David Rowe
12b8a5a1d5
Add alpha property support to ParticleEffect entities
...
Add at same "level" as color so that it's available for other entity
types to use in the future.
2015-09-05 10:23:27 -07:00
David Rowe
18bc7befee
Merge branch 'master' into 20669
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2015-09-04 13:49:46 -07:00
David Rowe
c910da7179
Add radiusStart and radiusFinish entity particle properties
2015-09-04 12:27:18 -07:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Seth Alves
1b92ae95d7
put glm:: before vec3
2015-09-04 09:41:53 -07:00
David Rowe
45ff118249
Add new radiusSpread entity particle property
2015-09-03 14:55:08 -07:00
Seth Alves
07b241c778
code review
2015-09-03 11:05:44 -07:00
Seth Alves
2fe6e9c317
use AABox's ray intersection code rather than the goofed-up version that was here
2015-09-02 16:30:11 -07:00
Seth Alves
16ee5199e8
change how polyvox neighbors are notified of updates
2015-09-02 09:30:32 -07:00
Seth Alves
8608e4f2b0
small bug-fixes
2015-09-01 16:51:55 -07:00
Seth Alves
9256917f15
rebake mesh when a neighbor changes
2015-09-01 16:21:12 -07:00
Seth Alves
264d39aa9b
have knitted polyvoxes keep track of low-axis neighbors as well as high
2015-09-01 14:49:17 -07:00
Stephen Birarda
33f6933544
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-01 14:36:16 -06:00
Seth Alves
930c5cefc9
fix setSphere to create a world-space sphere rather than a voxel-space one
2015-09-01 11:10:21 -07:00
Seth Alves
7369ca19e9
allow setting cuboid voxel spaces. clean up some locking
2015-08-31 18:01:15 -07:00
Seth Alves
54ddcf2841
fix normals in shader
2015-08-31 15:24:30 -07:00
Seth Alves
4d06890d90
lock/unlock less
2015-08-31 15:24:15 -07:00
Seth Alves
376a6bbb21
don't reload textures if the url didn't change
2015-08-31 11:48:08 -07:00
Seth Alves
41a2ff2fff
working on stitching marching-cube polyvoxs together
2015-08-30 18:42:15 -07:00
Seth Alves
64d0ce47f3
attempting to stitch polyvox entites together
2015-08-30 09:59:33 -07:00
Seth Alves
7614cababb
adjust whitespace
2015-08-28 13:21:34 -07:00
