David Kelly
a9fc63da4c
fix error when pending
2018-01-16 15:04:05 -08:00
David Kelly
929760c226
fix time display
2018-01-16 14:52:26 -08:00
David Kelly
d8f8f9ff1a
First cut at alan's new design
2018-01-16 11:19:10 -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
NissimHadar
e580a19677
Merge pull request #12147 from NissimHadar/noBackgroundModeFix
...
Dealing with legacy domains.
2018-01-12 12:42:11 -08:00
Andrew Meadows
a116768f4c
Merge pull request #12154 from hyperlogic/bug-fix/elbow-glitch-fix
...
Fix for elbow glitches
2018-01-12 10:18:11 -08:00
Zach Fox
b7f4fe2ba3
Merge pull request #12149 from howard-stearns/do-not-delete-wallet-file
...
Do not delete wallet file
2018-01-12 09:44:40 -08:00
Anthony J. Thibault
bfd18e3696
unused variable warning fix
2018-01-12 09:07:50 -08:00
Nissim Hadar
50a030b68b
Corrected copy of ambient URL.
2018-01-12 00:22:06 -08:00
Nissim Hadar
a1f25bf49c
Moved variable setting to outside of loop.
...
Added copy of ambient URL.
2018-01-11 19:35:13 -08:00
Anthony J. Thibault
983e1fe075
warning fixes: removed unused variable.
2018-01-11 17:57:58 -08:00
Anthony J. Thibault
4e4ac6c54d
Merge branch 'master' into bug-fix/elbow-glitch-fix
2018-01-11 17:57:41 -08:00
Nissim Hadar
86cfeac95c
Moved variable setting to outside of loop.
2018-01-11 16:39:44 -08:00
Zach Fox
c216144015
Remove unnecessary comments
2018-01-11 16:21:59 -08:00
Anthony J. Thibault
467a7eaf2d
Fix for elbow glitches
...
The pole vector constraint calculation within the IK system would sometimes compute the incorrect rotations.
This would be visible as an instantaneous snap of the elbow joint as the bicep was curled.
When applying pole vector constraints, there needs to be two methods of determining the current orientation of the elbow joint.
One for when the arm/elbow joint is bent, and one for when the arm/elbow is straight.
Previously, the way we would switch between these two solutions could cause a large rotation delta to accur between very small angles.
Now we use the more accurate method (1) more often, and we smoothly blend between the solutions as the joint gets straighter.
2018-01-11 15:40:53 -08:00
Zach Fox
464bbe5d43
Bugfixes, refactoring, and improvements
2018-01-11 15:26:51 -08:00
Nissim Hadar
311e95e0d0
Corrected default values - for reading legacy content.
2018-01-11 14:57:22 -08:00
Nissim Hadar
4bd09fd9af
Corrected default values - for reading legacy content.
2018-01-11 14:53:58 -08:00
Nissim Hadar
d1cd2d9c96
Merge branch 'master' of https://github.com/highfidelity/hifi into noBackgroundModeFix
2018-01-11 14:52:19 -08:00
Zach Fox
1e608b13b2
Show username when admin (this probably isn't the way to get username
2018-01-11 14:45:43 -08:00
Seth Alves
1a1caa64d5
Merge pull request #12148 from vladest/disable_magnification
...
Temporarily disable magnification until further notice
2018-01-11 14:20:54 -08:00
Sam Gateau
4663f8eb2a
Merge pull request #12136 from SamGondelman/texture
...
Keep requesting render update until textures load
2018-01-11 14:09:21 -08:00
Sam Gateau
09f5f0746b
Merge pull request #12141 from SamGondelman/uniformBuffer
...
Fix particle uniform buffer issue
2018-01-11 14:05:36 -08:00
vladest
cff80e86b6
Temporarily disable magnification until further notice
2018-01-11 22:18:22 +01:00
howard-stearns
2987d21f66
remove some more
2018-01-11 13:15:34 -08:00
Zach Fox
df58065e75
Silly bug
2018-01-11 13:02:00 -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
Nissim Hadar
86566fc9e1
Merge branch 'master' of https://github.com/highfidelity/hifi into noBackgroundModeFix
2018-01-11 12:30:30 -08:00
Nissim Hadar
d225f803d0
Corrected default values.
2018-01-11 12:28:44 -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
Zach Fox
d577b2e9e8
Actually add the API calls
2018-01-11 11:45:43 -08:00
Anthony Thibault
8d5e7dbeff
Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings
...
Fix for black screen when clicking Settings from Snap app
2018-01-11 09:58:10 -08:00
Seth Alves
363b9bfe11
Merge pull request #12127 from SamGondelman/freeze
...
Comment out TabletAddressDialog logging of long messages
2018-01-10 18:07:18 -08:00
Seth Alves
457fcd6f40
Merge pull request #12129 from SamGondelman/doubleClick
...
Move key logic from onClicked to onReleased
2018-01-10 18:03:23 -08: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
MiladNazeri
c77d2f4e58
Merge pull request #12121 from cain-kilgore/21667
...
WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel
2018-01-10 17:11:54 -08:00
MiladNazeri
301731554f
Merge pull request #12102 from cain-kilgore/21664
...
WL 21664 - Window.innerHeight should not include the menu bar
2018-01-10 17:10:14 -08:00
Zach Fox
939012a2d0
Hook up the endpoints!
2018-01-10 17:10:05 -08:00
SamGondelman
e9d751fd23
try to avoid reusing uniform buffer locations
2018-01-10 17:01:01 -08:00
Zach Fox
0d137d62c8
HMD tweaks
2018-01-10 16:37:47 -08:00
Anthony J. Thibault
1deb75daf7
Fix for black screen when clicking Settings from Snap app
...
(cherry picked from commit d5e3b97c93
2018-01-10 16:31:51 -08:00
Zach Fox
b3e3af4ee7
Add character count :)
2018-01-10 16:23:29 -08:00
Zach Fox
260aee42a8
Improvements
2018-01-10 16:18:34 -08:00
Zach Fox
c15b1669b1
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-10 15:53:23 -08:00
Zach Fox
93b15c0aa6
Payment Failure
2018-01-10 15:53:13 -08:00
Zach Fox
6812010660
The skeleton is there
2018-01-10 15:33:18 -08:00
