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

3794 commits

Author SHA1 Message Date
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
Olivier Prat
9e9c0aff65 Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape 2017-07-17 09:59:59 +02:00
David Rowe
cb894ccbcb Display and hover sizing handles 2017-07-17 18:02:35 +12:00
David Rowe
1ad3041bae Direct scaling 2017-07-17 15:33:39 +12:00
David Rowe
7b3956df28 Grabbing state 2017-07-17 12:05:36 +12:00
David Rowe
cb827d9e85 Idle, searching, and highlighting states 2017-07-17 11:10:50 +12:00
David Rowe
ae1b6e20f2 Clear out state code for rework 2017-07-17 09:20:38 +12:00
Andrew Meadows
9584035aa4 Merge pull request #10886 from 1P-Cusack/21420 
[Worklist #21420] Implement Create button disabled state (details below).
 2017-07-14 10:06:45 -07:00
David Rowe
c422eaec11 Move laser functionality into Laser object 2017-07-14 18:12:13 +12:00
David Rowe
35e8e7762f Move hand intersection into Hand object 2017-07-14 15:35:03 +12:00
David Rowe
2acb7335f1 Move hand functionality into new Hand object 2017-07-14 14:37:54 +12:00
David Rowe
0506f516d4 Rename Hand to Editor 2017-07-14 12:54:08 +12:00
David Rowe
85c5b8778a Simplify left/right side value handling 2017-07-14 12:45:19 +12:00
David Rowe
ee21797fcd Simplify scale-with-handles state handling 2017-07-14 12:22:21 +12:00
David Rowe
7933280d03 Clear highlights etc. when turn application off 2017-07-14 12:08:22 +12:00
Olivier Prat
b125fba2e1 Removed untested avatar bubble fade code. Made changes as requested by Andrew 2017-07-13 23:04:55 +02:00
Andrew Meadows
de21391062 add script to measure cost of entity lookup by id 2017-07-13 13:30:57 -07:00
Olivier Prat
53a92c1506 Fade edit is working again and time based transitions are garbage collected 2017-07-13 12:31:10 +02:00
David Rowe
ab6e278a48 Intersect and hover overlay handles with laser 2017-07-13 17:01:56 +12:00
David Rowe
9cbde6d99e Hover intersected handle 2017-07-13 15:05:04 +12:00
David Rowe
e644aabaf7 Intersect overlays with hands 2017-07-13 15:04:25 +12:00
Olivier Prat
2f9885870b First merge with Sam's fader branch with custom pipeline support in shape plumber 2017-07-12 17:29:21 +02:00
David Rowe
23ebb791e8 Fix don't scale with hands if scaling multiple entities with handles 2017-07-12 19:22:08 +12:00
David Rowe
1fc2d7ed1b Display corner scale handles 2017-07-12 18:44:08 +12:00
David Rowe
972cf1a1be Size handles to compensate for physical distance 2017-07-12 16:11:59 +12:00
David Rowe
2c3cd53f8d Display face scale handles only for single entities 2017-07-12 15:30:13 +12:00
David Rowe
850b94220f Display face scale handles 2017-07-12 15:22:44 +12:00
David Rowe
196f5a43b1 Don't scale with hands if scaling with handles 2017-07-12 12:18:59 +12:00
David Rowe
db37417ccd Tidying 2017-07-12 11:15:55 +12:00
David Rowe
68cdc23530 Display selection bounding box for scaling with handles 2017-07-12 11:04:02 +12:00
rick@ghostpunch.com
8cf60df5b0 Address #21402 Added a handler to Sit.js script for the onLoadComplete signal to which re-applys the siting animation rol overrides. This works around a bug that shows up if the user switches avatars while the current avatar has overloaded anim roles. 2017-07-11 18:24:19 -04:00
Liv
62be0af32d string pass on Chat.js 2017-07-11 14:57:11 -07:00
David Rowe
657ac1aaeb Fix enumeration of entity tree 2017-07-11 21:16:21 +12:00
David Rowe
3450d64bed Hover with "scale" color if in scale-with-handles mode 2017-07-11 17:37:09 +12:00
David Rowe
ed3c0cdced Use grip click to toggle scale-with-hands / scale-with-handles 2017-07-11 17:16:38 +12:00
David Rowe
283976fd87 Merge branch 'master' into vr-edit-a 2017-07-11 14:51:25 +12:00
jmo
a2b1b2e0f9 21356 - Reorder Edit.js 
Made changes to the 3 sub files for the properties tabs. Although
visually the exiting menu looked like it was in different sections,
structurally it was all just one run of item after item, with a fair
amount of div-itis. I added in fieldsets to provide true groups and
replaced much of the div-ities with aditional feidlsets as they are the
smeantic element to use here.
 2017-07-10 15:49:26 -06:00
Brad Hefta-Gaub
121cf76ee3 Merge pull request #10914 from sethalves/dont-think-during-mouse-move 
Dont think during mouse move
 2017-07-10 10:36:03 -07:00
LaShonda Hopper
3ee9d8b766 [Worklist #21420] Ran lint on edit script (details below). 
Prior to and after addressing Worklist Item #21420, it was observed that the
tool bar buttons popping in and out during load.  Taking a while to become visible.

Ran JSHint on the edit.js script to see if something stood out.

Testing with the various lint fixes the odd loading behavior wasn't observed locally any longer.
Pushing this up for testing.  This may be what @CainFoool was seeing regarding the create button
not appearing when testing a different PR as at times it took quite some time for the buttons
to load properly.

JSHint Issues Addressed:
* Resolved instance of \"Use the function form of \"use strict\"\"
** Moved use strict declaration to the file function level.
** This fixed various unknown or not defined errors.
* Resolved instances of \"\'const\' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).\"
** Switched const to var to avoid using keywords respected by only a subset of browsers.
* Resolved various multiply defined vars.
** Notable callouts being position var and properties var.
** This should fix issues where the same var was being used though the intent of use may have varied.
* Resolved instances of missing semi-colons

PreFix:  51 JSHint issues detected
PostFix: 0 JSHint issues detected.

Changes to be committed:
	modified:   scripts/system/edit.js
 2017-07-10 12:23:28 -04:00
Olivier Prat
9758a6ded0 Edition picking again (but without bounding box highlighting) 2017-07-10 17:57:02 +02:00
Mike Moody
53f581c3d4 Fixed Icons not being selectable while not highlighted. 2017-07-08 02:52:27 -07:00
David Rowe
a447e07ba5 Merge branch 'master' into vr-edit-a 2017-07-08 12:33:55 +12:00
David Rowe
e8d8a5c0a2 Rotate entity selection while scaling 2017-07-08 12:27:48 +12:00
David Rowe
73c6414f93 Natural scale of entity selection with hands / lasers 2017-07-08 12:07:20 +12:00
Andrew Meadows
57842ce5a5 Merge pull request #10878 from mnafees/21355 
CR for Job #21355 - Clean up and remove menu hotkeys
 2017-07-07 14:01:21 -07:00
Zach Fox
e222753aac Merge pull request #10911 from zfox23/PAL_adminFix2 
Set admin status even if QML can't find user in PAL
 2017-07-07 10:24:53 -07:00
Olivier Prat
06d69d04c3 TransitionStage + FadeJob compiling but not linked to entity events 2017-07-07 18:22:11 +02:00
Seth Alves
e4aa4823f9 Merge branch 'master' of github.com:highfidelity/hifi into dont-think-during-mouse-move 2017-07-07 08:51:38 -07:00
Zach Fox
ea77557e38 Correctly close PAL when switching domains 2017-07-07 08:09:19 -07:00
Mike Moody
d9706452ac added ability to drag ParticleEffects and Light Entities around via Overlay Icon. 2017-07-06 23:32:22 -07:00
Mike Moody
be68d99bed added ability to drag ParticleEffects and Light Entities around via Overlay Icon. 2017-07-06 23:17:23 -07:00
David Rowe
a35d5fe128 Different color highlight for about-to-scale 2017-07-07 15:49:52 +12:00
David Rowe
5da8fe19de Fix highlights not moving when entities being moved by other hand 2017-07-07 15:10:07 +12:00
David Rowe
998d27d66d Logic and stub for grab versus scale 2017-07-07 15:06:18 +12:00
David Rowe
0ba11ffdc9 Make each hand aware of other 2017-07-07 14:51:20 +12:00
David Rowe
cab2caaf27 Apply edit and highlight after calculating both hands' inputs 2017-07-07 14:45:49 +12:00
Zach Fox
8945b75cda Merge pull request #10903 from zfox23/PAL_fixAdminColumn 
Ensure admins see PAL admin column
 2017-07-06 13:38:10 -07:00
LaShonda Hopper
85111131da [Worklist #21420] Resolves issue where domain changes didn't refresh the icon (details below). 
* Adds a local message/event: "Toolbar-DomainChanged"
** This message is sent by the application via its registered domain handlers:
*** hostnameChanged
*** connectedToDomain
*** disconnectedFromDomain
* edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create
button icon as long as there's a valid known valid create button.

Item Ticket Link: https://worklist.net/21420

Changes to be committed:
	modified:   interface/src/Application.cpp
	modified:   scripts/system/edit.js
 2017-07-06 15:27:15 -04:00
Zach Fox
a5c7324ec5 Ensure admins see PAL admin column 2017-07-06 12:15:44 -07:00
ZappoMan
c3c9df0cd0 restore old camera state 2017-07-06 10:41:46 -07:00
ZappoMan
10341af819 Merge branch 'master' of https://github.com/highfidelity/hifi into godview 2017-07-06 09:39:33 -07:00
Olivier Prat
018c0489f4 Merged with 21378 2017-07-06 16:53:47 +02:00
LaShonda Hopper
9cae868492 [Worklist #21420] Implement Create button disabled state (details below). 
* The create button icon is set to its disabled resource when the user
enters a domain where they have _neither_ Rez or TempRez permissions.
** If the user has either of the Rez permission levels then the normal edit-i.svg
icon is used and the user is able to create items as before.

* When the user clicks the button in this state, the INSUFFICIENT_PERMISSIONS_ERROR_MSG
is shown and creation menu is not shown.

* The disabled icon, edit-disabled.svg, is based on the edit-i.svg and is set to 33% opacity.

Item Ticket Link: https://worklist.net/21420

Changes to be committed:
	new file:   interface/resources/icons/tablet-icons/edit-disabled.svg
	modified:   scripts/system/edit.js
 2017-07-06 10:53:46 -04:00
David Rowe
c2159bc52a Fix laser not disappearing when lose hand tracking 2017-07-06 16:44:58 +12:00
David Rowe
b042f8615b Fix highlight position for entity with non-center registration point 2017-07-06 16:36:22 +12:00
David Rowe
3e96df5436 Precalculate laser sphere bright color 2017-07-06 16:24:15 +12:00
David Rowe
732e3d224a Merge branch 'master' into vr-edit-a 2017-07-06 15:46:31 +12:00
Seth Alves
55b7c2d767 avoid doing a lot of work during mouse-move event-handlers 2017-07-05 15:50:05 -07:00
David Rowe
72529cf90b Highlight hand when it intersects an entity 2017-07-06 10:49:17 +12:00
Zach Fox
6f2e7f5b83 Tweak the Snapshot 'Share' button to make its purpose more clear 2017-07-05 12:39:15 -07:00
Seth Alves
d917878638 fix whitespace 2017-07-05 11:29:09 -07:00
Seth Alves
ab340530b8 don't do a lot of processing during the mouse-move event handler 2017-07-05 11:27:13 -07:00
David Rowe
38e7ee3096 Hover and select entities that hand intersects 2017-07-05 22:38:59 +12:00
David Rowe
e6e619f0d8 Hover only editable entities 2017-07-05 22:36:18 +12:00
Mohammed Nafees
eb354a4333 Cleanup menu shortcut keys 2017-07-05 14:50:48 +05:30
David Rowe
24b1963257 Tidying 2017-07-05 16:00:42 +12:00
David Rowe
1e76729d59 Lock laser distance while editing 2017-07-05 15:52:22 +12:00
David Rowe
75bc0f8b3f Translate and rotate selected entities 2017-07-05 15:47:08 +12:00
David Rowe
c85df15bad Display bounding boxes as highlights when hovering 2017-07-05 14:21:47 +12:00
David Rowe
dd1116092e Collect entities in parent-child tree that hovered entity belongs to 2017-07-05 14:20:29 +12:00
David Rowe
f9ee21525d A laser for each hand 2017-07-05 12:53:54 +12:00
David Rowe
bf722f084e A controller object for each hand 2017-07-05 12:49:36 +12:00
David Rowe
dcbf3ceeb9 Update loop 2017-07-05 12:40:45 +12:00
Olivier Prat
2525fe5869 Working save and load 2017-07-04 17:31:24 +02:00
Olivier Prat
7d851c1cbd Added timing parameters and visual debug of threshold 2017-07-04 12:01:28 +02:00
David Rowe
a24a0265f9 Improve communication with hand controller script 2017-07-04 16:24:17 +12:00
David Rowe
cadd4685ee No haptic pulse in edit modes when hand enters near-grab distance 2017-07-04 15:59:04 +12:00
David Rowe
83a78aa407 No handControllerGrab.js lasers while in VR edit mode 2017-07-04 15:54:33 +12:00
ZappoMan
d5acc8a6f9 Merge branch 'master' of https://github.com/highfidelity/hifi into godview 2017-07-03 12:21:29 -07:00
Olivier Prat
d9a83539b2 Merged with master 2017-07-03 15:32:30 +02:00
Olivier Prat
af7957491b Working avater enter/leaves + manual threshold 2017-07-03 12:40:58 +02:00
Brad Davis
31d2c9980e Merge pull request #10797 from ctrlaltdavid/21396 
Make Leap Motion a plugin
 2017-06-30 14:37:23 -07:00
Brad Davis
3f48c7aef5 Merge pull request #10855 from jherico/snapshot 
Fix snapshot connection errors
 2017-06-30 12:58:48 -07:00
utkarshgautamnyu
82597ac424 Update snapshot.js 2017-06-30 10:22:05 -07:00
David Rowe
a863e37eb5 Communicate VR edit enabled state to hand controller script 2017-06-30 12:11:06 +12:00
Burt Sloane
2b111358e1 extra quote 2017-06-29 16:49:00 -07:00
Brad Davis
6e5eff9407 Fix snapshot connection errors 2017-06-29 10:01:48 -07:00
Olivier Prat
c5ca23f4ea Changing edited fade category properly updates widgets in edit window 2017-06-29 17:14:20 +02:00
Olivier Prat
6a31dc2659 Selection of edited object working 2017-06-29 12:13:55 +02:00
Olivier Prat
8a12d0c106 Fade effect working again for basic enter domain but with various Fade jobs 2017-06-29 08:54:23 +02:00
David Rowe
84e11db772 VR edit app script and button 2017-06-29 16:58:56 +12:00
utkarshgautamnyu
e6be838e79 Update snapshot.js 2017-06-28 15:30:49 -07:00
Olivier Prat
b76a8a6f9b Merge branch 'master' of git://github.com/highfidelity/hifi into 21378 2017-06-28 14:37:03 +02:00
Brad Davis
de88a34e97 Fix toolbar button activation states 2017-06-26 23:33:32 -07:00
Ryan Huffman
209a4f33b5 Merge pull request #10784 from huffman/feat/pal-replicated 
Disable silence + ban buttons for replicated users
 2017-06-26 12:50:23 -07:00
Chris Collins
19d3646fef Merge pull request #10817 from kencooke/audio-scripting-fix 
Audio scripting fixes
 2017-06-26 10:01:52 -07:00
Brad Hefta-Gaub
a32f7b2395 Merge pull request #10743 from humbletim/21383 
CR 21383: Integrate attachments into doppleganger mirror
 2017-06-26 09:54:04 -07:00
Ken Cooke
fba1a8ddaa Fix halfDuplex script 2017-06-26 08:28:29 -07:00
Ken Cooke
db2b702221 Fix reverbTest script 2017-06-26 08:08:52 -07:00
Olivier Prat
1bb0d51849 Merged with master 2017-06-26 11:55:46 +02:00
David Rowe
bed0e8ef87 Merge branch 'master' into 21396 
# Conflicts:
#	interface/src/avatar/MySkeletonModel.cpp
 2017-06-26 12:07:25 +12:00
anshuman64
9d9f4ee64a Merge pull request #10811 from ctrlaltdavid/21414 
EZRECORD app
 2017-06-24 22:46:30 -07:00
anshuman64
d1891069d2 Merge pull request #10763 from hyperlogic/feature/puck-attach 
Added script that will attach an entity to a vive sensor
 2017-06-24 22:35:45 -07:00
David Rowe
48caad1ad2 Add user activity logging 2017-06-24 16:03:55 +12:00
David Rowe
3de1c0a312 Make and save recording 2017-06-24 15:57:57 +12:00
David Rowe
bae04966f9 Add "REC" indicator 2017-06-24 14:35:28 +12:00
David Rowe
6543b74b52 Add beeps 2017-06-24 14:26:01 +12:00
David Rowe
ce32f1704e Start/cancel/finish recording logic 2017-06-24 13:22:00 +12:00
David Rowe
1ddae1c61a Change keyboard shortcut to avoid conflict 2017-06-24 13:19:25 +12:00
David Rowe
ced9473eb3 Icon toggling and keyboard shortcut 2017-06-24 12:49:45 +12:00
David Rowe
b546d977f4 "EZRECORD" app script and button 2017-06-24 12:07:20 +12:00
Anthony J. Thibault
aabbcfd23d code review feedback 2017-06-23 16:47:53 -07:00
Ryan Huffman
b56cfa56c7 Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated 2017-06-23 14:23:20 -07:00
David Rowe
9d0407cbdf Merge branch 'master' into 21396 2017-06-23 16:52:04 +12:00
Brad Hefta-Gaub
7668fbb7a0 Merge pull request #10755 from seefo/fb5278 
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
 2017-06-22 13:35:05 -07:00
Anthony J. Thibault
e531468ac7 Fix for html url 2017-06-22 13:14:47 -07:00
Burt Sloane
f1485afccc public script 2017-06-22 13:01:11 -07:00
Anthony J. Thibault
3184d4e9d1 Puck attach only shows available tracked objects. 2017-06-22 12:17:22 -07:00
Anthony J. Thibault
6e10a6fc60 Merge branch 'master' into feature/puck-attach 2017-06-22 11:32:59 -07:00
David Rowe
6ff8aed5e3 Merge branch 'master' into 21396 2017-06-22 23:54:15 +12:00
Brad Hefta-Gaub
4f632005b6 Merge pull request #10372 from rabelaiis/21300 
Add entity script for balloon spawner and sample json entity with us…
 2017-06-21 12:50:52 -07:00
Ryan Huffman
0e7ddfd29f Disable silence/ban buttons in PAL if avatar is replicated 2017-06-21 09:49:16 -07:00
Sam Cake
1e168a5f6d Remove extra logging 2017-06-21 00:23:24 -07:00
Sam Cake
a78018345b Fixing the last scripts maybe 2017-06-21 00:15:29 -07:00
Sam Cake
189ad9c706 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-20 22:42:40 -07:00
samcake
d853a76376 Fixing the scripts and investigating the scripting 2017-06-20 17:23:44 -07:00
Anthony J. Thibault
b78e278102 adjusted print statements 2017-06-20 17:19:57 -07:00
Anthony J. Thibault
e84d0358cc updated images 2017-06-20 17:18:35 -07:00
Anthony J. Thibault
287dc3e1b8 updated license and button name 2017-06-20 17:10:53 -07:00
Anthony J. Thibault
cd1beceb75 Added script that will attach an entity to a vive sensor. 2017-06-20 17:02:50 -07:00
Zach Pomerantz
8e1cf763e3 Merge pull request #10756 from zzmp/audio/input-level 
Update chrome for the audio input level meter
 2017-06-20 15:33:17 -07:00
Thijs Wenker
b22b45461f Merge pull request #10754 from ctrlaltdavid/21405 
Fix import of JSON with parent-child relationships
 2017-06-20 20:48:01 +02:00
Zach Pomerantz
c826858458 revamp tablet MicBar 2017-06-20 11:43:02 -07:00
seefo
00a3fc77a1 Fixed an issue where toolbar buttons duplicated themselves when reloading scripts 2017-06-20 11:18:22 -07:00
Brad Hefta-Gaub
cbded766b1 Merge pull request #10676 from NeetBhagat/21369 
WL 21369 - Implement parts of the JS "console" object
 2017-06-20 11:06:34 -07:00
Sam Cake
5b6f6ab84f Trying to fix the getCOnfig from QML... 2017-06-20 00:25:51 -07:00
David Rowe
513e0cd232 Fix import of JSON with parent-child relationships 2017-06-20 16:44:25 +12:00
samcake
ba9dbbb4d4 Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me... 2017-06-19 17:34:50 -07:00
Olivier Prat
21276a85ad Merge branch 'master' of git://github.com/highfidelity/hifi into 21378 2017-06-19 18:20:03 +02:00
humbletim
89ebf4998f relocate/archive original doppleganger mirror into unpublishedScripts/marketplace/doppleganger-mirror 2017-06-19 10:28:56 -04:00
Stephen Birarda
39e8510ccb Merge pull request #10720 from seefo/fb5386 
Fixed a bug where you could not print polaroids if you took a gif
 2017-06-16 15:03:45 -07:00
NeetBhagat
2909aa9ac8 Resolve comments of @zappoman. 
-- Rename "asserts" to "assert"
-- Log printing methods will accept lists of objects or strings.
 2017-06-17 01:00:32 +05:30
Chris Collins
f160034bf0 Merge pull request #10681 from zzmp/audio/parity 
Revamp audio device selection
 2017-06-16 10:31:55 -07:00
seefo
a4d008eec9 Fixed a bug where you could not print polaroids if you took a gif 2017-06-16 08:57:27 -07:00
Burt Sloane
4f7a1a6e2e got rid of tabs 2017-06-15 16:35:53 -07:00
Burt Sloane
7022c4009f midi in and out 2017-06-15 15:18:06 -07:00
Zach Pomerantz
3093a73ce1 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-15 15:04:06 -04:00
Seth Alves
023ca85623 remove chat from default scripts 2017-06-15 09:27:43 -07:00
NeetBhagat
a6b1b17d45 Merge branch 'master' into 21369 2017-06-15 11:04:22 +05:30
David Rowe
a8501a7ac6 Remove old Leap Motion code 2017-06-15 14:45:40 +12:00
David Rowe
16bebdd409 Rename identifiers 2017-06-15 09:20:55 +12:00
Olivier Prat
ef60f78d2b Merge branch 'master' of git://github.com/highfidelity/hifi into 21378 2017-06-14 10:16:02 +02:00
David Rowe
e3b4e4aa20 Disable print statements 2017-06-14 15:37:36 +12:00
David Rowe
395d40f0f9 Fix script default to match C++ default 2017-06-14 12:21:19 +12:00
David Rowe
05f19d54f4 Add HMD roll control JavaScript API 2017-06-14 11:55:04 +12:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Zach Pomerantz
e7da007acd only show Audio menu title when appropriate 2017-06-13 17:13:39 -04:00
Zach Pomerantz
20c0dac8e8 update QML with Audio.muted 2017-06-13 16:10:16 -04:00
Zach Pomerantz
337b6bca14 update JS with Audio.muted 2017-06-13 16:02:58 -04:00
Anthony Thibault
0d46b78bff Merge pull request #10541 from Menithal/21324 
Reworked Particle Editor UI
 2017-06-13 13:00:54 -07:00
NeetBhagat
9646eba873 Complete console.trace and added a testcases for all 13 functions. 2017-06-13 23:52:48 +05:30
Matti Lahtinen
35f83afd09 Removed unneccessary print 2017-06-13 20:43:14 +03:00
Menithal
c2c1e607c0 Formating 2017-06-13 20:31:41 +03:00
Menithal
395cc55fb2 Fixed formatting 2017-06-13 20:20:54 +03:00
Menithal
020760cc97 21324: Fixed accidental inccorect bracket 2017-06-13 20:16:56 +03:00
Menithal
00701eb5c7 Merge remote-tracking branch 'origin/master' into 21324 2017-06-13 19:08:37 +03:00
Menithal
0edb763dac 21324: Formatting and PR Feedback Changes 2017-06-13 19:06:47 +03:00
Olivier Prat
ace301945c Added scale and duration debug parameters in debugFade.qml 2017-06-13 15:31:04 +02:00
Olivier Prat
24d45e0f5b Updated from upstream master because of change of protocol 2017-06-13 10:43:25 +02:00
NeetBhagat
b0e9c62c12 Merge branch 'master' of https://github.com/highfidelity/hifi into 21369 2017-06-13 10:10:44 +05:30
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
Andrew Meadows
321e307c9f Merge pull request #10609 from 1P-Cusack/21317 
WL21317 helper functions for getting into avatar coordinate space
 2017-06-12 11:18:29 -07:00
NeetBhagat
e6a5930365 Merge branch 'master' into 21369 2017-06-12 11:17:26 +05:30
Seth Alves
92fe8145be Merge pull request #10616 from vladest/create_button_sticked 
Set active button property isActive before Home menu redraw. Makes su…
 2017-06-11 13:43:41 -07:00
Seth Alves
eb049c8c6e Merge pull request #10624 from misslivirose/feat/add-primitive-shapes 
Add additional primitive shapes
 2017-06-09 19:02:54 -07:00
Clément Brisset
8e62bdea40 Merge pull request #10538 from ctrlaltdavid/21345 
Position tablet relative to hand
 2017-06-09 17:01:37 -07:00
David Rowe
fff8876b21 Code review 2017-06-10 09:33:45 +12:00
Chris Howe
08d93173f0 Minor code feedback changes, moving test scripts to developer/tests. 2017-06-09 11:07:56 -04:00
NeetBhagat
c5d8268007 Merge branch 'master' of https://github.com/highfidelity/hifi into 21369 2017-06-09 18:04:34 +05:30
Seth Alves
759a87c27e Merge pull request #10647 from misslivirose/feat/move-chat-defaultscripts 
Move chat app to run with default scripts
 2017-06-08 20:26:34 -07:00
Liv Erickson
6657c4d997 Update chat.js 
remove stray semicolon
 2017-06-08 17:22:18 -07:00
Seth Alves
d87b858c0a Merge pull request #10619 from NeetBhagat/4869-Entity-resize-issue 
4869 entity resize issue
 2017-06-08 16:34:07 -07:00
Seth Alves
9fa74029c7 Merge pull request #10633 from mnafees/21299 
CR for Job #21299 - Save category on Marketplace when using back button
 2017-06-08 16:10:56 -07:00
Vladyslav Stelmakhovskyi
b7f8cc7f0b Fix intendantion 2017-06-08 22:58:40 +02:00
Liv
03edb06ecb change design to run chat separately so it can be removed if users prefer to not use it 2017-06-08 13:46:33 -07:00
Liv
0e27ad767c Move chat app to be included as part of the default scripts 2017-06-08 13:07:01 -07:00
Vladyslav Stelmakhovskyi
dc2c79baab Merge with master 2017-06-08 21:10:30 +02:00
seefo
8d5b90afe7 Merge pull request #10600 from seefo/snapshot 
Added Polaroid Feature to Snapshot
 2017-06-07 17:05:29 -07:00
seefo
26bd6b67ae Final touches to polaroid feature 2017-06-07 16:52:16 -07:00
Mohammed Nafees
608becef7d Make the back button work again, uses the browser history directly now. 2017-06-07 15:52:06 +05:30
NeetBhagat
ead0d42cf3 Merge branch 'master' into 21369 
# Conflicts:
#	libraries/gl/src/gl/OffscreenQmlSurface.cpp
#	libraries/gl/src/gl/OffscreenQmlSurface.h
 2017-06-07 15:47:19 +05:30
NeetBhagat
904e25c9e3 intial commit #21369 Working on clear method of console 2017-06-07 14:37:18 +05:30
Andrew Meadows
f1dd5fbb14 Merge pull request #10613 from hyperlogic/bugfix/teleport-with-no-feet 
teleport.js should still function on avatars with no feet.
 2017-06-06 09:33:00 -07:00
Liv Erickson
6e5cb63d4f Add z-index fix for dropped down list 2017-06-06 09:15:41 -07:00
Chris Howe
8166fec0e0 Minor changes based on code review feedback 
See https://worklist.net/21317,
https://github.com/highfidelity/hifi/pull/10609 and
https://github.com/highfidelity/hifi/pull/10609#pullrequestreview-42090197
 2017-06-06 12:11:57 -04:00
Anthony J. Thibault
90d241ca3c Account for avatar scale 2017-06-06 09:10:46 -07:00
seefo
b729707ce7 Removed old comments in SnapshotReview.js 2017-06-06 09:10:25 -07:00
Olivier Prat
8af2f75996 Added FadeManager to centralize some common fade effect data and functions 2017-06-06 16:11:12 +02:00
NeetBhagat
e79fd9c5cb Merge branch 'master' into 21369 2017-06-06 15:26:40 +05:30
NeetBhagat
0f9cd5d0c7 intial commit hifi: #21369 Implement parts of the JS "console" object 2017-06-06 15:20:08 +05:30
Liv
e4963e076a Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-06-05 17:38:28 -07:00
Liv
9248715b21 Fixing z-index for Shape drop down 2017-06-05 17:37:32 -07:00
Seth Alves
dcbd279bd8 Merge pull request #10589 from vladest/create_in_landscape 
Implements landscape mode for tablet as rotation instead of stretching [DO NOT MERGE]
 2017-06-05 12:46:03 -07:00
Liv
6cecac36d5 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes 2017-06-05 12:23:23 -07:00
Andrew Meadows
85a1e1d691 Merge pull request #10608 from ctrlaltdavid/21379 
Fix icon for polylines in entities editor properties page
 2017-06-05 11:06:23 -07:00
Olivier Prat
1936c209a5 Working fade debugging scripts for both opaque and transparents 2017-06-05 17:21:33 +02:00
Olivier Prat
08fcd6c357 Added new shaders 2017-06-05 16:32:36 +02:00
Olivier Prat
cbcf9ebe9f Merge branch 'master' of git://github.com/highfidelity/hifi into 21378 2017-06-05 11:13:27 +02:00
Olivier Prat
1433ae4b34 Merged from 21274 2017-06-05 11:12:57 +02:00
NeetBhagat
2ce72d554b Resolve 2 issues: 
1) Entity can grow/shrink if it is grabbed by first right hand then left hand.
2) Stop unwanted grow/shrink of an entity.
 2017-06-05 14:13:51 +05:30
NeetBhagat
967c50ab93 Merge branch 'master' into 4869-Entity-resize-issue 2017-06-05 11:08:51 +05:30
Menithal
4842de8f07 Fixed issue with orientation 2017-06-04 00:03:14 +03:00
Vladyslav Stelmakhovskyi
4dbe646c17 Set ective button property isActive before Home menu redraw. Makes sure redraw will read proper value of isActive property 2017-06-03 15:40:25 +02:00
Anthony J. Thibault
7da73d0ff1 teleport.js should still function on avatars with no feet. 2017-06-02 18:01:40 -07:00
Clément Brisset
0a864a7ce9 Merge pull request #10570 from ctrlaltdavid/21376 
Move record script files to unpublishedScripts directory
 2017-06-02 16:25:56 -07:00
manapa01
8e1577d3d3 Merge pull request #10596 from manapa01/Snapshot-Sound 
Snapshot sound
 2017-06-02 16:07:05 -07:00
Patrick Manalich
0b2de18e8e Volume Change 2017-06-02 16:04:03 -07:00
Clément Brisset
5f91d2dcb7 Merge pull request #10569 from ctrlaltdavid/21312 
Improve positioning of assets when added / imported
 2017-06-02 15:45:18 -07:00
seefo
fa726f43a6 Fixed a bug in Polaroid canRez listener 2017-06-02 13:47:58 -07:00
seefo
7ade5b07a6 Final touches to Polaroids 2017-06-02 11:35:56 -07:00
David Rowe
58c4a2f12a Fix icon for polylines in entities editor properties page 2017-06-03 06:26:13 +12:00
seefo
655a411865 Cleaned up Polaroid code 2017-06-02 11:02:01 -07:00
Patrick Manalich
a705e722f1 Ctrl-S sound feature added 2017-06-02 10:35:57 -07:00
NeetBhagat
580c2548e9 Initial Commit : 
1) Resolve a bug when 2 different entity is grabbed in 2 hands. And move your left hand and entity of left hand grow/shrink when you move right/left hand.
2) Resolve right hand-left hand grow-shrink functionality
 2017-06-02 23:04:58 +05:30
