Commit graph

22413 commits

Author SHA1 Message Date
Zach Fox
3fae121335
Merge pull request #11670 from zfox23/stagingSetting
Make it easier to switch between STABLE and STAGING Metaverses
2017-10-27 12:03:29 -07:00
SamGondelman
755ce183e0 fix is facing avatar 2017-10-26 14:16:31 -07:00
Zach Fox
002141724b Return to using NetworkingConstants 2017-10-26 14:12:36 -07:00
Zach Fox
3e95484c4c Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-26 13:58:50 -07:00
Brad Hefta-Gaub
e6dca8de86 Merge pull request #11698 from kencooke/audio-sample-sound-fix
Tighter version of sample sound
2017-10-26 13:45:19 -07:00
Bradley Austin Davis
becd99a964 Merge pull request #11584 from SamGondelman/pointerEvents
First step of cleaning up PointerEvents
2017-10-26 12:01:03 -07:00
Ken Cooke
2156729a75 Tighter version of sample sound 2017-10-26 11:48:40 -07:00
Ken Cooke
4eb8b826c2 Merge pull request #11681 from luiscuenca/case6443
6443 Audio Menu Sample Sound won't play while domain is loading
2017-10-26 08:40:30 -07:00
luiscuenca
3d3077978e Simplyfied and fixed null pointer 2017-10-25 18:47:10 -07:00
Sam Gondelman
863a2041a6 Merge branch 'master' into pointerEvents 2017-10-25 17:22:19 -07:00
luiscuenca
a1c9285c90 Fixed bug on case 6443 2017-10-25 13:13:50 -07:00
Zach Fox
14150c09ac Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-25 12:59:36 -07:00
Andrew Meadows
2d0b94817c Merge pull request #11336 from 1P-Cusack/21389_PR2
WL21389 PR2: Representation of collision shapes need updating (details below).
2017-10-25 10:41:21 -07:00
Brad Hefta-Gaub
18a74cea91 Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023
2017-10-23: Merge RC57 into Master
2017-10-24 21:19:01 -07:00
Zach Fox
7998984d8e Missed tons of spots! 2017-10-24 14:30:47 -07:00
Dante Ruiz
f29937fb88 Merge branch 'master' of github.com:highfidelity/hifi into crash-keyboard 2017-10-24 13:54:21 -07:00
Dante Ruiz
92f765fe52 property set echomode for keyboard for wallet and webviews 2017-10-24 13:53:50 -07:00
Zach Fox
48c8d52c09 Cleanup 2017-10-24 13:30:27 -07:00
Zach Fox
c64c2e17c8 First pass at consolidation 2017-10-24 12:01:05 -07:00
LaShonda Hopper
226d51b8f5 [WL21389] Fix scaling issue when computing hull point list (details below).
The entity dimensions should be scaled by 1 as opposed to 0.5.

Changes Committed:
    modified:   interface/src/Util.cpp
    modified:   libraries/render-utils/src/GeometryCache.cpp
    modified:   libraries/render-utils/src/GeometryCache.h
2017-10-24 14:16:25 -04:00
LaShonda Hopper
7f9ce5a4cd [WL21389][BuildFix] Minor refactor due to render-utils lib change (details below).
As of Commit b93e91b9, render-utils no longer knows about entity lib.
This commit adjusts for that by altering the signature of
GeometryCache::computeSimpleHullPointListForShape to take in portions
of ShapeEntityItem data as opposed to the entity pointer.

Fixes build failure mentioned in:
 https://github.com/highfidelity/hifi/pull/11336#issuecomment-333635794

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/src/Util.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
	modified:   libraries/render-utils/src/GeometryCache.h
2017-10-24 14:16:23 -04:00
LaShonda Hopper
d2350974b5 [WL21389] Avoid vector copy within shapeInfoCalculator.
Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/src/Util.cpp
2017-10-24 14:16:23 -04:00
LaShonda Hopper
5b50b362f1 [WL21389] WL21389 PR2: Representation of collision shapes need updating (details below).
This commit adds support for the polyhedrons and polygons sans
Torus and Quad which aren't currently supported within GeometryCache.

* Moves GeometryCache::_shapes from public to private scope
    * Nothing aside from the class should be directly altering this, only querying
    * Updated instances of direct referencing which looks to have been limited to prior
      testing of instancing and shapes.
* Adds an accessor function for ShapeData to GeometryCache
* Consolidates point list generation to helper function
    * GeometryCache::computeSimpleHullPointListForShape
* Moves GeometryCache::Shape to entity::Shape mapping to GeometryCache from
  RenderableShapeEntityItem
    * Adds conversion accessor to GeometryCache, GeometryCache::Shape getShapeForEntityShape
* Sets ShapeEntityItem::ShapeInfoCalculator callback committed earlier.
    * This helps circumvent the issue with library inclusion.  entity-render knows about
      entity; however, entity doesn't know about entity-renderer; however, GeometryCache
      data is needed within entity::ShapeEntityItem to compose the ShapeInfo point list data.
    * This callback is set up within Application::init of the Interface as it knows about
      both halves of the equation, and the callback needs to be setup prior to any entities
      collision data getting generated.
* Removes _type reset within ShapeInfo::setPointCollection
    * This should avoid any issues due to subversively setting the type or
      incorrectly setting the type as a tangential operation.
        * Audited instances of ShapeInfo::setPointCollection and all seemed to be
          calling the function immediately after having set the type via
          ShapeInfo::setParams
* Adds new ShapeType: SHAPE_TYPE_CIRCLE
    * This type is reserved for the circle which is now treated as a special
      type of Cylinder_Y with regard to collision as opposed to a simple hull.
    * Fixes the issue where jumping on a circle, at times, would
      result in the avatar sliding off towards an edge as if atop a
      squished cone.
