Commit graph

60113 commits

Author SHA1 Message Date
druiz17
45b8bfdb1f disbale grab.js in HMD 2017-09-28 16:17:39 -07:00
Zach Fox
4814f277c1 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-09-28 16:07:32 -07:00
Zach Fox
0f66fb41fd Fix entity add after incomplete rezCertified implementation 2017-09-28 16:07:15 -07:00
Thijs Wenker
cabd68a63a Every time a dialog opened in edit.js a new callback is created, which wasn't disconnected after the event happened, this caused lots of entities to be created after each next import. 2017-09-28 16:03:09 -07:00
ZappoMan
be7729b276 support animation of model overlays 2017-09-28 15:14:59 -07:00
Zach Fox
2cff5c1fa6 First time Purchases tutorial 2017-09-28 15:12:55 -07:00
Zach Fox
66be558a04 My Items Interface 2017-09-28 14:04:57 -07:00
druiz17
1947f2ba99 remove update stylus 2017-09-28 13:23:28 -07:00
Zach Fox
3a537cdcc3 Make usernameDropdown collapse when clicking anywhere outside it 2017-09-28 13:21:55 -07:00
Zach Fox
3742ccbdd3 Fix keyboard focus during setup while tip is up 2017-09-28 13:12:42 -07:00
Zach Fox
751dca0761 styling updates for purchases 2017-09-28 13:06:37 -07:00
Zach Fox
68c08969ae Update Purchases 2017-09-28 12:49:38 -07:00
Andrew Meadows
60fe9ec5e9 Merge pull request #11480 from AndrewMeadows/fix-debug-build-20170928
fix interface crash in Debug build
2017-09-28 12:41:12 -07:00
vladest
c3225c2c76 Make fix precisely for Linux 2017-09-28 21:38:03 +02:00
druiz17
3b05317db6 fixing grabbing and tablet bugs 2017-09-28 11:18:40 -07:00
Zach Fox
f0d668c5c3 Fix marketplace injection problems - yay! 2017-09-28 11:14:44 -07:00
Zach Fox
b5dc6b791b Fix commerce setting handle 2017-09-28 10:42:45 -07:00
Zach Fox
8d74487393 Use edition number; fix CONFIRMED timer 2017-09-28 10:25:05 -07:00
Seth Alves
912305fd4b Merge pull request #11476 from ElderOrb/case7925
7925 Create Mode: keyboard focused entry field is not visible
2017-09-28 10:03:28 -07:00
Zach Fox
b6ce294bb2 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-09-28 09:38:48 -07:00
Zach Fox
65a63ea8c3 Remove dead OS X code 2017-09-28 09:38:22 -07:00
vladest
0a9bebeefc Added workaround to enable menu bar under Linux 2017-09-28 15:34:56 +02:00
beholder
338a230de9 reduced delay to improve user experience 2017-09-28 13:01:14 +03:00
beholder
1021aa1a0e re-center focused eleemnt even if keyboard was already visible 2017-09-28 12:59:36 +03:00
David Rowe
30c4a22441 Merge branch 'master' into vr-edit-a 2017-09-28 16:10:26 +13:00
David Rowe
47ab9d3221 Fix flash of color from laser target when turn on or jump distance 2017-09-28 16:04:22 +13:00
Seth Alves
a1c52ea638 Merge pull request #11477 from samcake/flash
Fixing the broken "on hud" overlay's render transform
2017-09-27 17:42:15 -07:00
Zach Fox
60823903cf You own X others 2017-09-27 17:05:07 -07:00
David Rowe
a74678a24d Improve size of scale handles for distant entities 2017-09-28 12:57:30 +13:00
Zach Fox
7b7e0bc78b Updated Recent Activity 2017-09-27 16:35:35 -07:00
samcake
29da0c663f Merge branch 'master' of https://github.com/highfidelity/hifi into flash 2017-09-27 16:21:55 -07:00
David Rowe
9a51ce4b29 Simplification 2017-09-28 12:18:36 +13:00
David Rowe
57cec50583 Fix UI disappearing when inside complex model 2017-09-28 12:18:09 +13:00
Sam Gateau
287f4f1d71 Merge pull request #11466 from SamGondelman/mirrorCrash
Fix mirror and fade threading crashes
2017-09-27 16:17:04 -07:00
Atlante45
eb06c33187 Naming coding standard fix 2017-09-27 15:32:53 -07:00
Seth Alves
3016ce0a2b Merge pull request #11470 from sethalves/fix-grab-vs-trigger
set grabbable and other checkboxes correctly if userData is blank
2017-09-27 15:24:37 -07:00
samcake
3bd6e35e30 Fixing the broken on hud overlay's render transform 2017-09-27 15:19:21 -07:00
Sam Gateau
f25e4203fd Merge pull request #11469 from SamGondelman/tPose
Don't constantly reload animGraph if URL didn't change
2017-09-27 14:46:05 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463)
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
anshuman64
9e1a181cbc Merge pull request #11473 from ElderOrb/case7926
7926 Create Mode: the keyboard tray is not styled correctly
2017-09-27 14:35:10 -07:00
Andrew Meadows
26ea7034d8 prevent zero scale for Line3DOverlay 2017-09-27 14:30:50 -07:00
Andrew Meadows
b602c18475 prevent zero dimensions for Volume3DOverlay 2017-09-27 14:30:50 -07:00
beholder
00c3dcee2f 7925 Create Mode: keyboard focused entry field is not visible
note: changed the way of calculation scroll value after showing virtual keyboard.
Now it doesn't require KEYBOARD_HEGHT and will always try to position focused element at vertical center of the client area
2017-09-28 00:28:54 +03:00
Seth Alves
2e92d40c8d Merge pull request #11475 from druiz17/bugs
Fix EntitySelectioTool and improve far rotate
2017-09-27 14:05:35 -07:00
druiz17
58a00a89d7 remove debug print 2017-09-27 12:58:11 -07:00
SamGondelman
553829f7ab make sure FadeEffect dependency is created early 2017-09-27 11:58:35 -07:00
druiz17
cea3c002dd improving far rotate 2017-09-27 11:47:26 -07:00
beholder
3677718e48 7926 Create Mode: the keyboard tray is not styled correctly 2017-09-27 21:33:18 +03:00
druiz17
38096b48d9 fixing entitySelectionTool 2017-09-27 10:52:56 -07:00
Sam Gateau
88097bb39f Merge pull request #11447 from AndrewMeadows/lod-auto-adjust
LODManager uses batchTime and engineRunTime for automatic LOD adjustment
2017-09-27 10:51:46 -07:00