Commit graph

25613 commits

Author SHA1 Message Date
Stephen Birarda
1a6546999a track reliably sent adds in sent packet history from OEPS 2017-12-19 16:00:55 -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
SamGondelman
90d0e9dc32 bump protocol version 2017-12-18 18:35:15 -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
SamGondelman
ee3c47d5ec fix equirectangular skybox loading 2017-12-18 13:21:12 -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
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
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
Seth Alves
b1503f7c46
Merge pull request #11976 from luiscuenca/fixLinuxAudioDLock
Fix getActiveDevice deadlocks on Linux
2017-12-15 15:41:41 -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
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
Zach Fox
504949cd32 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning 2017-12-14 12:08:00 -08:00
NissimHadar
df34103895
Merge pull request #11980 from NissimHadar/crashFix10537
Protect against use of null HazePointer.
2017-12-14 11:45:49 -08:00
Ken Cooke
b6a88bbdda Invalid WAV files should always be logged and not played 2017-12-14 10:20:46 -08:00
Zach Fox
af346f2ced Protocol change 2017-12-14 10:09:10 -08:00
amantley
5bc113c818 deleted some debug print statements in ModelEntityItemcpp and deleted else statement that was superfluous 2017-12-13 19:07:23 -08:00
Zach Fox
4980c769c0 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning 2017-12-13 17:30:19 -08:00
Zach Fox
ed5082e5d4
Merge pull request #11974 from birarda/feat/staging-env-or-cl
allow custom metaverse URL to be used with env var
2017-12-13 17:29:45 -08:00
amantley
2817eadb7a iMerge remote-tracking branch 'origin/character_entity_fixes' into character_entity_fixes
updating branch with remote
2017-12-13 16:48:33 -08:00
amantley
7c29a1b09a Merge remote-tracking branch 'origin/master' into character_entity_fixes
updating branch to master
2017-12-13 16:47:15 -08:00
luiscuenca
483443d218 No mutex 2017-12-13 17:02:36 -07:00
luiscuenca
e581c66b56 added mutex for audio handler 2017-12-13 16:11:46 -07:00
Nissim Hadar
79f0124244 Protect against use of null HazePointer. 2017-12-13 15:02:03 -08:00
Nissim Hadar
b4df115507 Protect against use of null HazePointer. 2017-12-13 12:53:01 -08:00
Zach Fox
d388ca5ac9 Missed a spot. That was the problem the whole time. 2017-12-13 11:22:31 -08:00
luiscuenca
e709561a62 Fix getActiveDevice deadlocks on Linux 2017-12-13 12:14:49 -07:00
Sam Gateau
a75010fb94
Merge pull request #11938 from Zvork/csm
Cascaded Shadow Maps and bug fix
2017-12-14 00:32:43 +07:00
Olivier Prat
19e240460d Slightly optimized matrix operations in LightStage as samcake's remark 2017-12-13 15:30:57 +01:00
Zach Fox
7113a72f2e Bugfixes 2017-12-12 18:04:20 -08:00
MiladNazeri
8a28d04322
Merge pull request #11885 from ctrlaltdavid/21624
Overlays JSDoc
2017-12-12 17:04:46 -08:00
Stephen Birarda
7a81c3e8e7 allow passing of custom URL on env 2017-12-12 16:32:43 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
Zach Fox
bced55801d ABC ORDER! 2017-12-12 15:52:35 -08:00
Zach Fox
f5df83667f Add getStaticCertificateJSON() to Entity Scripting Interface 2017-12-12 15:50:04 -08:00