Commit graph

70488 commits

Author SHA1 Message Date
Ryan Huffman
c0ac76bf4a
Merge pull request #13797 from dback2/rotationRingSize
Edit handle rotation ring size
2018-08-10 13:53:10 -07:00
Sam Gateau
ad5b2ddc69
Merge pull request #13711 from AndrewMeadows/myAvatar-vs-backfacing-triangles
MyAvatar's RigidBody ignores collisions with backfacing triangles
2018-08-10 12:55:28 -07:00
Wayne Chen
6b73a0bba5
Merge pull request #13801 from wayne-chen/fixMyAvatarScale-case-17434
MS17434: modifying MyAvatar.scale get property
2018-08-10 10:45:53 -07:00
David Back
1d0da4042a
Merge pull request #13771 from dback2/entityListCtrlReselection
Reselecting same entity in list will unselect it
2018-08-10 10:41:57 -07:00
Zach Fox
f514fde6fd
Merge pull request #13789 from zfox23/MS17469_listModelFix
v0.72.0: Fix MS17469: Fix conditionals for needing more paginated results when ListView changes
2018-08-10 10:24:01 -07:00
Sam Gateau
c404f94220
Merge pull request #13795 from SamGondelman/paint
Remove unused uniform buffer from polylines
2018-08-10 09:36:53 -07:00
John Conklin II
de0cdf6d8d
Merge pull request #13793 from wayne-chen/fixWebTabletJSBug
Fixing web tablet JavaScript error
2018-08-10 09:31:17 -07:00
Howard Stearns
1c9e409444
Merge pull request #13794 from zfox23/72_MS17495
Fix MS17495: Initially wire sendMessage to ignore in appUi module
2018-08-09 20:07:11 -07:00
Wayne Chen
769e7eab03 removing domainLimitedScale property and changing read property of scale 2018-08-09 17:38:58 -07:00
Wayne Chen
d533e3b341 adding domainLimitedScale property 2018-08-09 17:29:13 -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
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
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
John Conklin II
6481aea2f4
Merge pull request #13715 from SamGondelman/parabolic
Enable parabolic teleport
2018-08-09 13:12:17 -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
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
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
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
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
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
Anthony Thibault
90b0bd333f
Merge pull request #13774 from danteruiz/revert-tablet-material-entity
Revert to using overlays instead of material entities for button highlighting.
2018-08-08 17:33:26 -07:00
Anthony J. Thibault
3fa3cd8cfd In CCD IK chains, remove the LeftHand and RightHand constraint completely.
When used in combination with the elbow pole vector, this was causing the hand to never properly reach its rotation target.
It was also having side effects causing the elbow to never straighten properly to reach its position target.

There is possibly a bug in how this tip constraint is enforced and I've verified that there are no ill effects in removing it.
2018-08-08 13:56:47 -07:00
David Back
a04ffd969e deselect when reselecting same entity, fix indents 2018-08-08 13:32:38 -07:00
Ryan Huffman
544a6504f2
Merge pull request #13760 from ctrlaltdavid/M16932
Render Touch controllers at physical hands's locations
2018-08-08 13:11:21 -07:00
David Back
adc2c9c6fc Merge branch 'master' of https://github.com/highfidelity/hifi into entityListCtrlReselection 2018-08-08 12:41:54 -07:00
Sam Gondelman
16b483b338
Merge pull request #13766 from SamGondelman/shaders
Miscellaneous shader fixes
2018-08-08 11:34:36 -07:00
Stephen Birarda
e686df6fb9
Merge pull request #13720 from Atlante45/feat/test-tool
Stack tester changes
2018-08-08 13:40:05 -04:00
Anthony J. Thibault
c4c3581285 Fix memory corruption in PerformanceTimer when Stats are active
PerformanceTimer was neither thread safe nor re-entrant.  Because it was being used increasingly on render and worker threads it has increased the likelihood of heap corruption.
I was able to identify this by enabling full page heap verification using the gflags app.

https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap
2018-08-08 09:53:26 -07:00
Andrew Meadows
49a1d0a18a MyAvatar RigidBody ignores backfacing triangles 2018-08-08 09:11:09 -07:00
Clément Brisset
e9f23a43f6
Merge pull request #13726 from Atlante45/fix/angle-between
Fix angleBetween potential NaN return value
2018-08-07 18:31:57 -07:00
Sam Gondelman
9ec0b05fe4
Merge pull request #13776 from samcake/black
Fix bug with texel opaque and transparent cut off shader function
2018-08-07 15:52:18 -07:00
Sam Gondelman
da71572d2c
Merge pull request #13775 from SamGondelman/shadows
Don't bind materials during shadow pass
2018-08-07 15:43:48 -07:00
SamGondelman
6ff0b9d417 fix debug tools 2018-08-07 15:25:56 -07:00
NissimHadar
4eaa06fbc5
Merge pull request #13725 from NissimHadar/exportToTestRail
Export test suite to TestRail
2018-08-07 15:20:47 -07:00
r3tk0n
32165dff40 Fixed rotations in MyAvatar::goToFeetLocation() 2018-08-07 14:31:48 -07:00
David Back
3c5c5d8552
Merge pull request #13750 from dback2/editLogSpamFix
Fix edit log spam with -1 hand
2018-08-07 13:51:39 -07:00
David Rowe
a7170a5892 Fix typo 2018-08-08 08:49:29 +12:00
David Back
a905a76c70 reload script cache with reload content 2018-08-07 11:53:11 -07:00
Dante Ruiz
269afb9a49 remove tablet material entities code remove create 2018-08-07 11:19:22 -07:00
SamGondelman
de10dfb032 don't bind materials during shadow pass 2018-08-07 11:17:18 -07:00