Commit graph

4221 commits

Author SHA1 Message Date
David Rowe
06f0e23bf9 There no longer is a handControllerGrab.js 2017-10-03 21:44:56 +13:00
David Rowe
5145107f8c 2D overlays can no longer be lasered 2017-10-03 21:36:40 +13:00
David Rowe
31e72c5503 Work around bug undoing physics where entities can end at wrong position 2017-10-03 16:26:00 +13:00
David Rowe
a59d590111 ESLint 2017-10-03 13:33:20 +13:00
David Rowe
46ce68a893 Fix lasers 2017-10-03 13:33:11 +13:00
David Rowe
0bd67d494d Fix UI sometimes turning off/on/off as hand enters entity 2017-10-02 19:27:26 +13:00
David Rowe
829cc8e5e6 Merge branch 'master' into vr-edit-a 2017-10-02 17:08:27 +13:00
David Rowe
680235a7b1 += 1 ==> ++ 2017-10-01 13:22:48 +13:00
David Rowe
03e0e21ce0 JSLint ==> ESLint 2017-10-01 13:19:54 +13:00
David Rowe
659b2d8a99 Disable debug log info 2017-09-30 15:14:07 +13:00
David Rowe
229c186901 Rename script from vr-edit.js to shapes.js 2017-09-30 15:09:35 +13:00
David Rowe
b56b3a2e61 Change app name from "VR EDIT" to "SHAPES" and use new icon 2017-09-30 15:01:21 +13:00
Anthony J. Thibault
9273e02497 Bug fix for offset of animated parts of oculus touch controller display
Ensure position/rotations are updated with a consistent scale and
are animated correctly as the controller values change.
2017-09-29 14:01:50 -07:00
David Rowe
75365847a1 Merge branch 'master' into vr-edit-a 2017-09-30 09:30:38 +13:00
Seth Alves
7645808694 Merge pull request #11479 from druiz17/more-bugs
fixing grabbing and tablet bugs
2017-09-28 20:02:47 -07:00
Seth Alves
3d05a0c07c Merge pull request #11484 from druiz17/grab-js
disable grab.js in HMD
2017-09-28 17:27:26 -07:00
druiz17
45b8bfdb1f disbale grab.js in HMD 2017-09-28 16:17:39 -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
druiz17
1947f2ba99 remove update stylus 2017-09-28 13:23:28 -07:00
druiz17
3b05317db6 fixing grabbing and tablet bugs 2017-09-28 11:18:40 -07: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
David Rowe
a74678a24d Improve size of scale handles for distant entities 2017-09-28 12:57:30 +13: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
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
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
druiz17
58a00a89d7 remove debug print 2017-09-27 12:58:11 -07:00
druiz17
cea3c002dd improving far rotate 2017-09-27 11:47:26 -07:00
druiz17
38096b48d9 fixing entitySelectionTool 2017-09-27 10:52:56 -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
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
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
David Rowe
895ffaf1f9 Fix group clear button messing up select-in-box state 2017-09-27 15:09:10 +13: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
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
Seth Alves
f384cde471 Merge pull request #11467 from sethalves/fix-near-trigger
Fix near trigger
2017-09-26 17:27:05 -07:00
Dante Ruiz
410baaf7bc Merge pull request #11464 from druiz17/controller-dispatacher-bugs
fix auto dropping and re-grabbing loop
2017-09-26 16:46:34 -07:00
Seth Alves
8180acbffc use same trigger test as in isReady 2017-09-26 16:29:22 -07:00
Andrew Meadows
dafadf82bb Merge pull request #11458 from jherico/fix/tablet_latency
Fix long tablet lag on first load
2017-09-26 16:18:31 -07:00
David Rowe
76889d1b67 Improve handle scaling of entity with near-zero dimension 2017-09-27 12:04:05 +13:00
Seth Alves
a478506da3 Merge branch 'master' of github.com:highfidelity/hifi into fix-near-trigger 2017-09-26 15:52:22 -07:00
Seth Alves
644532dd59 only send startNearTrigger once 2017-09-26 15:17:23 -07:00
druiz17
5a1242a1ac fix spelling error 2017-09-26 15:06:31 -07:00
druiz17
76c1fe688c fix auto dropping 2017-09-26 14:52:01 -07:00