Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 01:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58840 commits 25 branches 0 tags 1.1 GiB
Commit graph

3852 commits

Author SHA1 Message Date
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
David Rowe
8dceb3cc6c Show laser dot on UI even if trigger isn't squeezed 2017-07-26 17:26:43 +12:00
David Rowe
194a82974b Make laser dot a minimum size commensurate with near laser beam width 2017-07-26 15:53:34 +12:00
David Rowe
0f2176127e Fix locations of dominant hand settings and update setup 2017-07-26 15:41:16 +12:00
David Rowe
bf69402219 Laser intersect but don't highlight non-editable entities 2017-07-26 15:31:54 +12:00
Elisa Lupin-Jimenez
adda4f0598 Added Blocks to marketplace window 2017-07-25 18:36:39 -07:00
Zach Fox
9020607ccf First pass 2017-07-25 17:54:46 -07:00
utkarshgautamnyu
65192aa620 added additional collision types to asset browser and new model dialog 2017-07-25 17:12:13 -07:00
Leander Hasty
d155c02640 [WL21389] wip and modifications based on comments 
https://github.com/highfidelity/hifi/pull/11024#pullrequestreview-51611518

Cleans up tabs, moves new functionality out of ShapeFactory directly to
RenderableShapeEntityItem's computeShapeInfo override, begins to break down
where we will need pointlists.

Still need to determine how rotation is handled for pointlists, and check
for axis alignment on cylinders before deciding on a shape.

Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/physics/src/ShapeFactory.h
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/entitySpawner.js
 2017-07-25 15:20:35 -04:00
LaShonda Hopper
75403124b6 [WL21389] Addresses physics library dependency and has some other fixes (details below). 
* Addresses physics library dependency by moving computeShapeInfo override from
ShapeEntityItem (which is within Entities Library) to RenderableShapeEntityItem
(which is in Entities-Renderer Library).
** Entities-Renderer library already links against the physic library.
** Per discussion with Andrew Meadows: In order to ShapeEntityItem to be
utilized the library dependency between the Entity and Physics library
would need to be resolved to avoid the cyclical reliance which isn't in
the scope of this ticket.
* Updates shapeSpawner test script from the default clone of basicEntityTest\entitySpawner.js
** Objects now have a finite lifetime
** Script now cleans up the objects created when the script ends
** Also moved some adjustable properties out into var aliases at the top of the
file for easier/less error prone tweaking. Should probably add one for the shapeType.
* Fixes some issues with validateShapeType helper function
* Removed naive attempt at including physics library within entities library.
* Transferred some todos from notes
* Fixed some formatting

NOTE(s):
  This compiles and runs.  Cylinder is spawned and treated as CYLINDER_Y.

TODO(s):
* Add tweakable var for shapeType within shapeSpawner.js
* Vet and verify other shapes.
* Add in edge case handling.
* Add in support for other shapes to ShapeInfo infrastructure.

Changes to be committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/shapeSpawner.js
 2017-07-25 14:43:39 -04:00
LaShonda Hopper
5bc38bd7f0 [WL21389] Collision Shapes need to be updated (details below). 
Revised approach involves creating a helper function within ShapeFactory to aid
in devising the ShapeType to be used by an ShapeEntityItem for collision.  The
ShapeFactory is currently doing this for creating the actual Bullet Library
collision shapes.

ShapeEntityItem overrides its virtually inherited computeShapeInfo which
in turn calls the new ShapeFactory helper function.

ShapeEntityItem has a new memvar _collisionShapeType to cache its actual
ShapeType used by the physics system.  This memvar is returned via the getShapeType
accessor which is expected to return an object's ShapeType.

Note(s):
    This is similar to the original approach save translation between entity::Shape and ShapeType
    isn't tied to the EntityItemProperties shapeTypeNames or shapeType. This approach more
    directly solves the issue of getting the actual ShapeType used by the time it's needed
    to determine the bullet collision object type created when initializing the physic information.

    Translation of the ShapeEntityItem's entity::Shape to its ShapeType is handled by
    ShapeFactory which handles creating the bullet collision objects when setting up
    physics on the ShapeEntityItems.

