Seth Alves
7c5b0ec46e
Merge branch 'master' of github.com:highfidelity/hifi into equip-via-parenting
2016-02-01 09:52:30 -08:00
Seth Alves
753fc44c12
Merge pull request #6996 from thoys/hydra-scaling-fix
...
Fix for controller palm movement for scaled avatars
2016-02-01 09:17:22 -08:00
Seth Alves
9a4431560f
Merge branch 'master' of github.com:highfidelity/hifi into equip-via-parenting
2016-02-01 09:14:53 -08:00
Seth Alves
b553c8400d
Merge pull request #6988 from huffman/market-import-fail
...
Fix marketplace imports failing silently if edit.js not running
2016-02-01 07:06:34 -08:00
Seth Alves
fb33131ac5
Merge pull request #6985 from imgntn/entitySpawnerAC
...
Show how to use an AC to spawn / respawn entities
2016-02-01 07:05:07 -08:00
Seth Alves
6927f9f503
Merge pull request #6984 from huffman/fix-edit-import-cancel
...
Fix 'Import Entities' causing error when cancelling
2016-02-01 07:04:36 -08:00
Seth Alves
f5ccf19f41
Merge pull request #6982 from howard-stearns/update-away-for-image-overlay
...
Update away.js to use an image instead of text.
2016-02-01 07:04:11 -08:00
Seth Alves
bc86298097
merge from upstream
2016-02-01 07:01:12 -08:00
Thijs Wenker
8f6e7018bd
Fix for Hydra scaling
...
This PR fixes the hydra (and probably other hand controllers) while scaling.
Testing notes:
- Enable your hydra's
- Grow your avatar (x5 or x10) (With the `+` key)
- Spreading your arms in a T-pose should work without any scaling issues
- Reset your scale using the `=` key
2016-01-31 23:39:43 +01:00
James B. Pollack
ef380ca38c
Merge pull request #6989 from ctrlaltdavid/20796
...
Restart at last location after crash
2016-01-30 20:10:58 -08:00
Brad Davis
ffe7a0eaf1
Merge pull request #6978 from PhilipRosedale/flocking
...
Fish Tank flocking example - FlockOfFish.js
2016-01-29 21:37:09 -05:00
Seth Alves
6697b5ae5f
get multi-near-grabs working again
2016-01-29 18:36:22 -08:00
Seth Alves
9a16bc7d22
when a parented equip or grab releases and the object should fall, give it a little velocity so bullet doesn't consider it static
2016-01-29 18:01:57 -08:00
Seth Alves
0c5c682887
unmuddle saved state in Settings and userData
2016-01-29 17:38:24 -08:00
Philip Rosedale
1766f3fc23
remove debug
2016-01-29 17:20:22 -08:00
Philip Rosedale
ca459e0bd6
Merge branch 'master' of https://github.com/highfidelity/hifi into flocking
2016-01-29 17:18:35 -08:00
Philip Rosedale
11890badd8
Changes per PR suggestions
2016-01-29 17:16:48 -08:00
James B. Pollack
16f353719b
Merge pull request #6969 from ericrius1/textEntityProps
...
Moves text properties to top of Entity Properties panel
2016-01-29 17:02:31 -08:00
ericrius1
559fb9cbde
fixed merge conflicts
2016-01-29 16:42:10 -08:00
Seth Alves
464f74fc1b
don't attempt to distance-grab non-physical objects
2016-01-29 16:37:19 -08:00
ericrius1
c54711614e
Merge remote-tracking branch 'upstream/master'
2016-01-29 16:33:51 -08:00
Ryan Huffman
4ed38c4104
Merge pull request #6986 from birarda/injector-restart
...
fix for injector restart not restarting
2016-01-29 16:27:34 -08:00
Ryan Huffman
bab27e6b79
Merge pull request #6957 from birarda/audio-mixer-coma
...
force AC assignment stop during DOS, process events for rapid injectors
2016-01-29 15:56:58 -08:00
Ryan Huffman
acf96a401f
Fix marketplace imports failing silently if edit.js not running
2016-01-29 15:48:08 -08:00
David Rowe
e07baf916b
Fixed a typo noticed in passing
2016-01-30 12:30:21 +13:00
David Rowe
a5bc1cfd19
Periodically store avatar location
2016-01-30 12:27:47 +13:00
David Rowe
d2cdbebc94
Store avatar location after a teleport
2016-01-30 12:26:50 +13:00
David Rowe
be4022983b
Don't store avatar location immediately after a host change
...
Because the avatar location is 0,0,0 rather than the end target.
2016-01-30 12:25:56 +13:00
Seth Alves
9ca89172f6
change grab script to equip with parenting rather than action. various other changes to messaging. added initial version of attachedEntitiesManager.js. updated toybox scripts to track messaging changes
2016-01-29 15:17:46 -08:00
Seth Alves
f554e25e36
Merge branch 'master' of github.com:highfidelity/hifi into equip-via-parenting
2016-01-29 15:15:28 -08:00
Stephen Birarda
d7990bf88a
reset hasSentFirstFrame to false for double frame on first send
2016-01-29 14:55:08 -08:00
Stephen Birarda
d3028606c5
retart the nextFrame and frameTimer on injector restart
2016-01-29 14:47:27 -08:00
James B. Pollack
cb2fbd7e7f
clear octree interval
2016-01-29 14:29:27 -08:00
James B. Pollack
5e5c6158bb
show how to use an ac to spawn and respawn entities
2016-01-29 14:22:21 -08:00
Ryan Huffman
9a2af26906
Fix 'Import Entities' causing error when cancelling
2016-01-29 14:12:27 -08:00
Stephen Birarda
20cfe80036
use a vector instead of priority queue to avoid double sort
2016-01-29 14:04:45 -08:00
Stephen Birarda
8d17df338b
allow AIM event processing during repeated injection
2016-01-29 14:04:45 -08:00
Stephen Birarda
c91f8c7685
add debug for DDOS AC drop
2016-01-29 14:04:45 -08:00
Stephen Birarda
5551a05261
removed debug for queued check-ins
2016-01-29 14:04:45 -08:00
Stephen Birarda
e50e75cba7
drop assignment even if DDOS locks NL thread
2016-01-29 14:04:45 -08:00
Stephen Birarda
0e016838b4
tweak size of values in AudioMixer
2016-01-29 14:04:45 -08:00
Brad Hefta-Gaub
6db8239d8a
Merge pull request #6983 from jherico/entityProperties
...
Fix entity properties HTML
2016-01-29 13:42:28 -08:00
Brad Davis
c4794dd0d5
Fix entity properties HTML
2016-01-29 13:41:43 -08:00
Howard Stearns
a117e73ea4
Update away.js to use an image instead of text.
2016-01-29 11:56:08 -08:00
Philip Rosedale
a72c49793e
speedups per code review
2016-01-29 10:57:17 -08:00
Brad Hefta-Gaub
721a911cf1
Merge pull request #6972 from jherico/qml
...
Small QML Fixes
2016-01-29 09:57:15 -08:00
James B. Pollack
43f3b6409a
Merge pull request #6966 from ericrius1/zoneEntityProps
...
Moves zone props to top of entity properties panel
2016-01-29 09:34:04 -08:00
ericrius1
2cd7c4a648
Merge remote-tracking branch 'upstream/master'
2016-01-29 09:15:05 -08:00
Andrew Meadows
5bae01485e
Merge pull request #6975 from hyperlogic/tony/update-standard-anims
...
Update animations to use standard joint orientations
2016-01-29 08:58:06 -08:00
Philip Rosedale
ee95f7906b
Fish flocking example
2016-01-29 00:59:06 -08:00