* Also updates ShapeInfo::getType() to return ShapeType as opposed to int
    * Auditing calls showed that majority of places were comparing against ShapeType
    * ShapeType::_type is a ShapeType so returning the type explicitly
      is more consistent.
        * ShapeInfo file houses ShapeType enum so any file aware of ShapeInfo is aware of
          ShapeType enumeration.
* entity::Quad defaults to SHAPE_TYPE_ELLIPSOID
    * Like entity::Shape::Torus, entity::Shape::Quad is currently unsupported within
      GeometryCache::buildShapes.
    * Also it appears that a Quad shape can't be created within world via the creation menu.
        * There's no explicit option at present to create one.
        * Trying subvert the Cube/Box creation option to generate one results in an enforced
          stubby box as opposed to a quad.
    * Given the aforementioned points, entity::Shape::Quad will default to
      SHAPE_TYPE_ELLIPSOID as opposed to SHAPE_TYPE_BOX.
        * Added Todo regarding the shape being unsupported along with a notation to create
          a special ShapeType, SHAPE_TYPE_QUAD, for it should it be added in the future.
* Adds some comments and has some minor clean up.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/src/Application.cpp
	modified:   interface/src/Util.cpp
	modified:   interface/src/Util.h
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/physics/src/ShapeFactory.cpp
	modified:   libraries/render-utils/src/GeometryCache.cpp
	modified:   libraries/render-utils/src/GeometryCache.h
	modified:   libraries/shared/src/ShapeInfo.cpp
	modified:   libraries/shared/src/ShapeInfo.h
	modified:   tests/gpu-test/src/TestInstancedShapes.cpp
2017-10-24 14:16:17 -04:00
Daniela
059c5c1806 billboard is now using a general formula to calculate the rotation, where we don't assume y is up. Added dependency on the avatar. 2017-10-24 14:49:17 +01:00
Daniela
30a5b00b6e Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-24 14:44:06 +01:00
Zach Fox
1f6d989044 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023 2017-10-23 17:37:43 -07:00
Dante Ruiz
0242e8e4ba fixed crash and login password 2017-10-23 16:33:49 -07:00
SamGondelman
55ba093f09 update line render transform on end edit 2017-10-23 13:09:40 -07:00
Zach Fox
03b46c5e62 Merge pull request #11652 from cain-kilgore/21508
WL 21508 - Improve upon Skybox Changer (Updated)
2017-10-23 12:22:21 -07:00
Seth Alves
d3a859d207 Merge pull request #11648 from ElderOrb/mouse_pointer_fix
7469 Mouse Pointer Depth is Incorrect in HMD Mode
2017-10-23 11:57:46 -07:00
Zach Fox
30bffdea32 Quick bugfix 2017-10-23 11:45:51 -07:00
Cain Kilgore
b60b58ff35 zFox Changes 2017-10-23 19:40:43 +01:00
Cain Kilgore
3b4185fdb3 WL 21508 - Improve upon Skybox Changer
This involved a second PR, due to optimizing the way the Skyboxes are laid  out. All of the Skyboxes will now appear at once, with the random button being removed. You are able to scroll up and down the list and choose which Skybox you'd like to pick.
2017-10-23 19:30:36 +01:00
Daniela
f15038c54f Re-add isFacingAvatar to true and delete rotation of the grabbermoveup tool. 2017-10-23 19:11:32 +01:00
Zach Fox
5c8451a626 Auto-refresh Wallet Home & Purchases on 4s timer 2017-10-23 10:36:23 -07:00
Melissa Brown
20787c9c7c Merge pull request #11644 from cain-kilgore/21508
WL 21508 - Improve upon Skybox Changer
2017-10-23 10:30:55 -07:00
SamGondelman
9bbb2eb692 austin's comments, send events directly to selected web entity 2017-10-23 10:17:45 -07:00
Cain Kilgore
b42afdaff0 WL 21508 - Cleanup from Code Review 2017-10-23 16:27:28 +01:00
beholder
cadf00fecf add missing 'eyeToWorld' assignment 2017-10-22 19:27:04 +03:00
vladest
b791dcba7f Add sound cues to create app 2017-10-22 14:59:53 +02:00
vladest
cf7b050680 Sound cues for GoTo interface 2017-10-21 20:47:56 +02:00
Cain Kilgore
bc772a2f9a WL 21508 - Improve upon Skybox Changer 2017-10-21 19:42:53 +01:00
SamGondelman
88b8d7bc46 fix image3d overlay isFacingAvatar 2017-10-20 16:56:42 -07:00
Brad Hefta-Gaub
26ea8bea6a Merge pull request #11612 from highfidelity/pointers
Fix tablet intersection bug and start of Pointer migration work (WIP)
2017-10-20 13:53:52 -07:00
Brad Hefta-Gaub
f6af1d1ecf Merge pull request #11387 from vladest/tablet_extended_sounds
Tablet extended sounds
2017-10-20 13:49:06 -07:00
Brad Hefta-Gaub
d6ad389dab Merge pull request #11611 from AndrewMeadows/faster-update-renderables
Faster renderables update
2017-10-20 13:43:08 -07:00
Zach Fox
c217992866 Order of operations lol 2017-10-20 11:42:03 -07:00
vladest
908d601a43 Code style fixes #1 2017-10-20 20:00:11 +02:00
Seth Alves
9d00606505 Merge pull request #11635 from druiz17/fix-hud-issues
actually fix toolbar from completely dispersing
2017-10-20 10:22:34 -07:00
Howard Stearns
352243c01b Merge pull request #11629 from zfox23/wearItButton
REZ IT -> WEAR IT
2017-10-20 09:36:09 -07:00