Commit graph

3852 commits

Author SHA1 Message Date
Zach Fox
e1064938cd Add inventory; also fix some bugs 2017-08-11 10:31:32 -07:00
David Rowe
2bf0ea1dff Fix display artifact that occurs when overlay dimension is 0 2017-08-11 22:31:04 +12:00
David Rowe
a96d9ab85b Apply physics toggle button values 2017-08-11 22:11:34 +12:00
David Rowe
ee225e6a8d Implement toggle buttons 2017-08-11 18:23:20 +12:00
David Rowe
401a00441a Merge branch 'master' into vr-edit-a 2017-08-11 15:26:20 +12:00
David Rowe
c82a4d6d56 Layout mockup of Physics options 2017-08-11 13:15:07 +12:00
David Rowe
0b063926b6 Move image slider to Color options 2017-08-11 11:41:33 +12:00
Elisa Lupin-Jimenez
da5bb03187 Trying to add in a back button 2017-08-10 16:34:37 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
David Rowe
821f5de3e3 Further reduce number of Entites.getEntityProperties() calls 2017-08-11 10:20:36 +12:00
David Rowe
c34344161e Improve App object handling 2017-08-11 10:09:52 +12:00
David Rowe
37f57852da Set hand highlight sphere size from grab radius 2017-08-11 09:56:47 +12:00
David Rowe
badd57c165 Tidying 2017-08-11 09:26:05 +12:00
Elisa Lupin-Jimenez
28476960bb Moved Blocks to tablet app 2017-08-10 14:23:45 -07:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2
Fade dissolve effect  JUST AVATARS
2017-08-10 13:48:30 -07:00
howard-stearns
ca13d58b0b blance and inventory stubs 2017-08-10 12:44:50 -07:00
David Rowe
6977c35b6e Reduce number of Entities.getEntityProperties() calls 2017-08-10 22:17:46 +12:00
David Rowe
6d61c188f8 Tighten up grabbing created entity 2017-08-10 21:22:11 +12:00
David Rowe
20c7e17fb6 Tidy up logging 2017-08-10 21:13:40 +12:00
David Rowe
b58cac1c56 Tidying 2017-08-10 17:28:43 +12:00
David Rowe
4b3f7d6614 Reorient Tools menu and slightly adjust Create palette position 2017-08-10 16:46:39 +12:00
David Rowe
a6af6e0bff Add extra color swatches for user tests 2017-08-10 16:27:19 +12:00
David Rowe
594d144210 Finesse sliders to produce values that fully got to 0.0 and 1.0 2017-08-10 15:45:05 +12:00
David Rowe
9442a667b4 Raise sliders on hover 2017-08-10 15:32:48 +12:00
David Rowe
cc64644946 Don't press sliders down when click on them 2017-08-10 15:02:19 +12:00
David Rowe
e1adb3a20e Add image slider (for H, S, V or similar values) 2017-08-10 12:44:30 +12:00
Elisa Lupin-Jimenez
d3c76c99c2 See all markets button working again 2017-08-09 17:28:05 -07:00
Elisa Lupin-Jimenez
69a13052ab commented out blocks injection 2017-08-09 17:23:08 -07:00
Zach Fox
2d256a62a9 Fix marketplaces message passing 2017-08-09 17:04:36 -07:00
Elisa Lupin-Jimenez
74c90d6323 minor typo 2017-08-09 16:08:47 -07:00
Elisa Lupin-Jimenez
a2e407f786 fixed merge conflicts in marketplacesInject.js 2017-08-09 15:59:20 -07:00
David Rowe
397527d3f3 Add image UI element 2017-08-10 10:23:13 +12:00
David Rowe
1aeaee8153 Rename slider to barSlider 2017-08-10 09:04:28 +12:00
Zach Fox
65f9b0052f Working buy button 2017-08-09 13:59:21 -07:00
Sam Gondelman
85c3f94976 Merge branch 'master' into sharks 2017-08-09 13:36:18 -07:00
Howard Stearns
cc634a2d1b Merge pull request #11148 from zfox23/commerce_singleSetting
New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key
2017-08-09 13:25:10 -07:00
SamGondelman
6157f4fa55 script fixes 2017-08-09 11:56:25 -07:00
howard-stearns
1cf81495ab basic commerce infrastructure 2017-08-09 11:50:52 -07:00
Zach Fox
33fa8c4f86 Fix bugs and also change to single setting 2017-08-09 11:44:09 -07:00
Zach Fox
61526256bc Remove personalized comment 2017-08-09 09:30:18 -07:00
LaShonda Hopper
48e327815d [Case 6491] Resolves arg order to centerToZero and centerToIntersection vectors.
Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
2017-08-09 11:38:44 -04:00
David Rowe
1c2d3ced89 Add some further entities to the Create palette 2017-08-09 17:28:28 +12:00
David Rowe
c19ec58220 Halve hand highlight and grab sphere radius 2017-08-09 15:51:37 +12:00
David Rowe
938b09c1a4 Slider display per intersection value 2017-08-09 15:19:25 +12:00
David Rowe
3d4cec63cd Calculate slider value from laser intersection 2017-08-09 14:36:17 +12:00
Elisa Lupin-Jimenez
d599753771 Started blocks download catch, fixed a debug typo 2017-08-08 18:43:35 -07:00
Zach Fox
9d60d5153f Clarifying comment and turn setting off first 2017-08-08 18:00:17 -07:00
Zach Fox
4f85923517 Tons of fixes and improvements! 2017-08-08 17:58:41 -07:00
Zach Fox
b2c5a1f899 Fancy MutationObserver! 2017-08-08 17:12:06 -07:00
David Rowe
c79931106d Add basic element of slider 2017-08-09 12:06:35 +12:00
Elisa Lupin-Jimenez
efd25a5e70 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-08 16:55:10 -07:00
David Rowe
28f9f9e4d0 Add a "Physics" button and panel 2017-08-09 11:02:33 +12:00
Zach Fox
871a5ff1ab Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation 2017-08-08 15:53:22 -07:00
Zach Fox
69fc69cffb Comment fix and overlay click fix 2017-08-08 15:52:59 -07:00
Andrew Meadows
71ba6ba10a Merge pull request #10807 from jmo7/21356
21356 - Reorder Edit.js
2017-08-08 15:15:37 -07:00
Zach Fox
7d26d2d88b Switch and fix overlay clicks 2017-08-08 14:29:44 -07:00
David Rowe
22432671ca Fix newly created entity not being grabbed 2017-08-09 09:26:33 +12:00
Elisa Lupin-Jimenez
1102b27ba1 Fixed merge conflicts with master 2017-08-08 11:47:08 -07:00
SamGondelman
684001a756 workaround deadlock in editRenderState 2017-08-08 11:11:19 -07:00
David Rowe
046ce353fd Fix highlight overlay getting deleted 2017-08-08 21:56:01 +12:00
David Rowe
42284796a1 Remember swatch colors 2017-08-08 21:44:54 +12:00
David Rowe
0b8ea29193 Clear swatch with grip click 2017-08-08 20:37:41 +12:00
David Rowe
f88191b7b3 Merge branch 'master' into vr-edit-a 2017-08-08 16:43:20 +12:00
David Rowe
6621b43fae Make some swatches start with "no color"; color them when clicked 2017-08-08 16:34:45 +12:00
Zach Fox
1493a310af Beginning of stack stuff 2017-08-07 17:02:24 -07:00
Zach Fox
7e922cb2c2 Layout 2017-08-07 16:16:17 -07:00
Zach Fox
517128a939 More steps 2017-08-07 16:03:42 -07:00
Zach Fox
d7dd331685 Bugfixes 2017-08-07 14:39:31 -07:00
Zach Fox
7d4fd995f2 First steps 2017-08-07 14:29:47 -07:00
SamGondelman
489e08aef0 Merge branch 'master' of https://github.com/highfidelity/hifi into sharks 2017-08-07 13:29:00 -07:00
Dante Ruiz
38db4a6f47 fixed create spinner not appearing 2017-08-07 20:03:55 +01:00
Chris Collins
4acccb6ace Merge pull request #11118 from cain-kilgore/chat-char-limit
WL 21493 - Update the Chat.js to indicate when a message is too long
2017-08-07 09:52:57 -07:00
Seth Alves
c570d483d8 Merge pull request #11113 from elisa-lj11/zip_drag
Zip drag (needs review)
2017-08-07 03:17:31 -07:00
David Rowe
1231491a72 Add color picker 2017-08-07 17:29:58 +12:00
Seth Alves
f898a05014 Merge pull request #11122 from ElderOrb/case6760
fix for 6760: Create Mode turns to Portrait when Reopening tablet
2017-08-06 19:02:47 -07:00
David Rowe
5d1732c5aa Merge branch 'master' into vr-edit-a 2017-08-05 20:45:12 +12:00
David Rowe
0f44e36128 Fix buttons sometimes staying pressed 2017-08-05 18:04:39 +12:00
David Rowe
4e87c13020 Tidy group buttons' enabling 2017-08-05 17:52:54 +12:00
David Rowe
bff3ad342d Tidy command and callback handling 2017-08-05 17:37:40 +12:00
David Rowe
e6456ca501 Tidy and fix options handling 2017-08-05 17:08:56 +12:00
SamGondelman
8b1c24e636 added setLockEndUUID, update handControllerGrab and grab 2017-08-04 18:26:11 -07:00
beholder
06c9378b03 fix for 6760: Create Mode turns to Portrait when Reopening tablet 2017-08-05 04:07:04 +03:00
anshuman64
22afb25d44 Capitalize "ENTER VR" 2017-08-04 17:19:26 -07:00
David Rowe
23fab65f27 Tidying 2017-08-05 12:08:36 +12:00
David Rowe
24f36c1ae5 Default current color and remember current color over tool/app toggles 2017-08-05 12:07:33 +12:00
Elisa Lupin-Jimenez
c2cb7573c5 Removed commented out blocks code 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
06ff766952 Drag zip cleaned up, marketplaces stylized, back button fixed 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
9d2be28a8a troubleshooting Blocks injection 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
ca6a323d54 Can drag blocks zip folder into hifi and upload the .obj 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
4570814145 Added Blocks to marketplace window 2017-08-04 16:56:30 -07:00
Elisa Lupin-Jimenez
a7dd6a5a41 Changed marketplaces message to be more discoverable 2017-08-04 16:56:30 -07:00
Cain Kilgore
f79a8b3cb5 Merge branch 'master' of https://github.com/highfidelity/hifi into chat-char-limit 2017-08-04 23:34:44 +01:00
Cain Kilgore
c8ebc299f5 Limited Max Length of the Chat Box to 256 - as this exceeds Message. max. 2017-08-04 23:25:26 +01:00
Brad Hefta-Gaub
8f98d0b7c8 Merge pull request #11114 from ElderOrb/case6677
6677: Change "Desktop" App to Say "Exit VR"
2017-08-04 13:09:47 -07:00
beholder
d05e1677c3 6677: Change "Desktop" App to Say "Exit VR" 2017-08-04 23:04:15 +03:00
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -07:00
David Rowe
ceba5769e0 Apply color to entities when click them 2017-08-04 18:07:42 +12:00
David Rowe
75b481adab Update icon color as current color is changed 2017-08-04 17:52:53 +12:00
David Rowe
d0143c2c19 Add color swatch buttons and "current color" circle 2017-08-04 17:33:00 +12:00
David Rowe
ed497afdc3 Add "Color" tool button, icon, and empty options panel 2017-08-04 14:08:57 +12:00
David Rowe
2237290b2e Add labels to buttons 2017-08-04 13:22:48 +12:00
anshuman64
83e50f894a Merge pull request #11106 from seefo/tracked-objects
Added Vive pucks as an input channel and added new puck-attach script
2017-08-03 17:03:45 -07:00
Howard Stearns
71ce5a6494 Merge pull request #11016 from highfidelity/context-overlays
Context Overlays
2017-08-03 16:28:14 -07:00
seefo
67b5921079 Changed puck-attach to make tracked entities collisionless 2017-08-03 16:01:12 -07:00
seefo
498ac5d0ab Updated version of puck-attach.js 2017-08-03 15:08:06 -07:00
David Rowe
4d8226ac02 Abstract out some common constants missing from the API 2017-08-04 09:23:40 +12:00
David Rowe
110355796c Add delete tool 2017-08-04 08:55:43 +12:00
David Rowe
e2dccc1420 Merge branch 'master' into vr-edit-a 2017-08-04 07:33:18 +12:00
Andrew Meadows
e465186511 Merge pull request #11048 from 1P-Cusack/21389
WL21389 PR1:  Representation of collision shapes need updating (details below).
2017-08-03 09:04:31 -07:00
David Kelly
4b7779f0f5 add flag to outline render flags, fix pal.js/edit.js interaction 2017-08-03 07:57:21 -07:00
David Rowe
e29bed7f07 Don't auto-grab if trigger fully pressed when laser starts intersecting 2017-08-03 20:26:21 +12:00
David Rowe
1ba658ee45 Implement grouping and ungrouping 2017-08-03 19:52:39 +12:00
Brad Hefta-Gaub
0f73496a44 Merge pull request #11055 from misslivirose/fix-chat-bubble-length
Fix chat bubble length
2017-08-02 23:29:09 -07:00
David Rowe
1e1cb3a02e Fix scale tool highlight color 2017-08-03 13:24:38 +12:00
David Rowe
1b866fdf9e Enable/disable grouping buttons depending on current group selection 2017-08-03 13:20:14 +12:00
David Rowe
c4eac1660c Fix app toggling and hand swapping issues 2017-08-03 11:46:05 +12:00
David Rowe
37c1060080 Fix button highlighting and clicking 2017-08-03 11:06:51 +12:00
VRCat\VRKitten
e4e4ead4af 'Untabified' files 2017-08-02 16:56:02 -06:00
seefo
82654c7cda Made requested changed to puck-attach.js 2017-08-02 15:28:26 -07:00
seefo
961f748d87 Fixed a potential bug with puck-attach parenting 2017-08-02 13:08:44 -07:00
seefo
620f1a65c0 New puck-attach script 2017-08-02 13:08:44 -07:00
seefo
106b0ad8bb Added Vive pucks as an input channel 2017-08-02 13:08:43 -07:00
vladest
638eeede43 Merge conflict 2017-08-02 20:07:06 +02:00
Elisa Lupin-Jimenez
c03c1c80e1 Drag zip cleaned up, marketplaces stylized, back button fixed 2017-08-02 10:51:40 -07:00
Elisa Lupin-Jimenez
eb1fb1a1e1 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-02 08:28:55 -07:00
vladest
2d4396ac8e Merge branch 'master' into fix_toolbar_apps_switch 2017-08-02 16:34:49 +02:00
vladest
4330e31212 Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create 2017-08-02 16:32:09 +02:00
David Rowe
25bbdba987 Add Tool menu options panels, in particular grouping buttons 2017-08-02 22:17:02 +12:00
David Rowe
83f580c514 Generalize Tool menu UI 2017-08-02 19:07:11 +12:00
David Rowe
fb1284ad61 Clear grouping selection when choose another tool 2017-08-02 16:12:49 +12:00
David Rowe
53d755d8da Clear grouping selection when drop tool 2017-08-02 14:45:19 +12:00
David Rowe
26a14d0934 Swap button and tool icon colours to match grouping highlights 2017-08-02 14:41:42 +12:00
David Rowe
65e57a9262 Highlight grouping entities 2017-08-02 14:38:26 +12:00
Anthony J. Thibault
1b6feb63c8 Fix for crash when attempting to teleport while avatar was loading
The fix had two parts.
  * Make Avatar::getAbsoluteDefaultJointXXXInObjectFrame thread safe
  * Make teleport.js handle a zero foot offset more gracefully, to prevent the avatar from teleporting into the floor.
