Zach Fox
515ff016a4
Fix seven bugs
2018-11-05 13:03:34 -08:00
Zach Fox
a4d36b3845
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-05 10:25:58 -08:00
howard-stearns
8906b909eb
close wallet app during login so that it doesn't tell to login after
...
login
2018-11-04 12:08:29 -08:00
howard-stearns
100a17a2b9
remove wallet reference in update notification
2018-11-04 11:25:40 -08:00
howard-stearns
8ad8398ef3
remove 'purchase' from login notice.
2018-11-04 11:17:56 -08:00
howard-stearns
ae51b95ca1
fix bad tab reference
2018-11-04 11:15:46 -08:00
Zach Fox
a87142b8b7
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-02 16:49:20 -07:00
Brad Hefta-Gaub
d0181283dd
Merge pull request #14308 from sabrina-shanman/fbx2hfm
...
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-11-02 16:44:31 -07:00
Zach Fox
d0854ca2ab
Use AccountManager instead of settings
2018-11-02 16:42:18 -07:00
Howard Stearns
be17ed0910
Merge pull request #14327 from roxanneskelly/gift-update
...
Case 18794 - updates were being reported as gifts in the wallet
2018-11-02 16:42:03 -07:00
Chang Xing
67252467d8
Merge pull request #14317 from zfox23/moveSecuritySettings
...
Move Wallet Security tab to new dialog; fixup Login dialog
2018-11-02 16:29:05 -07:00
Zach Fox
402c23e359
Use useragent instead of queryparam to determine limitedCommerce
2018-11-02 16:07:29 -07:00
Ken Cooke
77988e400e
Merge pull request #14247 from sethalves/dont-let-checkdevices-swap-pool
...
don't let checkDevices swamp thread pool
2018-11-02 14:25:39 -07:00
Zach Fox
2b50c40224
Minor changes found by Chang
2018-11-02 09:33:06 -07:00
Zach Fox
917fc4ad58
Update language
2018-11-02 09:23:31 -07:00
Roxanne Skelly
1f8dde6756
Transaction string was assuming items given to the
...
marketplace/highfidelity were Gifts and was reporting them as such.
Items given to the marketplace are in exchange for updates, and the memo
indicates such.
2018-11-01 15:44:11 -07:00
Zach Fox
0a15e94fe4
New colors
2018-11-01 13:27:31 -07:00
Zach Fox
581a19b13e
Merge branch 'master' of github.com:highfidelity/hifi into moveSecuritySettings
2018-11-01 13:15:54 -07:00
Zach Fox
d6477993a1
Make it work better with the tablet
2018-11-01 13:08:00 -07:00
Zach Fox
4a56f769e5
Re-add some code I shouldn't have removed
2018-11-01 11:04:59 -07:00
Zach Fox
6e470d5c1c
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce
2018-11-01 10:30:01 -07:00
Zach Fox
d481f081bb
Fix four bugs; truncate some logs
2018-11-01 10:29:38 -07:00
Anthony Thibault
5c78a463de
Merge pull request #14270 from luiscuenca/softEntitiesLooseJointsFix
...
Extra joints on soft entities keep their local transform
2018-11-01 09:29:16 -07:00
Roxanne Skelly
a1eee351e9
Change "Proofs" to "My Submissions" in assets filter.
2018-10-31 16:24:57 -07:00
Zach Fox
162a08b993
Restore certain images
2018-10-31 16:14:26 -07:00
Zach Fox
d4e9a70564
Almost there
2018-10-31 16:12:16 -07:00
John Conklin II
25be635b76
Merge pull request #14314 from birarda/bug/reliable-through-loss
...
avoid ambiguous RTT calcs and enable udt fast retransmit
2018-10-31 15:49:23 -07:00
David Kelly
e6c3e7e67f
initial purge of security tab from wallet
2018-10-31 15:33:28 -07:00
Zach Fox
41a0d09389
First pass
2018-10-31 15:31:51 -07:00
sabrina-shanman
643026abd6
Change local variable in TestFbx for clarity
2018-10-31 14:15:39 -07:00
sabrina-shanman
0b7ddca5f6
Change naming for straggler names in model loading debug dumps
2018-10-31 14:03:20 -07:00
Zach Fox
34fb849536
Cleanup FIXME
2018-10-31 13:53:18 -07:00
Stephen Birarda
41ec026f8d
cleanup packet times, avoid ambiguous RTT calcs, allow fast re-transmit
2018-10-31 13:32:27 -07:00
Zach Fox
a1276ba899
Don't poll for history notifs if limitedCommerce is true
2018-10-31 13:31:29 -07:00
Zach Fox
efcda129b7
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce
2018-10-31 13:24:06 -07:00
Zach Fox
448be8847f
Notifications are working!
2018-10-31 13:23:58 -07:00
Sam Gondelman
312f336210
Merge pull request #14302 from SamGondelman/queryAACube
...
Don't update QueryAACube in setParentID if _parentID didn't change
2018-10-31 11:46:16 -07:00
Roxanne Skelly
b5a48d31b6
Fix code-review spacing issue
2018-10-31 10:18:04 -07:00
Roxanne Skelly
628ec8ec2b
Removed QmlCommerce.cpp, Ledger.cpp changes as requested
2018-10-31 10:09:01 -07:00
Roxanne Skelly
e5f06690b5
Strip out references to 'my purchases' vs 'my items' code
2018-10-30 17:31:31 -07:00
sabrina-shanman
becee7f010
Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-10-30 17:28:42 -07:00
Roxanne Skelly
0e639f4e34
Merge branch 'oculus-store-commerce' of https://github.com/howard-stearns/hifi into oculus-store-commerce
2018-10-30 16:29:43 -07:00
Roxanne Skelly
91b199a456
Checkpoint Proofs Filter in Inventory
2018-10-30 16:29:20 -07:00
Zach Fox
b6344acc1d
Big checkpoint. be aware - things may be broken
2018-10-30 15:08:13 -07:00
SamGondelman
e64a4d0536
try to fix unnecessary queryAACube updates
2018-10-30 12:47:44 -07:00
Sam Gondelman
2dc761a57a
Merge pull request #14295 from SamGondelman/shape
...
Fix shape not getting marked changed
2018-10-30 11:04:32 -07:00
SamGondelman
df005eedbf
fix shape not getting marked changed
2018-10-29 17:43:16 -07:00
John Conklin II
db87fe9696
Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix
...
Fix avatars remain stuck in place for other users intermittently
2018-10-29 15:03:43 -07:00
Zach Fox
d47fd44a47
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-29 14:57:23 -07:00
John Conklin II
e01401294f
Merge pull request #14286 from ctrlaltdavid/M17988
...
Fix Interface eating memory when minimized
2018-10-29 12:52:10 -07:00
