Seth Alves
|
1f402f7e4e
|
Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti
|
2017-02-27 06:34:46 -08:00 |
|
sam
|
709c2e4240
|
Fixing the emissive on overlayfor models
|
2017-02-27 02:52:00 -08:00 |
|
Brad Hefta-Gaub
|
795ff9a531
|
Merge pull request #9760 from birarda/bug/ess-crashes
fix a crash in ESS on ES shutdown
|
2017-02-26 22:29:39 -08:00 |
|
Seth Alves
|
ebdb1cd3bd
|
Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti
|
2017-02-26 20:29:36 -08:00 |
|
Andrew Meadows
|
6269284b3d
|
Merge pull request #9758 from kunalgosar/passwordmatchingbug
Fix Password Setting Bug
|
2017-02-26 16:37:16 -08:00 |
|
Andrew Meadows
|
dbd1526d56
|
Merge pull request #9757 from kunalgosar/EntityFocusFix
Fix for Web Entity not leaving Focus
|
2017-02-26 16:35:55 -08:00 |
|
Brad Hefta-Gaub
|
7472efc637
|
don't count NoData avatars as having been broadcast, fix avatars slightly out of view from freezing
|
2017-02-26 14:07:45 -08:00 |
|
Seth Alves
|
88c850afa2
|
voxel-paint paints with capsules rather than spheres
|
2017-02-26 12:56:17 -08:00 |
|
Stephen Birarda
|
f213b32167
|
clear the entity viewer before restarting ESS script engine
|
2017-02-26 09:38:51 -08:00 |
|
Menithal
|
1d8be2aeaa
|
Added missing dynamic
|
2017-02-26 19:17:46 +02:00 |
|
Seth Alves
|
542cb7ab85
|
optimize RenderablePolyVoxEntityItem::compressVolumeDataAndSendEditPacket
|
2017-02-26 09:03:34 -08:00 |
|
Menithal
|
69949cd6b5
|
Finalized Grab-Clone action
|
2017-02-26 18:49:13 +02:00 |
|
Seth Alves
|
6227db9fc0
|
optimize RenderablePolyVoxEntityItem::setSphere
|
2017-02-26 08:30:29 -08:00 |
|
Seth Alves
|
1db7d8b116
|
Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti
|
2017-02-26 06:32:49 -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 |
|
Philip Rosedale
|
4925b3c47c
|
Merge pull request #9756 from ctrlaltdavid/21122
Point index finger and raise thumb if not touching controller
|
2017-02-25 14:59:48 -08:00 |
|
sam
|
7a4ec35b99
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2017-02-25 13:01:09 -08:00 |
|
sam
|
a53d5e8fbd
|
adjusted the PLumber shape keys to coever non material shapes in main pass
|
2017-02-25 13:00:37 -08:00 |
|
Seth Alves
|
e3dbc53643
|
Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti
|
2017-02-25 11:35:40 -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 |
|
Seth Alves
|
0c84ddc503
|
fix indentation
|
2017-02-25 11:33:10 -08:00 |
|
Seth Alves
|
6a7e04f052
|
Merge pull request #9733 from hyperlogic/bug-fix/script-engine-double-destroy
Make Debug defaultScripts.js option less error prone.
|
2017-02-25 08:57:23 -08:00 |
|
Seth Alves
|
36bcaa8d0f
|
delete tablet overlays when switching domains
|
2017-02-25 08:43:06 -08:00 |
|
kunalgosar
|
a4e0d970bf
|
Fix security section of domain server
|
2017-02-24 19:03:30 -08:00 |
|
David Kelly
|
baa7f81d79
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting
|
2017-02-24 18:38:57 -08:00 |
|
samcake
|
9ffdc03dc9
|
setting the shaeKeys for the overly properly because most of them are CustomPipleline
|
2017-02-24 18:25:24 -08:00 |
|
kunalgosar
|
d6c1f1c99a
|
Fixed Wed Entity not leaving Focus
|
2017-02-24 18:18:48 -08:00 |
|
David Rowe
|
0cc499b08b
|
Point index fingers and raise thumbs if not touching controls
|
2017-02-25 14:20:23 +13:00 |
|
samcake
|
1b501487fd
|
simple shader checks
|
2017-02-24 16:03:28 -08:00 |
|
Ryan Huffman
|
e47b1be9cf
|
Update shortbow spawning to use precise picking to find the ground
|
2017-02-24 14:48:22 -08:00 |
|
Ryan Huffman
|
85099513cd
|
Reduce enemy lifetime to 30s
|
2017-02-24 14:48:01 -08:00 |
|
David Rowe
|
a205d2a00c
|
Use animation for pointing index finger instead of setting joint angles
|
2017-02-25 11:36:06 +13:00 |
|
samcake
|
9e23670b83
|
Merge pull request #9752 from jherico/smarter_textures
Add pending texture transfer size to tracked stats
|
2017-02-24 14:04:59 -08:00 |
|
Seth Alves
|
1287beb3a2
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
|
2017-02-24 13:58:03 -08:00 |
|
Chris Collins
|
8e91fc3dde
|
Merge pull request #9748 from ZappoMan/avatarBandwidthBudgetImprovements
fix avatars slightly out of view in large audience from freezing
|
2017-02-24 13:57:56 -08:00 |
|
Seth Alves
|
34755dd75d
|
notify children of an overlay when the parent overlay moves
|
2017-02-24 13:57:49 -08:00 |
|
Seth Alves
|
b2a35f45db
|
when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3
|
2017-02-24 13:04:43 -08:00 |
|
Seth Alves
|
6e9854cad0
|
don't crash if geometry fails to load
|
2017-02-24 13:01:01 -08:00 |
|
Brad Davis
|
cd8bba47cf
|
Add pending texture transfer size to tracked stats
|
2017-02-24 12:39:38 -08:00 |
|
Seth Alves
|
eedc5c1647
|
don't allow tablet to get stuck to a hand when passing it back and forth between hands
|
2017-02-24 12:10:52 -08:00 |
|
samcake
|
3c21f340e7
|
Merge pull request #9751 from jherico/smarter_textures
Ensure complete population of allocated mip levels
|
2017-02-24 12:10:25 -08:00 |
|
Brad Davis
|
3d2e6713ee
|
Ensure complete population of allocated mip levels
|
2017-02-24 12:04:17 -08:00 |
|
David Kelly
|
d6f0d8c960
|
styling changes, first pass
|
2017-02-24 11:45:03 -08:00 |
|
Seth Alves
|
71ab6a1a84
|
fix a couple of problems related to grabbing tablet while edit.js is active
Conflicts:
scripts/system/controllers/handControllerGrab.js
|
2017-02-24 11:38:42 -08:00 |
|
Seth Alves
|
70060eb464
|
in 2d mode, clicks on tablet don't get used for other things
Conflicts:
scripts/system/libraries/entitySelectionTool.js
|
2017-02-24 11:37:04 -08:00 |
|
Seth Alves
|
73774a6590
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
|
2017-02-24 11:34:59 -08:00 |
|
David Rowe
|
a98824f483
|
Code review
|
2017-02-25 08:13:15 +13:00 |
|