Alexander Ivash
27bb8a0de7
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-11-06 14:21:14 +05:30
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
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
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
Zach Fox
a87142b8b7
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-02 16:49:20 -07:00
Zach Fox
402c23e359
Use useragent instead of queryparam to determine limitedCommerce
2018-11-02 16:07:29 -07:00
Zach Fox
2b50c40224
Minor changes found by Chang
2018-11-02 09:33:06 -07:00
Howard Stearns
8f2f27f468
Merge branch 'oculus-store-commerce' into tabless
2018-11-01 11:22:28 -07:00
Zach Fox
4a56f769e5
Re-add some code I shouldn't have removed
2018-11-01 11:04:59 -07:00
Zach Fox
d481f081bb
Fix four bugs; truncate some logs
2018-11-01 10:29:38 -07:00
Zach Fox
41a0d09389
First pass
2018-10-31 15:31:51 -07:00
Howard Stearns
ce0ad48a28
tabless wallet
2018-10-31 13:58:26 -07:00
Zach Fox
34fb849536
Cleanup FIXME
2018-10-31 13:53:18 -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
448be8847f
Notifications are working!
2018-10-31 13:23:58 -07:00
Zach Fox
b6344acc1d
Big checkpoint. be aware - things may be broken
2018-10-30 15:08:13 -07:00
David Kelly
015b5fa681
Don't attempt purchase of sold out items
2018-10-30 08:01:22 -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
Ryan Huffman
c6403a44cb
Merge pull request #14281 from dback2/collidesPropertyFix
...
Fix Collides With subproperties
2018-10-26 13:46:52 -07:00
John Conklin II
fa2fb3a87a
Merge pull request #14246 from sethalves/sync-grab-props
...
keep userData and new grab properties in sync
2018-10-26 11:52:47 -07:00
David Back
13acfb325a
fix collides with properties, fix ordering for start/finish/spread properties
2018-10-25 15:06:15 -07:00
John Conklin II
2dfd63f4e7
Merge pull request #14229 from thoys/feat/create/tooltips
...
MS19052 [CreateApp]: Tooltips
2018-10-25 14:52:16 -07:00
John Conklin II
7227547b6a
Merge pull request #14279 from dback2/removeParticleExplorer
...
Remove particle explorer
2018-10-25 13:37:22 -07:00
Howard Stearns
8b79795247
nix the word "purchase" where possible
2018-10-25 12:31:01 -07:00
David Back
eb347c5596
remove particle explorer
2018-10-25 11:30:18 -07:00
Howard Stearns
6284c902be
use the switch
2018-10-25 11:29:10 -07:00
SamGondelman
faff5f11e8
Merge remote-tracking branch 'upstream/master' into particleLoad
2018-10-25 10:56:11 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
...
Quality Improvements to Avatars driven by Vive Trackers
2018-10-25 08:51:59 -07:00
Jeff Clinton
736dc47934
Merge pull request #14274 from huffman/feat/silence-defaults-in-script-log
...
Add optional default scripts log suppression to the script debug window
2018-10-25 08:50:25 -07:00
Seth Alves
b8f1c96685
rats
2018-10-25 07:47:16 -07:00
Seth Alves
b93807b1a7
remove conversion code from equipEntity.js
2018-10-25 07:47:16 -07:00
Seth Alves
b9f8c59f61
Merge pull request #13904 from alexiamandeville/menu-updates
...
Resorting Developer menu organization
2018-10-24 19:41:22 -07:00
Thijs Wenker
13cad17793
better style js attributes
2018-10-25 02:46:16 +02:00
Thijs Wenker
bb7d1f8afb
fix broken and missing tooltips
2018-10-25 02:46:16 +02:00
Thijs Wenker
83051940a8
Fix QA feedback
2018-10-25 02:46:15 +02:00
Thijs Wenker
358b0b76d1
tooltip delay of 500ms
2018-10-25 02:46:15 +02:00
Thijs Wenker
a3b874f9aa
property tooltips
2018-10-25 02:46:14 +02:00
Ryan Huffman
5c5a5c9cd2
Add optional default scripts log suppression
2018-10-24 16:23:10 -07:00
David Back
a88678fb70
fix bad css merge, add particle property debounce
2018-10-24 15:07:47 -07:00
Howard Stearns
1ff50bc05e
updates notification applies to assets, and there is no wallet activity
...
notification
2018-10-24 12:45:17 -07:00
David Back
5c1972e3f4
fix fallback properties
2018-10-24 12:40:44 -07:00
Howard Stearns
e1e9b78427
filter priced items from marketplace
2018-10-24 12:22:03 -07:00
David Back
b3e0d51260
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-24 11:48:56 -07:00