2017-08-01 18:40:43 -07:00
David Rowe
c686cef4a0 Collect grouping data 2017-08-02 13:15:53 +12:00
David Rowe
7e1584a43e Add grouping state 2017-08-02 12:27:02 +12:00
David Rowe
6d90b6d0fd Simplify trigger click usage 2017-08-02 11:49:10 +12:00
David Kelly
6ae516c46a Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 15:45:34 -07:00
Seth Alves
b9456ab7b6 Merge pull request #11081 from Menithal/21464
Fixed Particle Editor Update event
2017-08-01 15:11:33 -07:00
Seth Alves
184c3d855d Merge pull request #11061 from TurnMeUp-OG/21470
Fix tablet focus issue when property menu is open and field is selected
2017-08-01 15:10:26 -07:00
David Rowe
a94b2b367b Simplify grip click handling 2017-08-02 09:16:24 +12:00
David Rowe
12d911f290 Add "group" bool button and icon 2017-08-02 08:41:53 +12:00
humbletim
3a9b8c02a6 * disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror"
* restore access to "View > Mirror" from HMD mode
2017-08-01 13:41:28 -04:00
David Rowe
f2cf2cab6e Generalize tool selected 2017-08-01 16:02:04 +12:00
David Rowe
ca7c747c96 Create entities at hand position rather than in front of avatar 2017-08-01 11:46:22 +12:00
David Rowe
59dc5ec3b8 Refactor tool buttons 2017-08-01 10:20:55 +12:00
David Kelly
bd7c4b3b26 Merge remote-tracking branch 'upstream/master' into context-overlays 2017-07-31 13:14:53 -07:00
Menithal
6020154867 Removed some whitespaces to trigger new build 2017-07-31 22:49:11 +03:00
Elisa Lupin-Jimenez
b2161e433c Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-07-31 09:54:21 -07:00
Liv Erickson
ed9ea17917 remove semi-colon 2017-07-31 08:02:18 -07:00
Olivier Prat
490aad2a06 Merged from master 2017-07-31 12:00:35 +02:00
Matti Lahtinen
5fab6c37a3 Removed stray variable test 2017-07-31 08:56:04 +03:00
David Rowe
ab8bccf16b Implement cloning action 2017-07-30 11:03:19 +12:00
Menithal
734330dc06 Fixed Particle Editor Update event
Particle Editor was agressively refreshing when ever a particle was be
ing up dated