Known Issue(s):
    This doesn't compile.  It appears that the Entity Library needs to know about
    the Physics Library.  The naive attempt at providing that link failed to resolve
    all compilation issues.

    Current Error:
    C1083: Cannot open include file: btBulletDynamicsCommon.h:
    No such file or directory (C:\projects\cusack\libraries\entities\src\ShapeEntityItem.cpp)
       C:\projects\cusack\libraries\physics\src\ShapeFactory.h	15	1	entities

	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/CMakeLists.txt
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/physics/src/ShapeFactory.h
	modified:   libraries/physics/src/ShapeInfo.cpp
	modified:   scripts/developer/tests/basicEntityTest/entitySpawner.js
	new file:   scripts/developer/tests/basicEntityTest/shapeSpawner.js
 2017-07-25 14:43:07 -04:00
Elisa Lupin-Jimenez
f128dce185 Changed marketplaces message to be more discoverable 2017-07-25 10:16:05 -07:00
Zach Fox
40038ce54b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-25 09:33:07 -07:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
David Rowe
450badf023 Merge branch 'master' into vr-edit-a 2017-07-25 12:21:49 +12:00
Mike Moody
036a16c0b3 readded line that caused colflict. 2017-07-24 16:51:23 -07:00
Mike Moody
697830b80b Merge branch 'master' of git://github.com/highfidelity/hifi into 21374 2017-07-24 16:50:38 -07:00
Mike Moody
4c78fba2cc Removed line that caused colflict. 2017-07-24 16:50:33 -07:00
Chris Collins
8b978beb31 Merge pull request #11022 from 1P-Cusack/21463 
WL21463 - entitySelectionTool: use multiarg findRayIntersection inste…
 2017-07-24 15:13:21 -07:00
Mike Moody
7de164f1ab moved below a check that returns. 2017-07-24 15:06:45 -07:00
Zach Fox
223ed5b59a Hack to mod tablet orientation when clicking context overlay 2017-07-24 14:29:06 -07:00
Mike Moody
a4585b9400 Merge branch 'master' of git://github.com/highfidelity/hifi into 21374 2017-07-24 13:31:27 -07:00
milad
1ce1204a64 WORKLIST ISSUE # 21471 : FIX PARENT JOINT IN EDIT JS 
In entityPropeties.js
line #1079 says:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex'));

The problem should be fixed by changing it to:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex', 0));

createEmitNumberPropertyUpdateFunction() is parsing the value as a
float to a default decimal position of 4. Looks like it only accepts
integers. By adding in that 0 as a second argument, it should coerce the
value to one that will be recognized by the UI/backend.
 2017-07-24 10:06:44 -05:00
David Rowe
72e3c9a881 Insert UI handling between input updates and editor actions 2017-07-24 16:59:34 +12:00
David Rowe
51522edd94 Separate out input objects from editor object 2017-07-24 16:32:10 +12:00
David Rowe
1f244fb487 Better way of handling grip click 2017-07-24 15:25:00 +12:00
David Rowe
4353400d23 Fix null state transition 2017-07-22 17:55:00 +12:00
David Rowe
a7f7a2c401 Add representative Tool menu UI elements 2017-07-22 17:47:49 +12:00
David Rowe
9cb8aea4fd Make grip click delete selection 2017-07-22 13:06:15 +12:00
David Rowe
44fe60ddda Stub dominant hand setting support 2017-07-22 11:47:14 +12:00
David Rowe
233655b76b Split script into multiple files 2017-07-22 11:20:17 +12:00
Andrew Meadows
bec7f7c644 Merge pull request #11010 from druiz17/bug-tablet-third-person 
You can now properly grab and move the tablet in third person
 2017-07-21 13:33:55 -07:00
David Kelly
9c0026bf69 make sure context overlays are on after pal is dismissed 2017-07-21 08:40:12 -07:00
Leander Hasty
26cc8134eb WL21463 - entitySelectionTool: use multiarg findRayIntersection instead of editOverlay. 
We're seeing the ignoreRayIntersection flag not take effect before findRayIntersection calls.  This may be due to editOverlay and editOverlays becoming non-blocking in 1f7d2b2 .

This altered the flow in mousePressEvent significantly; the first block, intended to handle scale/clone only, started handling rotation (should have been second block) and sometimes selection (should have been third block).

Similarly, in the various rotate grabbers' onMove methods, the pickRay will no longer intersect anything other than rotateOverlayTarget; this avoids some awful behavior when scrubbing over the size and clone grabbers.

This also reverts unnecessary parts of the prior commits to keep the diff for this WL cleaner, and adds a few TODO comments to revisit about redundant statements and incorrect names.

