John Conklin II
b56d9c3ea5
Merge pull request #13807 from SamGondelman/fading
...
Fixing fading
2018-08-10 16:35:10 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges
...
New Default Strafe Animations Plus Animation Tuning Support
2018-08-10 15:03:30 -07:00
John Conklin II
61f0e9323a
Merge pull request #13800 from samcake/zvork-shadow
...
Fixing PR13731 shader error on Mac
2018-08-10 14:10:47 -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
SamGondelman
15070f6374
fixing fading
2018-08-10 10:52:58 -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
amantley
74186b0162
changed back speed to 2.2 m/s and the end frame for strafe left and right to 33, and the end frame for wlk_bkwd to 27
2018-08-10 09:56:24 -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
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
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
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
Sam
5fd3862c94
FIx shader error on mac in shadow.slh
2018-08-10 00:45:25 +02: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
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
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
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
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
Olivier Prat
2584ce4c96
Merged with master
2018-08-08 08:42:44 +02: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
SamGondelman
6ff0b9d417
fix debug tools
2018-08-07 15:25:56 -07:00
amantley
1353406254
more whitespace
2018-08-07 12:56:28 -07:00
amantley
4ad73fd821
removed whitespace
2018-08-07 12:51:23 -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
amantley
a61909446a
Merge remote-tracking branch 'upstream/master' into animationBlendChanges
2018-08-07 10:40:22 -07:00
amantley
84619e7adc
cleaned up to match coding standards
2018-08-07 10:40:11 -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
MuteTab
d04ac2b8ed
Fixed jsdoc comments for Avatar::getWorldFeetPosition
2018-08-06 19:40:47 -07:00
amantley
1ad6b041cd
updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed
2018-08-06 18:36:32 -07:00
Anthony Thibault
079b276c2b
Merge pull request #13733 from luiscuenca/fixElbowPoleVector3
...
Elbow pole vectors improvements
2018-08-06 17:33:03 -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
SamGondelman
a7dec8fb75
parabola and particle shader fixes
2018-08-06 15:49:52 -07:00
MuteTab
40889c8f09
Added getWorldFeetPosition() function to Avatar
2018-08-06 15:35:54 -07:00
Sam Gondelman
7dd80d0180
Merge pull request #13240 from jherico/feature/glsl_layouts
...
Update shader pipeline, improve mac startup time
2018-08-06 15:30:46 -07:00
Brad Davis
dcdc3a323c
Use defines for packed textures to satisfy both GLES and GL 4.1
2018-08-06 14:35:36 -07:00
amantley
f1990378fd
merged the json from the ik 2 bone pr into the new animation json
2018-08-06 14:27:09 -07:00
Brad Davis
a0ef0c0b13
Fix procedurals
2018-08-06 10:31:14 -07:00
SamGondelman
6b7f5b662e
jsdoc fixes
2018-08-06 09:41:05 -07:00
amantley
08889b627a
Merge remote-tracking branch 'upstream/master' into animationBlendChanges
2018-08-06 09:16:53 -07:00
Angus Antley
a63b213d65
fixed the weight calculation for the hand overlays. to do: check the blends in hmd mode
2018-08-06 15:18:17 +01:00
Olivier Prat
c56bb9a855
Small optimization by using squared distance and not distance in depth sort
2018-08-06 08:20:21 +02:00