Commit graph

70596 commits

Author SHA1 Message Date
Seth Alves
e5e9339a7b
Merge pull request #13819 from ElderOrb/FB16914
Avatar bookmarks missing from Avatar Favorites
2018-08-14 09:46:37 -07:00
Seth Alves
832eefd3a2
Merge pull request #13752 from ctrlaltdavid/M17208
Improve text in Avatar app's pop-ups
2018-08-14 08:48:04 -07:00
Seth Alves
54fa7dd0b6
Merge pull request #13817 from sethalves/fix-desktop-handshake
fix desktop press-x handshake
2018-08-14 08:42:10 -07:00
John Conklin II
73ef2ff09c
Merge pull request #13804 from thoys/fix/create/cantMoveFocusCameraOutPastLowLimit
MS17291: Create-app increase focus distance limit
2018-08-13 14:58:17 -07:00
Sabrina Shanman
99374c099a
Merge pull request #13816 from SamGondelman/fading
Fix parabola shader
2018-08-13 14:45:31 -07:00
Seth Alves
0a5c96ecc1
Merge pull request #13792 from luiscuenca/attachmentsAPImgr
Attachments API returns avatar entities
2018-08-13 14:21:13 -07:00
Alexander Ivash
f910757ec4 FB16914 - Avatar bookmarks missing from Avatar Favorites 2018-08-13 22:57:07 +03:00
Seth Alves
4fa0c96046 fix desktop press-x handshake 2018-08-13 11:57:48 -07:00
John Conklin II
a6e5ce76c6
Merge pull request #13811 from thoys/fix/create/deactivateCreateWhenWindowsClosed
MS16958: deactivate Create App when desktop windows are closed
2018-08-13 11:51:32 -07:00
SamGondelman
86ba8c3d81 fix parabola shader 2018-08-13 10:08:19 -07:00
Thijs Wenker
221dfb8979 typo fix 2018-08-11 05:46:48 +02:00
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
Thijs Wenker
f26188d5b8 added comment for limit choice 2018-08-11 01:54:13 +02: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
luiscuenca
dd93055d89 Convert and load attachments when rig is ready 2018-08-10 16:15:30 -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
Thijs Wenker
876079bb81 deactivate Create App when desktop windows are closed 2018-08-11 00:41:50 +02: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
Thijs Wenker
925cfc9b23 Set a max focus distance value of 14km to not lose the edit handles by far-clipping 2018-08-10 16:45:27 +02: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