NissimHadar
dd7ce2cfff
Enable GitHub fields correctly on MAC
2018-11-08 08:37:44 -08:00
NissimHadar
91fb592d3f
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-06 10:19:52 -05:00
NissimHadar
ebdd443646
New resize method for Mac.
2018-11-06 10:19:27 -05:00
NissimHadar
e9a636d751
Revert...
2018-11-05 22:13:02 -05:00
NissimHadar
c0e7a4348b
Reverted changes to Interface.
2018-11-05 22:10:20 -05:00
Howard Stearns
5e01314d85
Merge pull request #14319 from howard-stearns/tabless
...
Remove tabs from oculus store inventory, and rename to match
2018-11-05 18:05:02 -08:00
Howard Stearns
89656ea3f6
activity notifications also change ASSETS to INVENTORY
2018-11-05 16:43:06 -08:00
Howard Stearns
03ac18ab74
Merge pull request #14299 from davidkelly/dk/19591
...
Don't attempt purchase of sold out items
2018-11-05 16:20:02 -08:00
Howard Stearns
b54b5082ee
Merge branch 'master' of github.com:highfidelity/hifi into tabless
2018-11-05 16:14:49 -08:00
Howard Stearns
a99facb793
Merge pull request #14261 from howard-stearns/oculus-store-commerce
...
Oculus store commerce
2018-11-05 16:13:04 -08:00
Howard Stearns
335947598f
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into tabless
2018-11-05 15:48:52 -08:00
Zach Fox
5b042ec3df
My items to my submissions
2018-11-05 15:23:25 -08:00
John Conklin II
4d74f7a0da
Merge pull request #14338 from sabrina-shanman/hfm_geo2model
...
(case 19302) Rename HFMGeometry to HFMModel and adjust related variables
2018-11-05 15:00:06 -08:00
Zach Fox
3631e304ba
Acquisition
2018-11-05 14:58:12 -08:00
Zach Fox
f10b9ae30c
Squashed commit of the following:
...
commit 515ff016a4a4d36b38458906b909ebd0181283ddd0181283ddbe17ed0910643026abd6#14308 from sabrina-shanman/fbx2hfm
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
commit 643026abd60b7ddca5f6becee7f010
2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4
Fix seven bugs
2018-11-05 13:03:34 -08:00
sabrina-shanman
30eb360f62
Convert remaining HFMModels called model to hfmModel, and rename some missed local variables
2018-11-05 12:07:17 -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
7115f0e688
update notification refs inventory, not assets
2018-11-04 12:17:41 -08:00
howard-stearns
4f713b038e
Merge branch 'oculus-store-commerce' into tabless
2018-11-04 12:17:21 -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
NissimHadar
562c9b1196
"works" on Mac
2018-11-02 13:35:38 -07:00
NissimHadar
51272d8fec
Added setGeometry script command.
2018-11-02 13:09:07 -07:00
NissimHadar
70c0addc3f
Removed setWindowSize - crashes on both Windows and Mac.
...
Fixed typo.
2018-11-02 10:47:17 -07:00
NissimHadar
c7353e6c59
Added setWindowSize - FOR TESTING ON MAC
2018-11-02 09:57:58 -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
NissimHadar
58bac436ba
Fixed Linux error
2018-11-01 18:14:29 -07:00
NissimHadar
cd2194ad53
Correction for Linux
2018-11-01 17:56:45 -07:00
NissimHadar
470a490494
Typo.
2018-11-01 17:31:10 -07:00
sabrina-shanman
cbca77b12f
Rename HFMGeometry to HFMModel and adjust related variables
2018-11-01 17:17:48 -07:00
NissimHadar
50d1beb95f
Merge branch 'MAC' of github.com:NissimHadar/hifi into MAC
2018-11-01 16:58:17 -07:00
NissimHadar
d851720cb0
Added method to detect OS type. Needed for testing.
2018-11-01 16:57:28 -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
Howard Stearns
8256bfbc55
icons
2018-11-01 15:20:50 -07:00
NissimHadar
ebc37610d3
Updated for MAC.
2018-11-01 15:07:19 -07:00
NissimHadar
22ae1114b5
Updated Python command for Mac.
2018-11-01 14:20:05 -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