ZappoMan
60048a231f god view controller 2017-06-02 10:26:54 -07:00
Patrick Manalich
0c71cf4bda Edit: Snapshot will make sound when initially clicked 2017-06-02 10:24:27 -07:00
Patrick Manalich
4e61db8263 Snapshot will make sound when initially clicked 2017-06-02 10:24:27 -07:00
Vladyslav Stelmakhovskyi
8068e7201d Fix position after rotation. May be fix rotation in HMD mode 2017-06-02 18:58:18 +02:00
David Kelly
70b6236890 Merge pull request #10605 from davidkelly/dk/analyticsForBubble 
Add UserActivity calls for bubble usage
 2017-06-02 09:48:15 -07:00
David Kelly
2feea16063 added comment 2017-06-02 09:47:03 -07:00
David Kelly
4dae77cd9d make sure we dont log the initial call to onBubbleToggled 2017-06-02 08:45:02 -07:00
Menithal
e76dfe4182 21324: Implementation of last feedback 
- If properties are expanded, the animation wrapper should now use the
values
- Decimal Values from filled in data now automatically get reduced the
1000th. The fields however will allow one to set smaller values and show
it, until the entity is selected again
- If particle is locked, keep fields locked.
 2017-06-02 06:59:23 +03:00
Brad Davis
9a80a81321 Merge pull request #10565 from vladest/fix_claraio_download_clones 
Make sure that there is only one connection created for web events, s…
 2017-06-01 20:42:50 -07:00