In addition, we've noticed but not fixed herein:

* There is a minor edgecase near 0 and 180, where it's difficult to get within a degree or two of the poles occasionally.
* The scale/clone grabbers don't stay disappeared for rotation in some cases.  This doesn't impact usability anymore, but it'd be nice to determine why they come back when they hide briefly.
* The addGrabbers for yaw/pitch/roll could be deduplicated, and yaw has some multiselect "reposition" enable/disable logic that pitch and roll lack.

Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>
 2017-07-21 10:56:24 -04:00
David Kelly
6db2e2c6c9 Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-21 07:18:33 -07:00
Olivier Prat
7bc7b1eabc Merge branch 'master' of git://github.com/highfidelity/hifi into fade2 2017-07-21 09:27:30 +02:00
David Rowe
7e4e68ccf9 Fix highlight overlay sometimes being out of position 2017-07-21 14:52:24 +12:00
David Rowe
f858abcf7c Resume app from idle state 2017-07-21 14:31:15 +12:00
David Rowe
218b13b0e9 Turn off laser when grabbing or scaling with hand 2017-07-21 14:17:50 +12:00
David Rowe
1434f98dab Fix multi-selection scale handles box after toggling while grabbed 2017-07-21 13:49:26 +12:00
David Rowe
cf51c546d3 Fix direct scaling scale and position 2017-07-21 13:43:20 +12:00
David Rowe
e09113fef5 Fix handle scaling down to very small dimensions 2017-07-21 13:18:10 +12:00
David Kelly
5cd05da31e strict comparisons 2017-07-20 15:16:40 -07:00
Zach Fox
3698fe9b6b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-20 15:10:06 -07:00
SamGondelman
5de0970365 put back ignoredEntities functionality in teleport 2017-07-20 14:17:52 -07:00
rick@ghostpunch.com
52c8d77d8e Merge branch 'master' of git://github.com/highfidelity/hifi into jh21402 2017-07-20 17:03:46 -04:00
rick@ghostpunch.com
451b7ec1de Revert the role name filter change as it has already been added to the repo 2017-07-20 17:01:02 -04:00
SamGondelman
c7f0f03fce expanded RayPick JS API 2017-07-20 13:53:39 -07:00
Zach Fox
46d09a12fe Fix bug where overlay would get stuck 2017-07-20 13:26:43 -07:00
Zach Fox
e18fec140a Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_improvements2 2017-07-20 13:03:34 -07:00
David Kelly
f365ce8abd typo 2017-07-20 12:58:06 -07:00
rick@ghostpunch.com
2b9da2bcba Fix another typo. Sigh... 2017-07-20 15:44:59 -04:00
rick@ghostpunch.com
cc0ed9ead4 Corrected typo in role name search filter. Removed commented out debug print 2017-07-20 15:26:12 -04:00
SamGondelman
d156680bc8 ignore/include by ID, simplified caching logic 2017-07-20 12:15:06 -07:00
Zach Fox
f515a24568 UX improvements 2017-07-20 12:00:13 -07:00
Atlante45
c0da0cb439 Update sit script in the repo 2017-07-20 11:56:41 -07:00
David Kelly
b7be727b4c turn off ContextOverlay for pal, edit. Improve clicks too 2017-07-20 11:30:55 -07:00
Dante Ruiz
3805228b70 fixed grab the tablet in third person 2017-07-20 16:26:51 +01:00
David Rowe
e2cace2372 Fix laser not turning off when lose controller tracking 2017-07-20 22:29:13 +12:00
David Rowe
da97662ee1 Make hovered handles brighter 2017-07-20 22:23:48 +12:00
David Rowe
1009b67600 Fix unhandled state condition 2017-07-20 21:38:03 +12:00
David Rowe
3b966072a3 Fix grabbing a handle without hovering entity beforehand 2017-07-20 21:30:39 +12:00
David Rowe
571d10fa89 Improve editor state update code 2017-07-20 21:05:21 +12:00
David Rowe
880a711d2b Prevent invalid direct / handle scaling transition while scaling 2017-07-20 18:36:02 +12:00
David Rowe
5551bb70d4 Disable collisions and dynamic behavior while entities are being moved 2017-07-20 18:33:23 +12:00
SamGondelman
bf243d6025 lockEnd, editRenderState, and updated grab.js 2017-07-19 17:45:21 -07:00
Zach Fox
2dc3844116 Improve reliability of hand lasers; increase size of target 2017-07-19 17:07:57 -07:00
Zach Fox
c866bd814d Make clicks work right 2017-07-19 12:24:20 -07:00
SamGondelman
c6b3f69db0 teleport third eye laser on invalid hand pose 2017-07-19 11:51:31 -07:00
Zach Fox
1d26a268c1 Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay 2017-07-19 09:53:51 -07:00
Mike Moody
c56450b986 Moved function to a differnt location that handles both mouse and controller inputs. 2017-07-19 01:49:39 -07:00
David Rowe
c57b51235e Merge branch 'master' into vr-edit-a 
# Conflicts:
#	scripts/system/controllers/handControllerGrab.js
 2017-07-19 18:56:04 +12:00
