Seth Alves
|
6f6343420c
|
don't crash if entity dimensions somehow include a zero
|
2017-03-28 10:56:33 -07:00 |
|
Seth Alves
|
7641677902
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
|
2017-03-28 10:14:49 -07:00 |
|
Seth Alves
|
8da91695df
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
|
2017-03-27 20:15:54 -07:00 |
|
Andrew Meadows
|
18544581e6
|
remove warnings about implicit float cast
|
2017-03-27 14:40:31 -07:00 |
|
Brad Hefta-Gaub
|
3bdcfd8b78
|
Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick
remove properties from RayToEntityIntersectionResult
|
2017-03-27 14:26:51 -07:00 |
|
Seth Alves
|
5ed0ff729b
|
cleanups
|
2017-03-27 07:25:40 -07:00 |
|
Seth Alves
|
2682586c38
|
some clean-ups and a bug fix in PolyVox to mesh code
|
2017-03-27 06:50:06 -07:00 |
|
Seth Alves
|
c21b8b4eac
|
raise max mesh count for static collision entities from 500 to 1000
|
2017-03-26 08:48:08 -07:00 |
|
Seth Alves
|
59da607d07
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
|
2017-03-24 15:08:23 -07:00 |
|
Seth Alves
|
0d2e0eb9c3
|
Merge pull request #9994 from sethalves/avoid-deadlock-on-10k-mesh-fbx
Avoid deadlock on 10k mesh fbx
|
2017-03-24 12:34:37 -08:00 |
|
Seth Alves
|
8f7f5efade
|
new javascript call: Model.newMesh()
|
2017-03-24 12:51:00 -07:00 |
|
Seth Alves
|
aaa78d108b
|
if a model has too many meshes, give up.
|
2017-03-24 11:17:24 -07:00 |
|
Clément Brisset
|
5ff7dbb254
|
Merge pull request #9991 from Atlante45/fix/entity-bad-url
Show entity bounding box for bad URLs
|
2017-03-24 10:56:06 -07:00 |
|
ZappoMan
|
ddd0645453
|
fix merge issue
|
2017-03-24 09:59:11 -07:00 |
|
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 |
|
Atlante45
|
4f8d9b190b
|
Show green box when model entity has bad url
|
2017-03-23 17:56:33 -07:00 |
|
ZappoMan
|
246f377a07
|
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
|
2017-03-23 10:40:37 -07:00 |
|
Seth Alves
|
ba0c9e405a
|
cleanup
|
2017-03-23 10:38:57 -07:00 |
|
Seth Alves
|
f5680def55
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
|
2017-03-23 09:55:41 -07:00 |
|
Seth Alves
|
93992bb427
|
Merge branch 'model-scripting-2' of github.com:sethalves/hifi into model-scripting-2
|
2017-03-23 09:55:35 -07:00 |
|
Seth Alves
|
ce9bb439b3
|
change Model api in anticipation of more than just PolyVox being able to give meshes to javascript
|
2017-03-23 09:55:30 -07:00 |
|
Brad Davis
|
944255a37b
|
Fix crash in render-perf-test
|
2017-03-22 22:44:05 -07:00 |
|
Seth Alves
|
df875ab504
|
make RenderablePolyVoxEntityItem::setSphere affect any voxel the sphere touches rather than just the ones whose center the sphere touches
|
2017-03-22 16:21:45 -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 |
|
Seth Alves
|
67507f1f05
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
|
2017-03-20 09:37:53 -07:00 |
|
Seth Alves
|
98cae8d152
|
added EntityScriptingInterface::getEntityLocalTransform. try harder to make sure polyvox mesh is ready before giving it to javascript
|
2017-03-20 09:37:46 -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 |
|