Zach Fox
15c0a21e0e
Varied commit - styling changes, beginnings of new Wallet endpoint, etc
2017-10-02 12:19:24 -07:00
Howard Stearns
930832bb19
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-10-02 09:44:29 -07:00
Zach Fox
1ec0f5d9a0
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-10-02 09:26:59 -07:00
David Rowe
829cc8e5e6
Merge branch 'master' into vr-edit-a
2017-10-02 17:08:27 +13:00
Nissim Hadar
449d7ae988
Merge branch 'master' into hazeZone
2017-10-01 19:18:16 -07:00
Anthony J. Thibault
7dfa80f666
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-10-01 17:52:59 -07:00
druiz17
20918641f4
saving work
2017-09-29 16:48:25 -07:00
Howard Stearns
73c8da99dc
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-09-29 16:46:43 -07:00
Zach Fox
1e52e7824b
Fix injection
2017-09-29 16:39:07 -07:00
Zach Fox
255cede808
Correctly determine if we're on a marketplace screen
2017-09-29 16:05:26 -07:00
Nissim Hadar
2e1919eba5
Merge branch 'master' into hazeZone
2017-09-29 15:16:46 -07: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
Zach Fox
63396a2fc3
WalletScriptingInterface; wallet status refactor
2017-09-29 13:42:04 -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
Howard Stearns
d1350a03c2
working checkpoint, but with a lot of debug/development stuff
2017-09-28 17:06:07 -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
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
68c08969ae
Update Purchases
2017-09-28 12:49:38 -07: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
David Rowe
30c4a22441
Merge branch 'master' into vr-edit-a
2017-09-28 16:10:26 +13:00
Nissim Hadar
4d8a1db895
Merge branch 'master' into hazeZone
...
# Conflicts:
# libraries/entities-renderer/src/RenderableModelEntityItem.cpp
2017-09-27 17:50:51 -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
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
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
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
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
Anthony J. Thibault
a7cfb5d635
teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scale
2017-09-26 14:21:25 -07:00
Anthony J. Thibault
c26d04dca1
Teleport.js: Fix message bugs, and made eslint clean
...
* 'Hifi-Teleport-Ignore-Add' and 'Hifi-Teleport-Ignore-Remove' messages should now should work
* 'Hifi-Teleport-Disabler' message should now work
2017-09-26 13:58:00 -07:00
Seth Alves
a871a6db1d
Merge pull request #11430 from sethalves/fix-parent-grab
...
Fix parent grab
2017-09-26 13:00:16 -07:00
Seth Alves
81f74f9297
Merge pull request #11444 from druiz17/module-handcontrollerPointer
...
Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet
2017-09-26 12:21:03 -07:00
Seth Alves
91f5f61ea3
Merge pull request #11456 from druiz17/bugs-handControllerGrab
...
Correctly grab tablet in 3rd person
2017-09-26 12:19:20 -07:00
Seth Alves
913d3c4d12
Merge pull request #11422 from hyperlogic/feature/ant-man2
...
Secondary IPD fixes
2017-09-26 11:53:45 -07:00
Seth Alves
216888aa03
Merge branch 'fix-parent-grab' of github.com:sethalves/hifi into fix-parent-grab
2017-09-26 11:08:40 -07:00
Seth Alves
737b583745
avoid unequipping things during a HMD snap-turn
2017-09-26 11:08:33 -07:00
Dante Ruiz
e397d49564
Merge pull request #11159 from vladest/modal_dialogs_async
...
Modal dialogs async
2017-09-26 11:07:42 -07:00
druiz17
2cc8a55151
fix cloning equiping
2017-09-26 10:37:36 -07:00
Seth Alves
0b60928dd3
fix rollup-to-parent code to only roll up to entity parents
2017-09-25 19:07:40 -07:00
Brad Davis
40c42d35a5
Fix long tablet lag on first load
2017-09-25 17:50:04 -07:00
druiz17
6332a53ee2
able to grab tablet in 3rd person
2017-09-25 16:36:29 -07:00
Seth Alves
5da5b24894
unmangle merge
2017-09-25 15:18:22 -07:00
David Rowe
428efa571e
Merge branch 'master' into vr-edit-a
2017-09-26 10:40:07 +13:00
druiz17
ec40df711d
fix tablet grabbing and eslint changes
2017-09-25 14:31:13 -07:00
druiz17
b1b31444f0
fix mouse visiblity
2017-09-25 11:34:18 -07:00
druiz17
dda20c1ef5
fixing merge conflict
2017-09-25 09:45:29 -07:00
Nissim Hadar
27af4685e7
Added range and altitude to UI.
2017-09-25 09:32:52 -07:00
Seth Alves
5741782f45
merge from upstream
2017-09-25 09:16:43 -07:00
Brad Hefta-Gaub
030da7d850
Merge pull request #11401 from druiz17/module-scale-entities
...
ScaleEntity Module
2017-09-25 09:10:32 -07:00
Seth Alves
90954a4e4f
Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab
2017-09-25 09:09:58 -07:00
Nissim Hadar
1a9625d272
Merge branch 'master' into hazeZone
2017-09-24 18:27:36 -07:00
Nissim Hadar
6cbf087708
First version with combo for Haze Mode.
2017-09-24 15:08:22 -07:00
Zach Fox
921ebc221e
Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled
...
Enable Inspection Mode for all; change Commerce setting name
2017-09-22 17:52:27 -07:00
druiz17
b8ee60a394
fix scripting error
2017-09-22 17:13:48 -07:00
druiz17
2c7b8cdb4f
fixing script issues
2017-09-22 16:26:41 -07:00
druiz17
ee9ac3e7f9
undo unnessary changes
2017-09-22 15:38:39 -07:00
druiz17
28d8af0b44
Merge branch 'master' of github.com:highfidelity/hifi into module-handcontrollerPointer
2017-09-22 15:33:17 -07:00
druiz17
e965b7fff1
hand controller pointer
2017-09-22 15:32:40 -07:00
Zach Fox
0eafdeab14
Fix hover -> unhover overlay behavior
2017-09-22 13:32:11 -07:00
Zach Fox
bb9db3ef6d
Updates to behavior and shader appearance
2017-09-22 11:24:30 -07:00
Nissim Hadar
5e1d470553
WIP
2017-09-22 09:48:22 -07:00
David Rowe
e0658c7a2f
Merge branch 'master' into vr-edit-a
2017-09-22 15:18:14 +12:00
druiz17
53efe6bfb2
working on fix
2017-09-21 18:17:05 -07:00
Anthony J. Thibault
54e627e2c5
Merge branch 'master' into feature/ant-man2
2017-09-21 13:59:47 -07:00
Seth Alves
fc3e259f6f
remove debug prints
2017-09-21 11:42:30 -07:00
Seth Alves
3c22c9ea3a
back out bad change
2017-09-21 11:39:14 -07:00
Zach Fox
57b5a23373
Enable Inspection Mode for all; change Commerce setting name
2017-09-21 11:18:21 -07:00
Seth Alves
24bfb3f3b9
oops
2017-09-21 11:16:00 -07:00
Seth Alves
363a2a3a7a
merge from upstream
2017-09-21 11:08:29 -07:00
Seth Alves
473db92a8e
fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped
2017-09-21 11:07:47 -07:00
Seth Alves
61efaf7fc2
Merge pull request #11420 from druiz17/fix-parenting-overlay-module
...
nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another
2017-09-21 09:44:07 -07:00
druiz17
65e0c99618
small change
2017-09-21 09:07:49 -07:00
druiz17
2d7d6f85ba
fixing merge conflicts
2017-09-21 09:04:13 -07:00
beholder
8085d0292d
7723 Tablet Should Rotate Faster when using Create app
2017-09-21 16:26:54 +03:00
David Rowe
c05ccd2ed5
Merge branch 'master' into vr-edit-a
2017-09-21 14:08:16 +12:00
Anthony Thibault
03e278c5ae
Merge pull request #11416 from druiz17/stylus-pos
...
Pull back the stylus position in hand.
2017-09-20 17:40:22 -07:00
druiz17
2c55419c60
change tablet forward offset
2017-09-20 16:49:45 -07:00
Seth Alves
90c97319ea
Merge pull request #11408 from druiz17/fix-tablet-input
...
fixing/improving and cleanup tablet inputs
2017-09-20 16:36:07 -07:00
druiz17
949c343604
fixing nearGrabParentModule switching grabbed overlays
2017-09-20 15:34:01 -07:00
Thijs Wenker
7ea1968b33
Tip, Code Writer which comes standard with Windows 10, does enter tabs by default when using the tab key. >=)
2017-09-20 14:59:15 -07:00
Thijs Wenker
60a566768a
removed debug spam from makeUserConnection, to reactivate it set Settings.setValue('MAKE_USER_CONNECTION_DEBUG', true); and reload the script
2017-09-20 14:39:13 -07:00
druiz17
92f3dfe2ab
move the stylus back a bit
2017-09-20 14:23:43 -07:00
druiz17
c20c5ee2b5
fixed tablet grabbing issue
2017-09-20 14:10:10 -07:00
