Commit graph

70578 commits

Author SHA1 Message Date
Robin K Wilson
ac37f476d9
Merge pull request #13761 from robin-k-wilson/simplifyBuildInstructions
Reordered build.md instructions
2018-08-10 20:16:00 -07:00
John Conklin II
b56d9c3ea5
Merge pull request #13807 from SamGondelman/fading
Fixing fading
2018-08-10 16:35:10 -07:00
Zach Fox
57d2f04f14
Merge pull request #13799 from davidkelly/dk/17340
Only update gain if it really changed
2018-08-10 16:20:24 -07:00
Sam Gateau
d5c5bd714f
Merge pull request #13785 from AndrewMeadows/no-update-fading-avatars
don't call Avatar::simulate() on fading avatars
2018-08-10 15:44:07 -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
Sam Gateau
9cb0c36d90
Merge pull request #13805 from NissimHadar/exportToTestRail1
Auto-Tester export to TestRail
2018-08-10 14:40:12 -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
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
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
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
David Kelly
2b5ecd6b5f remove extraneous log 2018-08-10 10:12:32 -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
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
NissimHadar
65f8cdd00a Merge branch 'master' of github.com:highfidelity/hifi into exportToTestRail1 2018-08-10 08:52:24 -07:00
NissimHadar
c0e25e64c0 Added Python installation instructions. 2018-08-10 08:50:37 -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
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
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
Sam
5fd3862c94 FIx shader error on mac in shadow.slh 2018-08-10 00:45:25 +02: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
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
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