ZappoMan
bc331af6a0
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-24 08:46:43 -07:00
Brad Hefta-Gaub
aa1883ba85
Merge pull request #9979 from jherico/crash_fix
...
Fix crash in render-perf-test
2017-03-24 08:10:37 -07:00
ZappoMan
246f377a07
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-23 10:40:37 -07:00
Brad Davis
944255a37b
Fix crash in render-perf-test
2017-03-22 22:44:05 -07:00
Brad Davis
85c80f3be8
Merge remote-tracking branch 'upstream/master' into smarter_textures
...
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
2017-03-22 14:25:23 -07:00
Brad Hefta-Gaub
ac309df3d1
Merge pull request #9946 from sethalves/model-scripting-1
...
Model scripting
2017-03-21 09:26:32 -07:00
Brad Davis
e482eac437
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-20 16:22:13 -07:00
Chris Collins
308c134119
Merge pull request #9686 from humbletim/21114-part3
...
CR 21114 -- Implement modules/require support into hifi
2017-03-20 06:22:35 -07:00
Seth Alves
b876d22e46
fix handling of normals. don't crash when extracting a mesh from a polyvox with no 'on' voxels
2017-03-18 22:36:24 -07:00
Seth Alves
35c38b8130
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1
2017-03-18 10:18:27 -07:00
samcake
e1a0984fed
Merge pull request #9906 from samcake/red
...
Expose rendering in wireframe mode
2017-03-17 17:09:44 -07:00
Seth Alves
b3603ce8b3
Entities.voxelsToMesh, Model.transformMesh, Model.appendMeshes, Model.meshToOBJ appear to work now
2017-03-17 16:52:56 -07:00
Brad Hefta-Gaub
a75acd139b
Merge pull request #9885 from sethalves/model-scripting
...
Model scripting
2017-03-17 13:13:17 -07:00
Seth Alves
16c3eb62b1
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-1
2017-03-17 08:54:32 -07:00
Seth Alves
200550aba9
ModelScriptingInterface::appendMeshes
2017-03-16 15:22:34 -07:00
humbletim
87d62ad1eb
Merge branch 'master' into 21114-part3
2017-03-16 16:39:37 -04:00
humbletim
758c07c7d4
Merge branch 'master' into 21114-part3
2017-03-16 14:29:17 -04:00
samcake
0399249a03
Expeand the wireframe to the primitive entities and the polyvox
2017-03-15 16:58:31 -07:00
Stephen Birarda
0c657a1d55
add parameter to unload to remove entityID from map
2017-03-15 10:57:12 -07:00
Seth Alves
40b87171a9
quiet warnings
2017-03-14 17:49:39 -07:00
Seth Alves
e8a9ff867d
merge from upstream
2017-03-13 17:57:01 -07:00
Brad Davis
3bef5ad528
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-13 14:30:25 -07:00
Brad Davis
e94f803b84
Merge remote-tracking branch 'upstream/master' into HEAD
2017-03-08 09:03:21 -08:00
Brad Hefta-Gaub
8ae6f2727d
add support for double click messages to overlays and entities
2017-03-07 17:52:55 -08:00
Seth Alves
71c2b4215d
Merge pull request #9811 from ZappoMan/triangleSet
...
Cleanup how Models do ray-picking and determination of point inside of convex hull
2017-03-07 14:12:56 -08:00
humbletim
40ba8185a0
* Update per 21114-part2 changes.
...
* Add explicit thread safety guards.
* Add Entities.queryPropertyMetdata for unit testing Entity script module support.
* Cleanup / commenting pass.
2017-03-07 16:36:07 -05:00
Ryan Huffman
a744e0d11c
Merge pull request #9685 from humbletim/21114-part2
...
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
2017-03-07 13:25:25 -08:00
ZappoMan
2a663cbcb1
cleanup
2017-03-05 19:28:15 -08:00
ZappoMan
87bcced409
cleanup use of triangleSet for picking
2017-03-05 19:23:55 -08:00
Bradley Austin Davis
efad7da508
Merge remote-tracking branch 'upstream/master' into HEAD
2017-03-03 08:59:24 -08:00
ZappoMan
9e71801ae1
remove properties from RayToEntityIntersectionResult
2017-03-01 18:21:04 -08:00
Stephen Birarda
b586926d09
Merge pull request #9755 from birarda/master
...
increase max renderable web entity FPS to 30 for Youtube.com
2017-03-01 18:09:16 -08:00
Bradley Austin Davis
fa5b315e09
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-01 15:16:18 -08:00
Stephen Birarda
8562a294fa
cleanup some extra spacing
2017-02-28 13:24:41 -08:00
Seth Alves
6b230bad14
oops
2017-02-27 20:56:25 -08:00
Stephen Birarda
80af749b69
change max FPS for youtube on URL change
2017-02-27 11:09:17 -08:00
Stephen Birarda
d18936ea18
only force youtube web entities to 30 FPS
2017-02-27 09:44:34 -08:00
Stephen Birarda
2ceb3d85bd
increase max renderable web entity FPS to 30
2017-02-27 09:33:49 -08:00
Seth Alves
88c850afa2
voxel-paint paints with capsules rather than spheres
2017-02-26 12:56:17 -08:00
Seth Alves
542cb7ab85
optimize RenderablePolyVoxEntityItem::compressVolumeDataAndSendEditPacket
2017-02-26 09:03:34 -08:00
Seth Alves
6227db9fc0
optimize RenderablePolyVoxEntityItem::setSphere
2017-02-26 08:30:29 -08:00
Seth Alves
422b0bb952
don't set _dirtyFlags if polyvox is collisionless
2017-02-25 21:14:13 -08:00
Seth Alves
7a31a99e3c
back out previous experiment
2017-02-25 21:13:20 -08:00
Seth Alves
1e81edbaea
make a copy of volData before computing the visual mesh
2017-02-25 15:32:08 -08:00
Seth Alves
0e4b0332dd
avoid a rare crash
2017-02-25 11:35:27 -08:00
Seth Alves
76c873ce81
don't compute polyvox shapes if they are collisionless
2017-02-25 11:34:48 -08:00
Bradley Austin Davis
7fb7aa87eb
Working on new texture management strategy
2017-02-17 07:53:16 -08:00
humbletim
b15956278c
separate out supporting changes into 21114-part2 branch
2017-02-16 07:40:19 -05:00
Ryan Huffman
d0cddd01d7
Fix entity scripts not loading in certain cases
...
This fixes a bug where an entity script would be loaded but immediately
unloaded. This happens when the script property of the entity is changed shortly
after it is added.
Flow of events:
Entity added
=> Entity added event emitted
Entity edited
=> Script changing event emitted
<= Entity added event received
Script loaded
<= Script changing event received
Script stopped
Tries to load script again, but because the script hasn't changed
since it was last loaded, it is not loaded again.
The change here is to modify the behavior when receiving a script
changing event. Instead of always unloading and then conditionally
loading the script, it will either do both (unload + load) or neither.
2017-02-13 14:59:31 -08:00
Seth Alves
24510ee3fe
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-02-01 18:42:56 -08:00
