Seth Alves
07c70a1ba2
refix double action grabs
2016-02-05 14:25:46 -08:00
Seth Alves
b1267f9d37
try to put things back when a double-parent equip is released. if an equpped object is pulled too far from a hand, automatically unequip it.
2016-02-05 13:53:45 -08:00
Seth Alves
ae6a5aa286
add some debugging to handControllerGrab
2016-02-04 18:10:43 -08:00
Seth Alves
27711a04b9
Merge branch 'master' of github.com:highfidelity/hifi into dressing-room
2016-02-04 18:10:03 -08:00
Bradley Austin Davis
c1d45b0c78
Remove declarative form creation from WindowScriptingInterface
2016-02-03 14:50:59 -08:00
Seth Alves
56679c6a1d
Merge branch 'master' of github.com:highfidelity/hifi into dressing-room
2016-02-03 12:50:52 -08:00
Andrew Meadows
00f30201a7
Merge pull request #7003 from sethalves/save-held-adjustments
...
automatically save adjustments to offsets of equipped items
2016-02-03 12:21:17 -08:00
Brad Hefta-Gaub
839ce50bde
Merge pull request #7018 from jherico/qml
...
QML fixes
2016-02-03 11:59:27 -08:00
Seth Alves
ad2a7bfc3c
code review
2016-02-03 10:54:08 -08:00
Andrew Meadows
cd56d635e1
Merge pull request #7012 from sethalves/adjust-palm-position
...
base palm position on finger joint rather than an offset from hand joint
2016-02-03 10:34:39 -08:00
Seth Alves
e0ab6b6716
Merge branch 'dressing-room' of github.com:imgntn/hifi into dressing-room
2016-02-03 09:30:21 -08:00
Seth Alves
30e97c2a76
run attachedEntitiesManager.js by default, but without a UI
2016-02-02 16:34:06 -08:00
Bradley Austin Davis
f24f2749e1
Make users.js show QML window for edit friends
2016-02-02 15:19:12 -08:00
James B. Pollack
0587981a20
add doppleganger features
2016-02-02 15:07:38 -08:00
Seth Alves
260d27f4d7
increase drop-on-joint radius. fix bug that kept from dropping on hips (index 0). save adjustments if in dressing room
2016-02-02 14:31:20 -08:00
Ryan Huffman
57d92bcfa6
Stop creation of GridTool altogether in edit.js
2016-02-02 10:13:24 -08:00
Seth Alves
3bbecf5c8b
Merge branch 'adjust-palm-position' of github.com:sethalves/hifi into dressing-room
2016-02-02 10:04:35 -08:00
Seth Alves
53e3f5a5d1
Merge branch 'save-held-adjustments' of github.com:sethalves/hifi into dressing-room
2016-02-02 10:04:15 -08:00
Ryan Huffman
dad36b73fc
Disable gridTool in edit.js
2016-02-02 09:57:52 -08:00
Seth Alves
fec479d70a
Merge branch 'master' of github.com:highfidelity/hifi into dressing-room
2016-02-02 09:25:11 -08:00
James B. Pollack
d25dbfff9f
Merge pull request #6993 from hyperlogic/tony/mirrored-doppelganger
...
doppelganger.js: mirror joint rotations & translations about x-axis
2016-02-01 19:09:42 -08:00
Seth Alves
2501be16cb
base palm position on finger joint rather than an offset from hand joint. double size of near-grab sphere
2016-02-01 18:11:27 -08:00
James B. Pollack
43844dd0be
Merge pull request #7008 from ericrius1/editPropsDecimals
...
Fixed bug where lack of 0 as prefix for numbers would throw an error
2016-02-01 17:35:44 -08:00
ericrius1
1387f5f322
Fixed bug where lack of 0 as prefix for numbers would throw an error
2016-02-01 16:44:55 -08:00
Seth Alves
c570f4af67
Merge branch 'master' of github.com:highfidelity/hifi into dressing-room
2016-02-01 16:15:42 -08:00
Seth Alves
3209ac4f68
use controller hand rotation rather than IK hand rotation in grab script
2016-02-01 15:42:32 -08:00
Seth Alves
e4ef3ae869
automatically save adjustments to offset of equipped items
2016-02-01 15:06:53 -08:00
Seth Alves
793b0f400f
Merge branch 'master' of github.com:highfidelity/hifi into dressing-room
2016-02-01 14:35:37 -08:00
Brad Hefta-Gaub
9361c1655e
Merge pull request #6980 from howard-stearns/performance-stats-repro-scripts
...
Performance stats repro scripts
2016-02-01 13:52:53 -08:00
Seth Alves
2207588c01
merge from upstream
2016-02-01 13:19:45 -08:00
howard-stearns
ae10d4343c
Add data for a 2k triangle model.
2016-02-01 11:47:33 -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
Howard Stearns
d8069b6dbf
Whitespace and jslinting.
2016-02-01 11:28:51 -08:00
Howard Stearns
11d80cdc94
Merge branch 'master' of https://github.com/highfidelity/hifi into performance-stats-repro-scripts
2016-02-01 10:38:13 -08:00
Seth Alves
aa6742a844
merge from james/removeHighFreqMsg
2016-02-01 10:01:50 -08:00
Seth Alves
d034850c49
Merge branch 'equip-via-parenting' of github.com:sethalves/hifi into dressing-room
2016-02-01 09:59:52 -08:00
Seth Alves
182ae22b44
merge James' doppelganger changes into Tony's
2016-02-01 09:58:35 -08:00
Seth Alves
6ca17a904a
merge James' doppelganger changes into Tony's
2016-02-01 09:58:24 -08:00
Seth Alves
a65ff76da1
Merge branch 'tony/mirrored-doppelganger' of github.com:hyperlogic/hifi into dressing-room
2016-02-01 09:56:52 -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
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
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
Anthony Thibault
6813f692da
doppelganger.js: mirror joint rotations & translations about x-axis
...
It's not pretty, mostly due to the lack of JavaScript access to the skeleton parent linkage information,
and lack of conversions between absolute and relative-to-parent joint rotations/translations.
2016-01-30 16:16:26 -08: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
