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
|
9cdd85af05
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
|
2017-03-26 09:33:39 -07:00 |
|
Seth Alves
|
e5326d146e
|
Merge pull request #10003 from hyperlogic/feature/my-avatar-jsdoc
Added jsdoc documentation for some of MyAvatar properties and methods
|
2017-03-26 07:55:41 -08:00 |
|
Seth Alves
|
90db9af2f9
|
Merge pull request #9978 from Triplelexx/fix-tablet-users-typo
fix myVisibility typo
|
2017-03-26 07:36:11 -08:00 |
|
Seth Alves
|
7455dcc2db
|
Merge pull request #9985 from jherico/cmake_threads
Force thread linkage
|
2017-03-26 07:27:07 -08:00 |
|
Seth Alves
|
66f8e4063d
|
Merge pull request #9984 from Atlante45/fix/warnings
Fix warnings
|
2017-03-26 07:03:33 -08:00 |
|
Seth Alves
|
5e8c1eab78
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
|
2017-03-25 19:03:39 -07:00 |
|
samcake
|
8b1a0be754
|
Merge pull request #9997 from jherico/ktx_cache_fix
Correctly initialize a file cache with the proper key
|
2017-03-25 09:58:32 -07:00 |
|
Anthony J. Thibault
|
f7de74109b
|
Added jsdoc documentation for some of MyAvatar properties and methods
|
2017-03-24 15:10:26 -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
|
6e40f03c8e
|
cleanups
|
2017-03-24 15:08:13 -07:00 |
|
Brad Davis
|
82d502ae9f
|
Correctly initialize a file cache with the proper key
|
2017-03-24 13:35:37 -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 |
|
Brad Hefta-Gaub
|
9b26e8ee95
|
Merge pull request #9871 from Triplelexx/21208
21208 - Muted microphone indicator
|
2017-03-24 13:07:43 -07:00 |
|
Seth Alves
|
8f7f5efade
|
new javascript call: Model.newMesh()
|
2017-03-24 12:51:00 -07:00 |
|
Seth Alves
|
642cf57976
|
obj-writer now outputs normals
|
2017-03-24 12:49:58 -07:00 |
|
Ryan Huffman
|
bb09dd9414
|
Merge pull request #9988 from huffman/fix/touch-detection-after-launch
Fix Oculus Touch + Remote not being detected after initial launch
|
2017-03-24 11:37:57 -07:00 |
|
Lexx
|
fa606446a7
|
remove cache buster
|
2017-03-24 18:27:38 +00:00 |
|
Seth Alves
|
aaa78d108b
|
if a model has too many meshes, give up.
|
2017-03-24 11:17:24 -07:00 |
|
Seth Alves
|
e1e51614d9
|
don't hang loop if entity isDead
|
2017-03-24 11:16:54 -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 |
|
Brad Hefta-Gaub
|
1972b140b9
|
Merge pull request #9976 from mittens/21215
Worklist #21215 - Removing Duplicate Status Icons for Submeshes
|
2017-03-24 08:52:12 -07:00 |
|
Brad Hefta-Gaub
|
9a38b36f59
|
Merge pull request #9970 from Triplelexx/21223
21223 - Quat functions have naming inconsistencies
|
2017-03-24 08:12:11 -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 |
|
Ryan Huffman
|
56c5f06365
|
Fix Oculus Touch + Remote not being detected after initial launch
|
2017-03-23 16:29:08 -07:00 |
|
Brad Hefta-Gaub
|
20bc32fc89
|
Merge pull request #9980 from birarda/bug/ac-agent-audio
make sure the AC agent has an AudioScriptingInterface
|
2017-03-23 15:13:24 -07:00 |
|
Brad Davis
|
5a5eb6e168
|
Still trying to fix build error
|
2017-03-23 14:09:34 -07:00 |
|
Brad Davis
|
8116de7c14
|
Force thread linkage
|
2017-03-23 13:45:13 -07:00 |
|
Zach Fox
|
a231b57472
|
Merge pull request #9962 from birarda/cmake-with-space
Fix failing POST_BUILD steps on Windows with spaces in build path
|
2017-03-23 11:41:38 -07:00 |
|
Atlante45
|
d4353e1d19
|
Fix warnings
|
2017-03-23 11:39:42 -07:00 |
|
Seth Alves
|
bb1c556c91
|
forgot a file
|
2017-03-23 11:04:50 -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 |
|
samcake
|
73227f6598
|
Merge pull request #9958 from highfidelity/smarter_textures
New texture streaming system
|
2017-03-23 09:44:31 -07:00 |
|
Stephen Birarda
|
b53cb5934b
|
make sure the AC agent has an AudioScriptingInterface
|
2017-03-22 23:35:29 -07:00 |
|
Brad Davis
|
944255a37b
|
Fix crash in render-perf-test
|
2017-03-22 22:44:05 -07:00 |
|
Brad Davis
|
3a40fd886f
|
Fix comparison between GL stamps and GPU stamps
|
2017-03-22 18:11:20 -07:00 |
|
Brad Davis
|
4868a1618a
|
Add initialization to sampler stamp
|
2017-03-22 18:10:54 -07:00 |
|
Brad Davis
|
893fcba283
|
Return the correct format and internal format combo for depth textures
|
2017-03-22 17:14:40 -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 |
|
Triplelexx
|
6a17e328e8
|
fix myVisibility typo
|
2017-03-22 22:13:39 +00:00 |
|
Brad Davis
|
9a3686fc1a
|
Fixing merge conflict
|
2017-03-22 14:55:11 -07:00 |
|
Triplelexx
|
09cbace975
|
remove unused getBodyForwardDirection
|
2017-03-22 21:54:21 +00: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 |
|
Andrew Meadows
|
a463013d90
|
Merge pull request #9960 from samcake/blue
Fix Ambient Lighting equation
|
2017-03-22 14:13:31 -07:00 |
|
Chris Collins
|
05c40d2930
|
Merge pull request #9933 from mittens/hotfix/obj-texture-fix
Fixed the texture assignment for the OBJ loader
|
2017-03-22 13:19:01 -07:00 |
|