samcake
d02c2ac8f5
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2017-12-19 13:39:27 -08:00
Sam Gateau
01ff08de1d
Merge pull request #12004 from SamGondelman/burp2
...
Fix caching of ktx texture files
2017-12-20 04:38:54 +07:00
SamGondelman
9aed825328
Merge remote-tracking branch 'upstream/master' into burp2
2017-12-19 11:39:21 -08:00
samcake
91e940dc3c
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2017-12-19 10:13:40 -08:00
Howard Stearns
f8cef6631b
Merge pull request #11995 from birarda/bug/fix-connection-reset
...
make udt::Connection live as long as node connection
2017-12-19 09:43:54 -08:00
Brad Hefta-Gaub
04fa4d2999
Merge pull request #12016 from SamGondelman/versionFix
...
Bump protocol version
2017-12-19 07:30:55 -08:00
John Conklin II
d4e44fec56
Merge pull request #12015 from sethalves/fix-av-collision-after-grab
...
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-19 07:01:37 -08:00
David Kelly
4fc69f8067
Merge pull request #11988 from davidkelly/dk/soldOut
...
Handle sold out items a bit better
2017-12-19 07:43:57 -07:00
SamGondelman
90d0e9dc32
bump protocol version
2017-12-18 18:35:15 -08:00
Anthony Thibault
7ea1f3b911
Merge pull request #12013 from sethalves/delete-expired-av-ents
...
when an avatar-entity's lifetime expires, remove it from avatarEntityData
2017-12-18 17:35:42 -08:00
Sam Gateau
8f6929fe53
Merge pull request #12011 from SamGondelman/skybox
...
Fix equirectangular skybox loading
2017-12-19 08:32:22 +07:00
Seth Alves
ca45c4e8da
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-18 17:30:56 -08:00
Thijs Wenker
3a55fcfaf5
Merge pull request #12014 from thoys/feat/list-assignment-types
...
list assignment types in assignment-client help
2017-12-18 16:55:57 -08:00
Zach Fox
6fc58b713e
Merge pull request #12009 from zfox23/commerce_dataTracking2
...
Commerce: Add Passphrase Auth Status data tracking
2017-12-18 16:26:59 -08:00
Thijs Wenker
1bfb62bd7f
list assignment types in assignment-client help
2017-12-18 15:32:32 -08:00
Zach Fox
a2fe2797ff
Merge pull request #11982 from zfox23/commerce_staticCertVersioning
...
Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()
2017-12-18 15:20:23 -08:00
Seth Alves
ddbb7a4416
when an avatar-entity's lifetime expires, remove it from avatarEntityData
2017-12-18 14:26:25 -08:00
SamGondelman
ee3c47d5ec
fix equirectangular skybox loading
2017-12-18 13:21:12 -08:00
samcake
df3b4421f4
Merging
2017-12-18 12:20:56 -08:00
Zach Fox
affd67d7d4
Merge pull request #12007 from zfox23/commerce_moreSecurityImages
...
Commerce: More security images!
2017-12-18 12:06:43 -08:00
Zach Fox
e075cd79fb
Add Passphrase Auth Status data tracking
2017-12-18 11:51:12 -08:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js
...
Cleanup names of debug stats and trace contexts.
2017-12-18 10:02:42 -08:00
Sam Gondelman
6814dfcbfc
weak_ptr _cacheFile
2017-12-17 22:09:20 -08:00
Sam Gondelman
6990dda48d
cr and cleanup
2017-12-17 16:11:55 -08:00
Ken Cooke
4d42dba300
Merge pull request #12005 from ctrlaltdavid/21674
...
Fix handshake mode staying on when release "x" if Ctrl or Shift pressed
2017-12-17 08:50:46 -08:00
David Rowe
5e19410293
Fix handshake satyhing on when release "x" if Ctrl or similar pressed
2017-12-17 15:23:40 +13:00
Brad Hefta-Gaub
637e24504c
Merge pull request #11951 from dback2/polymaterialurl
...
Allow space characters in material library name
2017-12-15 19:42:25 -08:00
SamGondelman
3ae52c0e0e
clear all _cacheFiles on recycle
2017-12-15 17:52:48 -08:00
Sam Gondelman
dab4b12a72
Merge pull request #12001 from hyperlogic/bug-fix/anim-skeleton-crash
...
Fix for crash in AnimSkeleton::getNumJoints()
2017-12-15 17:40:42 -08:00
Anthony J. Thibault
e2df9e29e2
Fix for crash in AnimSkeleton::getNumJoints()
...
When initAnimGraph is called it asynchronously loads the Animation graph in the background.
If the model url is changed, or the Model is deleted in between the initial load and it's completion,
It's possible to access a bad Rig::_animSkeleton pointer.
The fix is to hold onto the _animSkeleton pointer via a weak ref.
2017-12-15 16:46:27 -08:00
SamGondelman
3477aa57a8
remove extra recycle
2017-12-15 16:36:07 -08:00
Zach Fox
89795272c7
More security images!
2017-12-15 16:26:13 -08:00
SamGondelman
52c4aef721
keep _cacheFile alive
2017-12-15 16:23:53 -08:00
Seth Alves
b1503f7c46
Merge pull request #11976 from luiscuenca/fixLinuxAudioDLock
...
Fix getActiveDevice deadlocks on Linux
2017-12-15 15:41:41 -08:00
Anthony Thibault
f3fcac8e58
Merge pull request #11903 from Delanir/IPD8258
...
8258 IPD Tertiary Task List: Changing to Smaller Avatar Does not Resize Tablet
2017-12-15 15:37:27 -08:00
Brad Hefta-Gaub
c68bec175a
Merge pull request #11978 from hyperlogic/bug-fix/no-hip-glitches
...
More stable hips IK
2017-12-15 15:32:24 -08:00
Brad Hefta-Gaub
5087893097
Merge pull request #11804 from amantley/character_entity_fixes
...
Fixed Entity Animation Property not applying to FBXs
2017-12-15 15:31:11 -08:00
Brad Hefta-Gaub
4ceedf7731
Merge pull request #11986 from kencooke/audio-wavloader-fix
...
Unsupported WAV files should always be logged and not played
2017-12-15 15:24:24 -08:00
Brad Hefta-Gaub
45df668679
Merge pull request #11966 from SamGondelman/hysteresis
...
Update stylus touch hysteresis values
2017-12-15 15:22:41 -08:00
Brad Hefta-Gaub
95bfacb850
Merge pull request #11977 from ctrlaltdavid/21643
...
Enable user connection with "x" key when capslock is on
2017-12-15 15:22:00 -08:00
Brad Hefta-Gaub
6aebfd61c5
Merge pull request #11999 from luiscuenca/laserScaleFix
...
Make lasers scale with avatar
2017-12-15 15:21:01 -08:00
luiscuenca
53e1c57e3b
Make lasers scale with avatar
2017-12-15 13:46:15 -07:00
Bradley Austin Davis
a3ef4ce976
Merge pull request #11946 from ElderOrb/FB8992_2
...
8992 Login window is small in tablet
2017-12-15 09:10:49 -08:00
Stephen Birarda
a5c951a666
remove tracking of last receiver response from SendQueue
2017-12-14 16:41:20 -08:00
Stephen Birarda
75e56b5daa
make the _lastMessageNumber in Connection default to 0
2017-12-14 16:41:20 -08:00
Stephen Birarda
8a2c31d342
only de-activate the SendQueue when it has nothing to send
2017-12-14 16:41:20 -08:00
Stephen Birarda
cf28fdf188
fix message erase in conn, SendQueue ctor order
2017-12-14 16:41:20 -08:00
Atlante45
34c1c27455
Keep track of message numbers
2017-12-14 16:41:20 -08:00
Atlante45
702d2c34a5
Reset ACK in ctor
2017-12-14 16:41:20 -08:00
Atlante45
b2beeae6b1
Keep connection alive as long as the node is connected
2017-12-14 16:41:20 -08:00
