Brad Hefta-Gaub
b597f3e098
Merge pull request #9267 from AndrewMeadows/report-all-collision-events
...
fix for missed START collision events
2017-01-31 08:54:58 -08:00
Brad Hefta-Gaub
459b2da6c3
Merge pull request #9558 from zfox23/FILTERS_FixFilters1
...
ENTITY FILTERS: Improve zone filter; maxVelocity filter; documentation
2017-01-31 08:52:49 -08:00
Brad Hefta-Gaub
6b97db66d5
Merge pull request #9458 from zzmp/audio/threaded-local
...
local audio bypass
2017-01-31 08:49:49 -08:00
Brad Hefta-Gaub
5287c94786
Merge pull request #9555 from huffman/fix/entity-is-child-of-crash
...
Fix Entities.isChildOfParent crashing if given unknown ID
2017-01-31 08:42:45 -08:00
Brad Hefta-Gaub
619bcdeed8
Merge pull request #9553 from huffman/fix/polyvox-import
...
Fix importing of PolyVox entities
2017-01-31 08:42:28 -08:00
David Kelly
8f924e338e
Merge pull request #9564 from davidkelly/dk/2708
...
Require password verification in domain-server settings
2017-01-31 08:35:36 -07:00
Brad Hefta-Gaub
87805fe4eb
Merge pull request #9559 from Atlante45/fix/animation-jitter
...
Fix animation jitter
2017-01-30 20:27:21 -08:00
Clément Brisset
3d3e03ec8d
Merge pull request #9562 from highfidelity/AlanZimmerman-patch-1-1
...
Fix label typo in help graphic
2017-01-30 17:20:40 -08:00
Alan Z
6e7260207f
Fix label typo in help graphic
...
fixes #2748 in Fogbugz
2017-01-30 16:51:22 -08:00
David Kelly
eaf033107c
Require password verification in domain-server settings
...
If you modify the security settings to use a username/password for
access to the domain server settings, we now have a second password
field which must match the first one you entered.
2017-01-30 17:13:13 -07:00
Zach Fox
18fd965c33
Add note about floats?
2017-01-30 16:07:43 -08:00
Atlante45
c65e884151
Don't set joint "set" flags for animation values
2017-01-30 16:04:54 -08:00
Zach Fox
740a0add8a
Updates
2017-01-30 15:47:04 -08:00
Ryan Huffman
e58c9326a0
Fix Entities.isChildOfParent crashing if given unknown ID
...
If an entity was not in the local tree a null deref crash would occur.
This commit makes sure the entity pointer is checked for null before it is used.
2017-01-30 13:48:33 -08:00
Ryan Huffman
f553656e36
Fix importing of PolyVox entities
...
PolyVox entities reference neighboring PolyVox entities in their entity
properties so that they can be stitched together. When importing, a new ID is
generated for each entity. When importing PolyVox entities, the
neighboring entity IDs were not updated to reflect the newly generated
IDs. This commit fixes that.
2017-01-30 13:33:42 -08:00
Andrew Meadows
6ef4420f37
remove commented out cruft
2017-01-30 13:21:23 -08:00
Andrew Meadows
31861d3192
use inverted collision for B-A event
2017-01-30 13:21:23 -08:00
Andrew Meadows
aa8e7d27db
move depth filtering closer to source
2017-01-30 13:21:23 -08:00
Andrew Meadows
b5537304a3
more correct CONTINUE collision event filter
2017-01-30 13:21:23 -08:00
Andrew Meadows
2541bfb1a8
only create collision events for owned entities
2017-01-30 13:21:23 -08:00
Andrew Meadows
0809149a8c
harvest collision events before disowning
2017-01-30 13:21:23 -08:00
Andrew Meadows
2162a364a9
minor cleanup
2017-01-30 13:21:23 -08:00
Andrew Meadows
8cf7aee009
fix bug: second collision event with bad data
2017-01-30 13:21:23 -08:00
Andrew Meadows
b7cd8827f9
collision events for owned objects only
...
also: fewer entityID lookups for scripted collision sounds and events
2017-01-30 13:21:23 -08:00
Andrew Meadows
ed17c4fa16
fix an old typo about when to send collision event
2017-01-30 13:19:38 -08:00
Andrew Meadows
54b4612ee3
fix for missed START collision events
2017-01-30 13:18:26 -08:00
Zach Fox
725cfa8045
Fix it!
2017-01-30 13:00:52 -08:00
Howard Stearns
89cc6ac315
Merge pull request #9548 from howard-stearns/non-blocking-entity-filter-init
...
fetch entity filter script asynchronously (but reject edits while waiting)
2017-01-30 12:46:23 -08:00
howard-stearns
93414d802d
fetch entity filter script asynchronously (but reject edits while waiting)
2017-01-30 11:06:36 -08:00
Ken Cooke
ae8d0d1948
Merge pull request #9527 from thoys/fix-ac-playback-audio
...
Fix AC recording playback audio encoding
2017-01-28 17:43:28 -08:00
Zach Fox
04ad35aeb1
Merge pull request #9542 from zfox23/PAL_NameCount
...
PAL: Display avatar count in table header
2017-01-28 09:00:53 -08:00
Zach Fox
5cba928540
Do it!
2017-01-27 16:30:59 -08:00
Howard Stearns
6f36015ff6
Merge pull request #9541 from howard-stearns/entity-filter-startup-logging
...
add debug logging to entity server startup in the case of having a filter
2017-01-27 16:10:22 -08:00
howard-stearns
673ac5680f
add debug logging to entity server startup in the case of having a filter
2017-01-27 15:40:17 -08:00
Thijs Wenker
a2da1e3dc1
Merge branch 'master' into fix-ac-playback-audio
2017-01-27 21:00:57 +01:00
Zach Pomerantz
38af24ad4a
Merge branch 'master' of github.com:highfidelity/hifi into audio/threaded-local
2017-01-27 14:57:27 -05:00
samcake
45dd09e941
Merge pull request #9531 from jherico/temp_disable_sparse
...
Disable sparse textures
2017-01-27 11:38:15 -08:00
Brad Hefta-Gaub
898c9b176d
Merge pull request #9533 from zzmp/fix/sleep_until
...
Fix audio-mixer timing for WIN32
2017-01-27 11:35:02 -08:00
Zach Pomerantz
d82c8b251a
use sleep_for to avoid WIN32 sleep_until bug
2017-01-27 13:22:50 -05:00
Bradley Austin Davis
8d45f43ba8
Disable sparse textures
2017-01-27 10:06:31 -08:00
Chris Collins
5ed376afc9
Merge pull request #9257 from ZappoMan/tuneAvatarInfo
...
avatar mixer bandwidth optimization
2017-01-26 17:33:57 -08:00
Thijs Wenker
cdc0f3ddd2
- make AC recording audio play with right encoding
...
- spelling fix
2017-01-27 01:19:11 +01:00
Zach Pomerantz
1c5228cb6d
fix AudioRingBuffer::appendData
2017-01-26 19:16:02 -05:00
Howard Stearns
866f9debcd
Merge pull request #9526 from highfidelity/edit-entity-filter
...
Edit entity filter (from branch)
2017-01-26 16:00:48 -08:00
Zach Pomerantz
3d526a1024
Merge branch 'master' of github.com:highfidelity/hifi into audio/threaded-local
2017-01-26 18:56:58 -05:00
ZappoMan
af426063ac
fix bad merge
2017-01-26 15:19:25 -08:00
Howard Stearns
d1a137cd18
Merge pull request #9518 from howard-stearns/entity-filter-resource
...
Entity filters by URL
2017-01-26 15:06:57 -08:00
ZappoMan
4c80422a73
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 14:34:58 -08:00
Chris Collins
c0ee091946
Merge pull request #9502 from zzmp/audio/throttle
...
Throttle audio with PI controller, by node
2017-01-26 14:25:44 -08:00
howard-stearns
f9f0a4ea2d
fix startup-failure case
2017-01-26 14:05:16 -08:00
