Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
Anthony J. Thibault
c5efcf5d6a
Bug fix for cocked head after playing an input recording.
...
I thought this was the cause of the Manuscript case 11454 but apparently not.
2018-01-18 09:21:15 -08:00
Zach Fox
5ce768f402
Merge pull request #12151 from zfox23/commerce_sendMoney1
...
Commerce: P2P Transfer Iteration 1
2018-01-17 16:41:56 -08:00
Zach Fox
16d51986a9
Make the call to receiveAt more robust
2018-01-17 15:11:58 -08:00
Dante Ruiz
8f22c719b3
Merge pull request #12099 from sethalves/run
...
allow avatar walk-speed to be set from javascript
2018-01-17 13:53:13 -08:00
Seth Alves
7af90d5429
Merge pull request #12171 from mnafees/21671
...
CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files
2018-01-17 13:42:47 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor
...
Remove dangerous "Use Anim Pre and Post Rotations" menu item
2018-01-17 13:41:51 -08:00
Zach Fox
1d747bc0e4
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-17 11:56:00 -08:00
David Back
92c0fd4877
Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS
...
Merge Account & GlobalServices follow-up
2018-01-17 10:50:54 -08:00
Seth Alves
1e847cf32e
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-17 08:08:13 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities
...
Soft Entities
2018-01-17 08:02:37 -08:00
Seth Alves
d3084dc0df
defang
2018-01-17 07:11:27 -08:00
Seth Alves
bfccb52b7a
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-17 07:02:14 -08:00
Sam Gateau
d4571bd86a
Merge pull request #12181 from humbletim/rename-model-graphics
...
Rename libraries/model -> libraries/graphics
2018-01-16 18:12:25 -08:00
Anthony J. Thibault
51ea2632c0
Remove Avatar UseAnimPreAndPostRotations option.
...
This should always be true and can lead to hard to diagnose bugs if it is ever set to false.
2018-01-16 17:27:19 -08:00
Zach Fox
e700ff91d0
Remove warning
2018-01-16 15:58:17 -08:00
Zach Fox
8cc427a374
Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1
2018-01-16 15:07:53 -08:00
David Kelly
929760c226
fix time display
2018-01-16 14:52:26 -08:00
Seth Alves
511f94a4fc
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-16 14:01:54 -08:00
Zach Fox
d64b35729f
Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1
2018-01-16 13:44:29 -08:00
David Kelly
d8f8f9ff1a
First cut at alan's new design
2018-01-16 11:19:10 -08:00
Clément Brisset
1949471dad
Merge pull request #12182 from highfidelity/stable
...
Merge stable (RC62) to master
2018-01-16 11:01:07 -08:00
Mohammed Nafees
885801c5ca
Fix copying to clipboard from JS scripts
2018-01-16 13:17:47 -05:00
humbletim
b91d536dd0
rename model:: -> graphics::
2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
Seth Alves
12db51728e
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-16 07:50:55 -08:00
MiladNazeri
c7cdf6b8f6
Merge pull request #12145 from ctrlaltdavid/21684
...
Update Window JSDoc per recent API changes
2018-01-15 14:50:40 -08:00
Seth Alves
06dd680dc9
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-15 13:48:10 -08:00
Dante Ruiz
645f608814
fixing merge conflict
2018-01-15 10:45:51 -08:00
John Conklin II
c3648fb04c
Merge pull request #12168 from druiz17/RC62
...
fix Asset browser for tablet (RC62)
2018-01-15 10:16:56 -08:00
Zach Fox
f7ed8c10fa
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-15 10:13:07 -08:00
Seth Alves
a7d658c857
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-14 12:34:31 -08:00
Dante Ruiz
8e4bd2d662
fix asset browser for tablet
2018-01-12 17:11:02 -08:00
Dante Ruiz
a48304b104
fix Asset browser for tablet
2018-01-12 17:06:07 -08:00
Zach Fox
e627925bd3
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 15:14:42 -08:00
David Kelly
6cedc016c4
Adding sender/recipient to transaction history for hfc transfers
2018-01-12 16:08:52 -07:00
David Kelly
579a4d85b3
Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory
2018-01-12 14:37:46 -07:00
Zach Fox
6920e57613
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 13:31:58 -08:00
Dante Ruiz
5b82c7bc41
fix merge conflict
2018-01-12 11:00:19 -08:00
Dante Ruiz
96a97b5938
added model transform override
2018-01-11 16:41:45 -08:00
howard-stearns
2987d21f66
remove some more
2018-01-11 13:15:34 -08:00
Zach Fox
81ab5ac81c
hfc_key -> public_key
2018-01-11 12:50:25 -08:00
Zach Fox
d25ef074e1
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-11 12:35:18 -08:00
howard-stearns
c39771d995
do not delete wallet file when things go wrong, and remove obsolete
...
reset machinery
2018-01-11 11:50:23 -08:00
Seth Alves
c09f644612
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-11 09:09:11 -08:00
David Rowe
a543d90090
Miscellaneous fixes
2018-01-11 15:53:45 +13:00
David Rowe
7ba42f0e76
Update JSDoc per recent changes in Window API
2018-01-11 15:52:56 +13:00
Seth Alves
568c27d6e0
Merge pull request #12039 from luiscuenca/currentAPI
...
Fix and improve currentAPI.js
2018-01-10 17:55:08 -08:00
Seth Alves
aefd294bf2
Merge pull request #12107 from hyperlogic/bug-fix/better-third-person-camera
...
Improve stability for HMD third person avatars
2018-01-10 17:46:47 -08:00
Andrew Meadows
b3fcca8446
Merge pull request #12132 from hyperlogic/bug-fix/prevent-hands-from-entering-body
...
Bug fix to prevent wrists entering the avatar's torso.
2018-01-10 17:22:50 -08:00
