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
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
Stephen Birarda
f213b32167
clear the entity viewer before restarting ESS script engine
2017-02-26 09:38:51 -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
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
kunalgosar
a4e0d970bf
Fix security section of domain server
2017-02-24 19:03:30 -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
David Rowe
a205d2a00c
Use animation for pointing index finger instead of setting joint angles
2017-02-25 11:36:06 +13: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
Howard Stearns
a9b8045697
Merge pull request #9720 from howard-stearns/filter-pal-by-view-distance
...
Filter pal by view distance
2017-02-24 11:10:13 -08:00
Brad Hefta-Gaub
60fd4afc4d
don't count NoData avatars as having been broadcast, fix avatars slightly out of view from freezing
2017-02-23 18:52:10 -08:00
Chris Collins
e723385df2
Merge pull request #9726 from ZappoMan/avatarBandwidthBudgetImprovements
...
Avatar bandwidth budget improvements
2017-02-23 17:12:18 -08:00
Brad Hefta-Gaub
1b7ec7d61e
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
...
Conflicts:
libraries/avatars/src/AvatarData.cpp
2017-02-23 13:50:16 -08:00
Brad Hefta-Gaub
1e91f74ce7
clean up some uneedded nullptr checks, make them asserts
2017-02-23 13:32:35 -08:00
Andrew Meadows
ed932fead5
Merge pull request #9611 from kunalgosar/AvatarEntityMapMetaObj
...
Add QMetaObject for AvatarEntityMap
2017-02-23 13:27:55 -08:00
Brad Hefta-Gaub
8cb8d686ec
more cleanup and some CR feedback fixes
2017-02-23 13:09:39 -08:00
Chris Collins
57beeeefb9
Merge pull request #9739 from sethalves/stable-to-master-update
...
Stable -> Master update
2017-02-23 13:09:00 -08:00
Seth Alves
c765c8da73
pull stable into master
2017-02-23 11:57:32 -08:00
Anthony J. Thibault
84b29c6872
Reload all scripts when Debug defaultScripts.js is changed.
2017-02-23 11:02:25 -08:00
Brad Hefta-Gaub
f61e16fccf
more aggressive out of view data culling
2017-02-23 11:01:55 -08:00
kunalgosar
3af05ece7d
Made QScript Object more JS friendly
2017-02-23 10:57:06 -08:00
kunalgosar
99e51e88ae
Add QMetaObject for AvatarEntityMap
2017-02-23 10:57:06 -08:00
Brad Hefta-Gaub
dde9640c66
remove old full rate distance code
2017-02-23 10:29:17 -08:00
Anthony J. Thibault
83b3c12559
Removed Window.alert() because it was blocking the defaultScripts thread.
2017-02-23 10:28:16 -08:00
Anthony J. Thibault
1429a32928
Prevent use after free of ScriptEngine pointer when shutting down all scripts.
...
Before this change, if you were running with the Debug defaultScripts.js option on,
it could result in a dereference of a previously freed ScriptEngine pointer.
To prevent this, defaultScripts.js no longer explicitly calls ScriptDiscoveryService.stopScript() on
Script.scriptEnding.
2017-02-23 10:28:15 -08:00
Chris Collins
de84e07281
Merge pull request #9714 from thoys/fix-recorder-js-playback
...
Fix recorder.js playback in interface
2017-02-23 09:59:37 -08:00
Thijs Wenker
5033e7be11
CR fixes
2017-02-23 18:22:36 +01:00
Howard Stearns
cddba43837
Merge branch 'master' into filter-pal-by-view-distance
2017-02-23 08:25:16 -08:00
Brad Hefta-Gaub
4f17498daf
fix warning
2017-02-23 00:19:06 -08:00
Brad Hefta-Gaub
d4adee8b38
add over bandwidth exit to sorted avatar loop
2017-02-23 00:15:07 -08:00
Brad Hefta-Gaub
40037bee55
added some stats for the random drops
2017-02-22 23:28:40 -08:00
Brad Hefta-Gaub
06f0087459
wire up radius properly
2017-02-22 22:36:37 -08:00
Brad Hefta-Gaub
edf7c016a1
more cleanup
2017-02-22 22:06:28 -08:00
Brad Hefta-Gaub
4c4506b1f7
some cleanup
2017-02-22 21:47:40 -08:00
Chris Collins
b295a146e0
Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight
...
More consistent highlights/toggle for toolbar buttons
2017-02-22 18:07:38 -08:00
Brad Hefta-Gaub
10f465f8ea
Merge pull request #8 from AndrewMeadows/avatarBandwidthBudgetImprovements
...
count avatar joint updates and non-updates
2017-02-22 17:53:15 -08:00
Andrew Meadows
6ac33dbf61
count avatar joint updates and non-updates
2017-02-22 17:23:36 -08:00
Anthony Thibault
44136e550c
Merge pull request #9729 from sethalves/tablet-ui-no-haptics-for-tablet
...
don't do a haptic pulse when av's hand goes near grabbable tablet
2017-02-22 15:55:01 -08:00
Chris Collins
94517057d6
Merge pull request #9721 from hyperlogic/bug-fix/tablet-ui-tablet-placement
...
More consistent tablet angle when first creating the tablet.
2017-02-22 15:00:17 -08:00
Seth Alves
aed1d69377
don't do a haptic pulse when av's hand goes near grabbable tablet
2017-02-22 14:14:10 -08:00
howard-stearns
de3a0d3d0c
button styling
2017-02-22 13:02:05 -08:00
howard-stearns
023a32563c
work around .qml settings issues
2017-02-22 12:59:40 -08:00
Brad Hefta-Gaub
7cc32f555e
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
2017-02-22 12:03:52 -08:00
Chris Collins
c967f9383a
Merge pull request #9706 from ZappoMan/avatarMixerLoopImprovements
...
Multi-core Avatar Mixer
2017-02-22 11:20:28 -08:00
Brad Hefta-Gaub
618f37eb06
fix crash in recording playback when clip loader fails
2017-02-22 11:14:22 -08:00
Anthony J. Thibault
71b569a697
Bug-fix for crash on tablet when going from web -> home.
2017-02-22 10:22:12 -08:00
Brad Hefta-Gaub
05995163cf
add support for tuning sorting
2017-02-22 09:49:47 -08:00
Brad Hefta-Gaub
01fd0860bf
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
...
Conflicts:
interface/src/avatar/AvatarManager.cpp
2017-02-22 08:47:03 -08:00
