Commit graph

70973 commits

Author SHA1 Message Date
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
Sam
cd7ca96c3a Remove the separate depth buffer for in front overlay, only useful for debug and it breaks in mac 2018-08-10 02:42:45 +02:00
sabrina-shanman
660178e5bb Remove 'plane' from list of supported Collision Pick shapeTypes, since it turns out ShapeFactory does not support it 2018-08-09 17:41:46 -07:00
Wayne Chen
769e7eab03 removing domainLimitedScale property and changing read property of scale 2018-08-09 17:38:58 -07:00
amantley
c8a31bc59f created a backward walk speed constant 1.6m/s and changed the characteristic speed for strafe right left to 1.3 2018-08-09 17:38:57 -07:00
Wayne Chen
d533e3b341 adding domainLimitedScale property 2018-08-09 17:29:13 -07:00
sabrina-shanman
4c367fa443 Fix outdated explanation of when CollisionPickResult.intersects is true 2018-08-09 17:26:54 -07:00
sabrina-shanman
b32b811fff Move up buildObjectIntersectionsMap in CollisionPick.cpp 2018-08-09 17:24:09 -07:00
John Conklin II
2d9cbe91bb
Merge pull request #13780 from hyperlogic/bug-fix/perftimer-memory-corruption
Fix memory corruption in PerformanceTimer when Stats are active
2018-08-09 17:16:03 -07:00
John Conklin II
6c647c8185
Merge pull request #13768 from thoys/fix/create/triggerable-reset
MS17413 Triggerable value does not reset on entity deselect
2018-08-09 17:13:34 -07:00
sabrina-shanman
26ae688d59 Refactor CollisionPickResult::toVariantMap 2018-08-09 17:11:32 -07:00
sabrina-shanman
ad36e23c34 Return early when colliding MyAvatar is found in AllContactsCallback 2018-08-09 17:00:54 -07:00
sabrina-shanman
c5e9f02372 Finalize Collision Pick API naming convention for intersectingObjects 2018-08-09 16:59:23 -07:00
Simon Walton
875407b3fe New approach to physics readiness - now (mostly) working 2018-08-09 16:24:04 -07:00
Alexia Mandeville
38973f0840 Adding icon states to emote app, active state 2018-08-09 16:00:36 -07:00
Sam
5fd3862c94 FIx shader error on mac in shadow.slh 2018-08-10 00:45:25 +02:00
sabrina-shanman
4f077080b0 Change API naming for intersectingObjects in CollisionPickResult and update docs 2018-08-09 15:29:21 -07:00
sabrina-shanman
4d31863484 Fix missing jsdoc note for getPrevPickResult on existence of ParabolaPickResult 2018-08-09 15:08:27 -07:00
David Kelly
3b7d1cb6cf Only update gain if it really changed
and only fire UserActivity if we really do change the gain
2018-08-09 14:55:07 -07:00
John Conklin II
19ad9c52da
Merge pull request #13773 from birarda/bug/last-broadcast-guard
check for null node data pointers in handleIgnoreRequestPacket
2018-08-09 14:53:53 -07:00
John Conklin II
6447bcab5b
Merge pull request #13765 from dback2/serverScriptStatus
Fix server script status
2018-08-09 14:51:17 -07:00
John Conklin II
f31776516b
Merge pull request #13791 from dback2/editHandlesAlpha
Alpha 1 for edit handles
2018-08-09 14:50:43 -07:00
Gabriel Calero
6e793a06a9 Merge remote-tracking branch 'upstream/master' into android_audio_fixes3 2018-08-09 18:47:17 -03:00
Cristian Luis Duarte
60338f9899 Android - People - Swipe to reveal delete + layout adaptations for design 2018-08-09 17:54:07 -03:00
NissimHadar
08acfb6bf0 Use correct case. 2018-08-09 13:37:28 -07:00
David Back
cc953ab691 Merge branch 'master' of https://github.com/highfidelity/hifi into rotationRingSize 2018-08-09 13:36:13 -07:00
David Back
e36e9aa68f tweak rotation ring size 2018-08-09 13:35:55 -07:00
NissimHadar
f816c37940 Updated MD 2018-08-09 13:34:25 -07:00
John Conklin II
6481aea2f4
Merge pull request #13715 from SamGondelman/parabolic
Enable parabolic teleport
2018-08-09 13:12:17 -07:00
NissimHadar
37ddd59c40 Use correct case. 2018-08-09 13:10:30 -07:00
Dante Ruiz
9a8ebdd021
Merge pull request #13739 from dback2/cloneChildrenFix
Fix cloning a parented entity
2018-08-09 13:05:28 -07:00
NissimHadar
b573591462 Updated README.md and minor changes in Auto-tester to match. 2018-08-09 13:03:56 -07:00
John Conklin II
f4f0c5fcad
Merge pull request #13767 from ctrlaltdavid/M15772
Fix entity stay highlighted after hand leaves when far grabbing another
2018-08-09 12:53:41 -07:00
John Conklin II
59977fe1d3
Merge pull request #13764 from r3tk0n/17249-safe-landing
Relocate Avatar Spawn Point from the Hips to the Feet
2018-08-09 12:45:30 -07:00
SamGondelman
a0dfd76f06 variable texture support 2018-08-09 12:32:36 -07:00
Ryan Huffman
44a9b1df0e Fix choice of target backend in TextureCache on OSX 2018-08-09 12:30:42 -07:00
SamGondelman
bd4a3a5b32 remove unused uniform buffer from polylines 2018-08-09 12:20:36 -07:00
David Back
9779ce1b80
Merge pull request #13777 from dback2/reloadContentScriptCache
Clear script cache with reload content
2018-08-09 12:19:39 -07:00
luiscuenca
9ca0ee05dc Fix wanings 2018-08-09 12:13:03 -07:00
Zach Fox
c0e2b3a240 Happening Now -> Featured 2018-08-09 11:49:29 -07:00
Zach Fox
394f93f39c Fix SortOrder 2018-08-09 11:44:03 -07:00
Zach Fox
e00dbcecc6 Fix MS17495: Initially wire sendMessage to ignore in appUi module 2018-08-09 11:33:26 -07:00
Wayne Chen
2a6ff90a2c fixing web tablet error 2018-08-09 11:30:10 -07:00
Simon Walton
4395e1fa26 Safe Landing checkpoint 2018-08-09 11:11:58 -07:00
John Conklin II
17189b403a
Merge pull request #13786 from hyperlogic/bug-fix/remove-tip-constraint-enforcement
In CCD IK chains, remove the LeftHand and RightHand constraint
2018-08-09 10:49:55 -07:00
luiscuenca
8c121a531d Turn attachments into avatar entities 2018-08-09 10:35:15 -07:00
David Back
a6d944e034 use alpha 1 for edit handles 2018-08-09 10:32:34 -07:00
Zach Fox
4248f342b4 Fix MS17469: Fix conditionals for needing more paginated results when ListView changes 2018-08-09 10:22:09 -07:00
John Conklin II
34697b6b07
Merge pull request #13770 from huffman/fix/edit-duplicate-fix
Fix duplicating multiple entities causing infinite looping
2018-08-09 09:07:37 -07:00
Andrew Meadows
8153e660bf don't simulate/animateScaleChanges for fading avatars 2018-08-09 08:54:28 -07:00