Menithal
bdcf9a0070 Merge remote-tracking branch 'upstream/master' into 21324 2017-06-02 06:39:55 +03:00
seefo
4e190434d1 Added polaroids to snapshots 2017-06-01 16:53:48 -07:00
David Kelly
37b738ff8b initial cut at some UserActivities for the bubble 2017-06-01 16:46:31 -07:00
Zach Fox
4e929f6d92 Merge pull request #10581 from zfox23/snapshot_fixForUrlShare 
Snapshots: Fix incorrect "for_url" share; ensure old snapshots don't get shared when they shouldn't
 2017-06-01 11:51:14 -07:00
Vladyslav Stelmakhovskyi
b0e4b752d5 Implements landscape mode for tablet as rotation instead of stretching 2017-06-01 19:07:17 +02:00
Vladyslav Stelmakhovskyi
30ab9771ef Merge branch 'master' into create_in_landscape 2017-06-01 16:06:15 +02:00
Zach Fox
53701371ab Fix some bugs :( 2017-05-31 16:43:21 -07:00
Liv
27d4edd2d0 Add circle and cone to entity shape list 2017-05-31 16:25:11 -07:00
Liv
f594fd6aa5 Merge branch 'feat/add-primitive-shapes' of https://github.com/misslivirose/hifi into feat/add-primitive-shapes 2017-05-31 15:14:04 -07:00
Zach Fox
70fdb4a168 Fix incorrectly sharing old snapshots 2017-05-31 14:47:07 -07:00
Zach Fox
fd92afff8c Ensure old snaps don't accidentally get shared for_url 2017-05-31 14:47:07 -07:00
David Rowe
f0c56dac3f Further files required for record script 2017-06-01 09:09:17 +12:00
David Kelly
e1700915f7 remove extra activity logger call 2017-05-31 13:28:57 -07:00
Seth Alves
e80704f3c9 Merge pull request #10578 from thoys/fix/grabableDynamic 
Edit.js: Fix hidden dynamic property while clone-able is active
 2017-05-31 12:54:36 -07:00
Chris Howe
6edc6b2756 WL21317 
New MyAvatar functions to support converting from avatar joint space to
world space and vice versa. Added some tests to support these functions.
 2017-05-31 15:05:43 -04:00