Added a flag check to make sure the particle was always using the latest
version
2017-07-29 15:48:31 +03:00
David Rowe
48ee7a3b1a Add icon for clone tool 2017-07-29 17:39:23 +12:00
David Rowe
18a9dad918 Add button for clone tool 2017-07-29 17:15:33 +12:00
David Rowe
676deb8a5c Make grip naming consistent with trigger naming 2017-07-29 16:16:48 +12:00
David Rowe
1d500dd3aa Use dominant hand setting and handle setting changes 2017-07-29 16:10:48 +12:00
David Rowe
30595c78a0 Fix button not unpressing when cursor moves off it 2017-07-29 14:51:58 +12:00
David Rowe
52a2538d73 Fix scale handles not displaying after delete entity 2017-07-29 14:41:58 +12:00
David Rowe
9f90960a12 Make grip press discard tool 2017-07-29 13:31:08 +12:00
David Rowe
f4b2e399ef Fix multiple and malingering tool icons 2017-07-29 12:54:21 +12:00
David Rowe
c201e7b65a Display placeholder for tool icon on dominant hand 2017-07-29 10:59:15 +12:00
David Rowe
2a654b3657 Merge branch 'master' into vr-edit-a 2017-07-29 08:34:58 +12:00
Andrew Meadows
d4e72df928 Merge pull request #10711 from burtsloane/midi
Midi support for Entities
2017-07-28 10:51:43 -07:00
Elisa Lupin-Jimenez
fcaebda04c troubleshooting Blocks injection 2017-07-28 10:21:03 -07:00
David Rowe
64f5fe4009 Make Create palette a separate object 2017-07-28 10:36:54 +12:00
David Rowe
9fe3a823ee Fix unexpectedly deleting multiple entities 2017-07-28 09:35:29 +12:00
David Rowe
21c15120ba Raise Tool menu up a little to accommodate wooden mannequin's hand 2017-07-28 09:24:15 +12:00
jmo
003c483ec6 stray tabs changed to spaces, and long comment split to multiple lines 2017-07-27 15:21:58 -06:00
David Rowe
01f37b53e9 Fix non-dominant hand ciursor dot showing when it shouldn't 2017-07-28 09:20:21 +12:00
SamGondelman
e3288a9004 fix flicker, scissor warning, and handControllerGrab sphere size 2017-07-27 11:17:30 -07:00
Elisa Lupin-Jimenez
1c640cf37b Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-07-27 10:00:17 -07:00
David Rowe
52bb4a0f77 Merge branch 'master' into vr-edit-a 2017-07-27 20:37:46 +12:00
Chris Collins
ef67029837 Merge pull request #10912 from amvmoody/21374
WL 21374: Allow lights/particles to be dragged by icon
2017-07-26 22:07:36 -07:00
David Rowe
86f33727eb Add prototype Create palette 2017-07-27 16:53:15 +12:00
David Rowe
e8c5e1c2d5 Make the button move down when pressed 2017-07-27 16:05:32 +12:00
David Rowe
3b111b85ef Move UI to hand 2017-07-27 15:56:42 +12:00
David Rowe
573a49853a Tidying 2017-07-27 15:09:22 +12:00
David Rowe
136ea78873 Use overlays instead of entities 2017-07-27 13:47:35 +12:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
SamGondelman
5e4a83dad9 defaultRenderStates, handControllerGrab.js, fix teleport.js a little 2017-07-26 17:58:39 -07:00
Zach Fox
8a7561d61b IT'S WORKING SOB SOB SOB 2017-07-26 16:35:55 -07:00
Zach Fox
39cb0bc357 WHYYYY DOESN'T THIS WORK 2017-07-26 16:14:35 -07:00
Elisa Lupin-Jimenez
9cfc4dc91b Can drag blocks zip folder into hifi and upload the .obj 2017-07-26 15:21:39 -07:00
Zach Fox
1336a59b6c Stupid bracket 2017-07-26 15:14:58 -07:00
Zach Fox
17c7e38fce Bugfixes? 2017-07-26 15:02:52 -07:00
Zach Fox
3a05219c59 Closer still 2017-07-26 14:10:41 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Liv
256853f79b syntax and clarification on magic number 2 as half height 2017-07-26 13:28:52 -07:00
Liv
5bd6dac66c wrap text if longer than 1m text entity 2017-07-26 13:24:56 -07:00
Zach Fox
65c28ca821 Bugfixes 2017-07-26 13:17:51 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
utkarshgautamnyu
71ddf1e7c1 Removed Compound Collision type 2017-07-26 10:20:17 -07:00
scromie@turnmeupgames.com
33ff5917be fix 2017-07-26 19:34:20 +03:00
David Rowe
6203a1ad68 Wire up button to toggle scale-with-hands / scale-with-handles 2017-07-26 22:41:38 +12:00
David Rowe
d4b872d9e1 Detect button press 2017-07-26 22:30:52 +12:00
David Rowe
3566609173 Highlight button as it is hovered 2017-07-26 21:34:13 +12:00
David Rowe
52759be618 Don't transition laser length when start intersecting UI 2017-07-26 20:40:12 +12:00