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
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
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
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
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
druiz17
2ce6dcf89d
fixing spelling error
2017-09-20 11:45:42 -07:00
druiz17
5d87036f32
make changes requests and slight fixes
2017-09-20 11:41:31 -07:00
vladest
c17ca955db
Listener disconnects in C++ now
2017-09-20 20:03:53 +02:00
Daniela
8144841258
Add Edit.js Entities spawn up according to the orientation of the avatar.
2017-09-20 09:21:16 -07:00
Anthony J. Thibault
0873b88347
code review feedback
2017-09-20 09:21:15 -07:00
druiz17
e78d8bc132
tablet on wiki planet
2017-09-20 09:11:06 -07:00
druiz17
9c66a25d83
fixing and cleanup tablet inputs
2017-09-19 17:03:53 -07:00
vladest
67771bc297
Merge branch 'master' into modal_dialogs_async
2017-09-19 21:51:02 +02:00
druiz17
e2921661e9
scaling entities
2017-09-19 09:35:22 -07:00
David Rowe
c56fda88fa
Merge branch 'master' into vr-edit-a
2017-09-19 16:17:04 +12:00
druiz17
9df3b6c211
change tablet spawn position
2017-09-18 13:29:05 -07:00
Anthony J. Thibault
0757f513af
Merge branch 'master' into feature/ant-man
2017-09-18 11:36:39 -07:00
vladest
5585265349
Merge branch 'master' into modal_dialogs_async
2017-09-16 22:06:49 +02:00
Seth Alves
765031bf89
Merge pull request #11377 from vladest/create_resize
...
Add resizable flag. Use the flag for Create only
2017-09-16 11:14:40 -07:00
Seth Alves
095cd03ee2
Merge pull request #11380 from ctrlaltdavid/fix-controller-typos
...
Fix typos in controller modules disabler
2017-09-16 11:13:15 -07:00
vladest
5b033e021a
Merge branch 'master' into modal_dialogs_async
2017-09-16 12:30:07 +02:00
David Rowe
e788f691c4
Merge branch 'master' into vr-edit-a
2017-09-16 15:59:08 +12:00
David Rowe
6c5a1c0460
Address laser and controller interactions with HUD overlays and tablet
2017-09-16 15:45:44 +12:00
David Rowe
18b71f0c0f
Fix typos in controller modules disabler
2017-09-16 15:34:53 +12:00
vladest
de4f34aacb
Add resizable flag. Use the flag for Create only
2017-09-15 21:49:38 +02:00
Seth Alves
0816a8af27
fix grab entity methods
2017-09-15 12:07:50 -07:00
Seth Alves
b67c571aaa
fix grab entity methods
2017-09-15 12:05:49 -07:00
Seth Alves
df80b7ecfa
stopNearTrigger, not end
2017-09-15 11:16:54 -07:00
Seth Alves
39e6605f6f
fix grab entity methods + jshint cleanups
2017-09-15 10:50:46 -07:00
Anthony J. Thibault
f534ee5ad9
laser offset fix
2017-09-14 16:37:45 -07:00
David Rowe
b0c951a2c4
Merge branch 'master' into vr-edit-a
2017-09-15 11:09:39 +12:00
Thijs Wenker
af4bc59307
clone local avatar entities
2017-09-14 23:31:51 +02:00
vladest
0bfa29d0d4
Merge branch 'master' into modal_dialogs_async
2017-09-14 20:21:29 +02:00
Anthony J. Thibault
7959988622
Merge branch 'master' into feature/ant-man
2017-09-14 10:37:45 -07:00
Anthony J. Thibault
7c725756f1
IPD Fixes for controllerDispatcher and controllerModules
2017-09-14 10:36:05 -07:00
David Rowe
299a8078e3
Revert handControllerGrab.js related changes
2017-09-14 17:08:26 +12:00
Anthony J. Thibault
9a9f4a0d24
Fix controllerModules with appropriate IPD scale changes
2017-09-13 18:23:54 -07:00
Anthony J. Thibault
8fb69a9867
Merge branch 'master' into feature/ant-man
2017-09-13 18:23:11 -07:00
Anthony J. Thibault
745d2ff395
Remove handControllerGrab.js, see controllerDispatcher.js instead.
2017-09-13 17:36:56 -07:00
David Rowe
a4ecb69ea6
Merge branch 'master' into vr-edit-a
2017-09-14 12:26:20 +12:00
druiz17
1b288ef860
make garbbing radius the same as master
2017-09-13 16:15:36 -07:00
Anthony J. Thibault
a505a16232
Don't rescale tablet, in desktop mode, when sensorToWorldScale changes.
2017-09-13 14:22:49 -07:00
Anthony J. Thibault
ae2d0e89b4
Fixes for desktop tablet
2017-09-13 14:18:00 -07:00
Anthony J. Thibault
de5f0ad987
WebTablet.js: calcSpawnInfo works more consistently.
2017-09-13 12:01:41 -07:00
Anthony J. Thibault
9a1fa9b2f2
Fix for stylus intersection with tablet and home button for scaled tablets
2017-09-13 09:52:20 -07:00
druiz17
b3ff5c86f7
fixed secondary triggers and chest lid
2017-09-12 14:43:06 -07:00
Dante Ruiz
d90f6320a9
Merge pull request #8 from sethalves/controller-dispatcher-1
...
Controller dispatcher 1
2017-09-12 10:54:10 -07:00
druiz17
b634292261
fixing some small issues
2017-09-12 10:53:04 -07:00
Seth Alves
e9918ca599
add profiling to controller-dispatcher
2017-09-12 10:52:52 -07:00
Seth Alves
a9aa6df93e
Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1
2017-09-12 10:44:29 -07:00
Seth Alves
315f874824
add profiling to controller-dispatcher
2017-09-12 10:44:09 -07:00
Seth Alves
2850029f26
add profiling to controller-dispatcher
2017-09-12 10:00:32 -07:00
Anthony J. Thibault
bb5e808051
Fix for some of tablet size issues, on switching domains.
2017-09-11 18:59:52 -07:00
druiz17
684aef23dc
Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1
2017-09-11 15:08:37 -07:00
druiz17
a46e41607c
fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown
2017-09-11 15:07:14 -07:00
Seth Alves
9c098f1a0c
Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1
2017-09-08 17:10:02 -07:00
druiz17
405d8c3afc
fixing cloning and laser
2017-09-08 17:07:27 -07:00
Seth Alves
a1ffc7abd0
distance from controller to object is sometimes decided by pickray
2017-09-08 17:04:09 -07:00
druiz17
42ef397b5e
fixed include path
2017-09-08 15:13:19 -07:00
Anthony J. Thibault
72e0c844e4
Merge branch 'master' into feature/ant-man
2017-09-08 14:08:26 -07:00
druiz17
e33012e522
laser on tablet update
2017-09-08 13:30:30 -07:00
druiz17
dbb91e5953
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-08 11:50:43 -07:00
druiz17
f0c12e50dd
some small bug fixes
2017-09-08 11:50:19 -07:00
Daniela
e453bf8d55
Refactoring.
2017-09-08 17:58:16 +01:00
Daniela
08688dc9ed
Refactoring.
2017-09-08 17:56:11 +01:00
Daniela
758f049f30
Correct offset for teleport pad.
2017-09-08 14:02:26 +01:00
Daniela
10e29d1cf0
Decrease offset for teleport pad. Add Bubble orientation and scale correction.
2017-09-08 12:45:29 +01:00
David Rowe
03ddf04140
Merge branch 'master' into vr-edit-a
2017-09-08 16:51:12 +12:00
Anthony J. Thibault
d0f9a20a01
Fix for tablet grabbing at small scales
2017-09-07 15:10:15 -07:00
druiz17
ef050a09f9
made requested changes and also allow entities/overlays to be grabbed by the grip button
2017-09-07 14:42:46 -07:00
Brad Hefta-Gaub
b316f366fc
Merge pull request #11198 from druiz17/oculus-tablet-position
...
fixed tablet spawn position for oculus menu button
2017-09-07 12:30:33 -07:00
Brad Hefta-Gaub
fce8715457
Merge pull request #11306 from ElderOrb/case7385
...
7385 - Collect Stats on "Exit VR" button
2017-09-07 10:18:58 -07:00
druiz17
636e906191
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-06 17:15:18 -07:00
druiz17
cc7a222374
fixing Hifi-Hand-Drop for equipEntity
2017-09-06 17:15:05 -07:00
David Rowe
83a8cb5fe0
Merge branch 'master' into vr-edit-a
2017-09-07 10:53:41 +12:00
druiz17
0d66bfca05
added far trigger
2017-09-06 14:58:04 -07:00
Daniela
0ac7e00612
Add Avatar resize compatible teleport.js pad scale
2017-09-06 19:45:03 +01:00
Dante Ruiz
a5553d5e1c
fixed text scale for notifications
2017-09-06 09:26:48 -07:00
Dante Ruiz
b4f7cb961a
Merge branch 'feature/ant-man' of github.com:hyperlogic/hifi into feature/ant-man
2017-09-06 08:38:08 -07:00
Dante Ruiz
15c853567d
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-06 08:34:28 -07:00
David Rowe
52bf8ac9a1
Merge branch 'master' into vr-edit-a
2017-09-06 13:33:33 +12:00
David Rowe
6838461b07
Display notification message when don't have rez permissions
2017-09-06 12:44:57 +12:00
Anthony J. Thibault
af8b147321
away.js - works better with sensor scale.
2017-09-05 17:34:35 -07:00
Dante Ruiz
a34dae4aad
adding scale to notifications
2017-09-05 17:12:40 -07:00
