James B. Pollack
d2bea1f32c
update reset scripts to use new offset style
2016-02-01 13:53:27 -08:00
James B. Pollack
8e75ce8232
Merge pull request #6967 from zzmp/fix/render-count
...
Render the correct maxDrawnItems
2016-02-01 13:34:33 -08:00
James B. Pollack
cf441861cc
Merge pull request #6948 from sethalves/equip-via-parenting
...
equip via parenting rather than action
2016-02-01 13:22:09 -08:00
Seth Alves
2207588c01
merge from upstream
2016-02-01 13:19:45 -08:00
Seth Alves
9dc6f08ae2
Merge pull request #6995 from imgntn/removeHighFreqMsg
...
Remove high frequency messages from grab script
2016-02-01 11:44:43 -08:00
Anthony Thibault
17851dd129
Merge pull request #6990 from howard-stearns/better-head-joint-setup
...
Better head joint setup
2016-02-01 11:28:35 -08:00
Anthony Thibault
b345df8002
Merge pull request #6987 from AndrewMeadows/better-ik
...
reduce hand-IK coupling to hip offset
2016-02-01 10:36:21 -08:00
Seth Alves
7c5b0ec46e
Merge branch 'master' of github.com:highfidelity/hifi into equip-via-parenting
2016-02-01 09:52:30 -08:00
howard-stearns
24f53492f5
Back out changes to reader.
2016-02-01 09:52:03 -08:00
Andrew Meadows
71664dffae
change string comparisons to be CaseSensitive
2016-02-01 09:50:01 -08:00
howard-stearns
277dbdbc37
Merge branch 'master' of https://github.com/highfidelity/hifi into better-head-joint-setup
2016-02-01 09:35: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
James B. Pollack
499e6d9804
update readme
2016-01-30 20:04:51 -08:00
James B. Pollack
7767dfb213
remove high freq messages
2016-01-30 19:59:56 -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
howard-stearns
ceed571c82
Look harder for head, log if not found, and compute what we need
...
regardless.
2016-01-29 16:02:58 -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
Andrew Meadows
de54a0ac4b
remove cruft
2016-01-29 14:51:24 -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
Andrew Meadows
14ec1b6295
reduce hand IK coupling to hip position
2016-01-29 14:28:56 -08:00
Andrew Meadows
a98459dfa8
minor IK optimization: changed accumulators only
2016-01-29 14:28:56 -08:00
Andrew Meadows
449d566d2a
properly track lowestMovedIndex
2016-01-29 14:28:56 -08:00
