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
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
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
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
NissimHadar
bf53f24918
WIP -documentation
2018-08-08 14:51:30 -07:00
Andrew Meadows
9b0dcb45ba
don't update fading avatars
2018-08-08 14:00:44 -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
NissimHadar
4cdc6196e4
WIP - adding help.
2018-08-08 11:07:21 -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
NissimHadar
65d4a061a2
WIP - working on help.
2018-08-08 08:25:12 -07:00
Olivier Prat
2584ce4c96
Merged with master
2018-08-08 08:42:44 +02:00
NissimHadar
1f4c0ebeb5
WIP - working on Help.
2018-08-07 22:55:45 -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
NissimHadar
76e0e8d3fa
WIP - working on Help.
2018-08-07 17:13:34 -07:00
NissimHadar
b8c7971ebe
WIP - working on Help.
2018-08-07 17:03:44 -07:00
NissimHadar
cd186aa657
Removed unneeded MD file.
2018-08-07 15:56:49 -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
NissimHadar
cce17eb181
Added tabbed interface.
2018-08-07 14:20:45 -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
amantley
1353406254
more whitespace
2018-08-07 12:56:28 -07:00