David Rowe
a08bcd325d
Merge branch 'master' into M17217-b
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-08-10 11:25:39 +12: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
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
David Back
9779ce1b80
Merge pull request #13777 from dback2/reloadContentScriptCache
...
Clear script cache with reload content
2018-08-09 12:19:39 -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
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
David Rowe
71341cf700
Display teleport target after teleport
2018-08-09 10:51:12 +12: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
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
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
David Rowe
f7c17df6cc
Float play area and sensors above the ground
2018-08-08 16:32:08 +12: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
David Rowe
fd977a758b
Update teleport destination model
2018-08-08 10:49:34 +12:00
David Rowe
96767c1103
Merge branch 'master' into M17217-b
...
# Conflicts:
# plugins/openvr/src/OpenVrDisplayPlugin.cpp
2018-08-08 10:43:58 +12: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
David Rowe
f65b1a26ae
Merge remote-tracking branch 'SamGondelman/parabolic2' into M17217-b
2018-08-08 10:06:43 +12: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
Sam Gateau
07cb0db425
Fix bug with texel opaque and transparent cut off shader function
2018-08-07 11:16:50 -07:00
Stephen Birarda
c7ce8e5ce0
check node data pointers in handleNodeIgnoreRequestPacket
2018-08-07 11:00:24 -07:00
Dante Ruiz
8c5eefcc95
some file and code cleanup
2018-08-07 10:58:45 -07:00
Dante Ruiz
d78c571df6
revert to use overlays instead of entities for tablet highlighting
2018-08-07 10:56:53 -07:00
David Back
d88615219c
CR changes
2018-08-07 10:19:48 -07:00
David Back
deee73f14d
Merge branch 'master' of https://github.com/highfidelity/hifi into serverScriptStatus
2018-08-07 10:05:56 -07:00
Ryan Huffman
61fdce9c11
Fix duplicating multiple entities causing infinite looping
2018-08-07 09:52:14 -07:00
SamGondelman
82029b4cb0
fix v1 and transparent procedurals
2018-08-07 09:28:40 -07:00
r3tk0n
1aa9fcd41a
Fix a typo
...
In jsdoc comments for getWorldFeetPosition() in Avatar.h
2018-08-06 21:23:06 -07:00
David Rowe
c9c23b8db3
Fix entity stay highlighted after hand leaves when far grabbing another
2018-08-07 15:34:17 +12:00
MuteTab
b590ff793a
New function for changing location in domains such that the AVatar's leg-length is taken into account.
2018-08-06 20:26:44 -07:00
MuteTab
d04ac2b8ed
Fixed jsdoc comments for Avatar::getWorldFeetPosition
2018-08-06 19:40:47 -07:00
David Back
f9e25d36e7
use wrapper emitScriptEvent, change to Fetching
2018-08-06 17:52:27 -07:00
Anthony Thibault
079b276c2b
Merge pull request #13733 from luiscuenca/fixElbowPoleVector3
...
Elbow pole vectors improvements
2018-08-06 17:33:03 -07:00
David Back
e5abd9d57d
fix server script status event, use [ Getting status ]
2018-08-06 17:03:32 -07:00
Sam Gateau
00c5b6f5f4
Merge pull request #13743 from SamGondelman/transparent
...
Fix primitives always drawing as transparents
2018-08-06 16:28:30 -07:00
MuteTab
de5c7f6dcd
Change lambda for address manager position getter.
2018-08-06 16:02:00 -07:00
