Commit graph

61951 commits

Author SHA1 Message Date
utkarshgautamnyu
fbe3f2fbe3 Update JSBaker.h 2017-09-27 15:26:17 -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
Ryan Huffman
0e3c2f2e50 Fix ambiguous conversion to QVariant in StatTracker 2017-09-27 15:22:23 -07:00
utkarshgautamnyu
4486212e05 Update JSBaker.cpp 2017-09-27 15:20:30 -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
utkarshgautamnyu
5ad1efb923 Update JSBaker.h 2017-09-27 10:49:48 -07:00
utkarshgautamnyu
d4b8559cb2 Update JSBaker.cpp 2017-09-27 10:49:10 -07:00
Seth Alves
eb6c99456d Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-vs-trigger 2017-09-27 10:01:24 -07:00
Daniela
b18ffe9508 Remove fingerPaint.js from defaultScripts.js. 2017-09-27 17:46:59 +01:00
Ryan Huffman
88810d28c1 Add activity logging for uploading_asset 2017-09-27 09:33:11 -07:00
Ryan Huffman
014a7bc9b0 Fix bytes downloaded stat tracking 2017-09-27 09:33:10 -07:00
Nissim Hadar
eaab056d66 Adding HazeStage 2017-09-27 09:12:57 -07:00
Daniela
c22d2add17 Resolve conflict with hifi/master. 2017-09-27 17:06:12 +01:00
Daniela
6ad2e28c29 Merge branch 'feature/ant-man2' of https://github.com/hyperlogic/hifi into feature/ant-man2 2017-09-27 16:56:19 +01:00
samcake
da78aa422c Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-27 08:56:03 -07:00
Nissim Hadar
4d501d6510 Adding HazeStage 2017-09-27 08:01:19 -07:00
David Rowe
20b1ab0087 Tidying 2017-09-27 22:06:28 +13:00
David Rowe
ad838c6b3c Adjust position of wrist icon 2017-09-27 21:53:26 +13:00
David Rowe
c2471e340a Reduce number of calls to Script.resolvePath 2017-09-27 21:49:02 +13:00
David Rowe
e623b1e0a5 Alternative, more robust handle scaling method 2017-09-27 19:21:07 +13:00
Brad Hefta-Gaub
3500705d0c Merge pull request #11427 from ElderOrb/case7723
7723 Tablet Should Rotate Faster when using Create app
2017-09-26 22:05:45 -07:00
utkarshgautamnyu
70a39f03f7 Update JSBaker.h 2017-09-26 19:36:41 -07:00
utkarshgautamnyu
167dda9f80 made bakeJS a static function 2017-09-26 19:35:54 -07:00
David Rowe
6b3b2beae0 Merge branch 'master' into vr-edit-a 2017-09-27 15:34:52 +13:00
David Rowe
d4fc26f3b7 Fix header highlighting if close and reeopen app with tool selected 2017-09-27 15:22:33 +13:00
Atlante45
73483eef94 Update information sentence 2017-09-26 19:19:34 -07:00
David Rowe
895ffaf1f9 Fix group clear button messing up select-in-box state 2017-09-27 15:09:10 +13:00
Atlante45
bf984e8d1a Fix tablet asset browser 2017-09-26 19:05:36 -07:00
Seth Alves
ae42d56cd6 Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scale
Teleport.js: can now teleport small distances with small avatar scale
2017-09-26 19:05:14 -07:00
Nissim Hadar
2394d0931c Adding HazeStage 2017-09-26 19:05:11 -07:00
Seth Alves
ce3e5eb1a3 set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab 2017-09-26 18:56:27 -07:00
Atlante45
03bd887f9a Re-sync files 2017-09-26 18:42:50 -07:00
Atlante45
dda715e171 Update TabletAssetServer 2017-09-26 18:25:20 -07:00
SamGondelman
306cf883fe don't reload animGraph if url didn't change 2017-09-26 18:18:41 -07:00
Nissim Hadar
f92707a00c WIP 2017-09-26 18:08:41 -07:00
samcake
298dde7490 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-26 18:03:51 -07:00
Sam Gateau
9317ad38aa Merge pull request #11462 from highfidelity/game-render-interface
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
2017-09-26 17:40:23 -07:00