David Rowe
2bd3f87d73 Tidying 2017-07-19 18:11:45 +12:00
David Rowe
e4123070c4 Add handle scaling of multiple entities 2017-07-19 18:10:39 +12:00
David Rowe
f1fd6264f3 Fix handle scaling entity with non-center registration point 2017-07-19 17:51:36 +12:00
David Rowe
5cb5c71966 Avoid bounding box center calcs 2017-07-19 16:33:05 +12:00
David Rowe
ce6e711f2d Fix old scale handles displaying when switch hands 2017-07-19 12:12:20 +12:00
Zach Fox
761d35d633 Getting there! 2017-07-18 17:10:23 -07:00
David Rowe
0f64da23bd Improve debug 2017-07-19 12:09:52 +12:00
Zach Fox
82111a8f6a Timer for hand controller lasers 2017-07-18 16:40:18 -07:00
Zach Fox
8f6af3a1ab ContextOverlay 2017-07-18 16:28:24 -07:00
Zach Fox
265f978a06 It's working! 2017-07-18 15:57:26 -07:00
Dante Ruiz
b3ec306063 better version 2017-07-18 23:48:21 +01:00
Dante Ruiz
8cbe63f296 removed search laser in edit mode for 2d mode 2017-07-18 22:45:54 +01:00
Zach Fox
2b1a0921da Initial work on clickable overlays 2017-07-18 14:01:16 -07:00
Brad Hefta-Gaub
d94365cc44 Merge pull request #10979 from zfox23/hoverOverlay_lasers 
Create/Destroy Hover Overlays using hand controller lasers
 2017-07-18 08:44:48 -07:00
Brad Hefta-Gaub
0d504e57a9 Merge pull request #10984 from druiz17/bug/tablet-position 
trying new tablet spawn position.
 2017-07-18 08:07:56 -07:00
Andrew Meadows
5f4df0da2b Merge pull request #10847 from AndrewMeadows/entitymap 
faster EntityItem lookup by EntityItemID
 2017-07-18 08:04:37 -07:00
David Rowe
787815e939 Merge branch 'master' into vr-edit-a 2017-07-18 20:53:48 +12:00
David Rowe
4c98cd26a4 Fix corner handle scaling 2017-07-18 20:48:16 +12:00
David Rowe
3d69e240a9 Fix entity losing previous scale when resume direct scaling 2017-07-18 20:29:41 +12:00
David Rowe
485190456d Update handles when scale 2017-07-18 20:29:02 +12:00
David Rowe
718d7a1120 Scale with handles first pass 2017-07-18 16:59:54 +12:00
Zach Fox
67c8ddfd57 Merge in changes from laser PR 2017-07-17 17:09:40 -07:00
Dante Ruiz
f5abb4a090 trying new tablet position spwan 2017-07-17 23:18:16 +01:00
Zach Fox
a37f0137e7 Destroy overlays when trigger released 2017-07-17 14:29:43 -07:00
SamGondelman
197ba83b10 remove old_teleport 2017-07-17 13:46:23 -07:00
Zach Fox
974dff36b0 Make hover overlays work for hand controller lasers 2017-07-17 13:16:53 -07:00
SamGondelman
ae99be0350 added faceAvatar and centerEndY, working on updating teleport.js, style fixes 2017-07-17 13:07:42 -07:00
David Rowe
74dccace6a Grab handles state while scaling with handles 2017-07-17 21:57:32 +12:00
David Rowe
22422f3059 Scaling with handles state and transitions 2017-07-17 21:29:37 +12:00