From 12f849be0168fa936ae63ec797e66ab91c8051d8 Mon Sep 17 00:00:00 2001 From: juanjp600 Date: Thu, 25 Aug 2016 18:55:32 -0300 Subject: [PATCH] Removed references to reliable sender Now the game is broken, progress is being made :) --- .vs/Subsurface_Solution/v14/.suo | Bin 837120 -> 837120 bytes Subsurface/Barotrauma.csproj | 2869 ++++++++--------- Subsurface/Source/Networking/ChatMessage.cs | 1 - Subsurface/Source/Networking/Client.cs | 7 +- Subsurface/Source/Networking/GameClient.cs | 32 +- Subsurface/Source/Networking/GameServer.cs | 51 +- .../Source/Networking/GameServerLogin.cs | 4 +- 7 files changed, 1442 insertions(+), 1522 deletions(-) diff --git a/.vs/Subsurface_Solution/v14/.suo b/.vs/Subsurface_Solution/v14/.suo index 188fc21d54af280052ad9995ae6d2807c2c2c798..3bf8db6325515e3e2d0e115228bfcc0da66ccf38 100644 GIT binary patch delta 4674 zcmc(i4^&iD9>?E(bKku8hG`gJK*B+WVImQPK@c}qwt-yN$}Kg|TFEI;!zlcVZE7il zC8?1DPx+~tA!`%<$wjA_PT7emYt!u<(fpHTgk^iO?ax-~u|nDJ8^&F2IlIMrP7gl( ze)o6p`@MVb@Atd!;jPW_*5=f?nNXiS@ERrv!Wl3Q%5+f>(tr&8DadEQcJRc`IX^H< z)1xud6M7D?;TSDkr!5p0vXA{|#0bXLX)J#Lm3%34zny0=c0s#QdXQCXL1~*suwV7B zyS#a!yN-qKYEW$P9G-e`HQ|BhA@k7Ir9VTlU+U)is%oN}GO#>s zdmOSBJP~fMf~*7e;kE|3I;=NB5?C8aN zkXyjkaCI4u#uCAdiA~!|e<8^-u0Hce5%l48P#A3qyPS z|1Nv{PhIwVSnd1ZIQRf`f)7C#H~~Hap`h2-S2o9qRrew_OCg^Kr ze!KrSw%6D$pF{LJ;=7W4nM|aHiRN5??#Q>xHE(9B<{F&9hG;=CN7{j9?AE?>rjfIP zIhFSeNCZH^8^lgXYQ=o6 z1{vXbNm^9&Hg>1>isg6W5>YcoPEn_zt4#0K=EMw$oq$Cw4sXK!u-ZV6_Ecng-owyR zz;G}LJOKU(9tVHL9p#Yo!2<9YSOvVIc40$mz~yFd@8){>(&i*XqSdtY&R9`*)c#Mrrzm&RoPY5f(LF*tPy}MY5^x@)Zh@@863#&PL5~C> z_pZpn4qeHG;Zd*{5NH8gfu1Z{MU1`AJUNd%8F2Hn7*Y!s>O+C;s*wKs5Nuo&HQAU#bq$h<+>_PZ zK*)rGcKMoVgoPT;v*Ja47F18;)F7k2RRWTcLVvUgs1$4Rq@k!!?>)RHYT@ z=|E39xehZ2?J@Ff4%3_3g3NTynP@i;5k%nwIBV9Yf3d(L)?my>p(P2#wnvN)jC+x{ zvbJ-)gRw$7@Ey;hNT0z%D{oiw17mjc7ghZTq0MfV5b}5o9_^QUl-9vxJDxgJ+dMdd zJn@pkk6*Ti4H$5+cMa#A$~)*gd|CgW(7#Xbr{;aksqL}3&CkO0cJC|&-&Irxb^7bTc*YnQEqocoV+5U2Vj%VrPdzQUXsqMTkwlPgjr#T7gezsc= zO4?5j3YESh$58WpC6zpx#v9q)zSEqO=S$UP9l1AYK}A7c%8re}(ouJn?4iaj2V{7(V^)jqPvE6``&BaeSic{AzQIeIy+0Tl$EsxJSbaIx3vT@97Pg z^?=Di4GuN4ub_sDE8l3eTW@Vh*cg*F#1(o1Vczawz58f=cSD8A{TcVlk>`WKY1 z89i~t*RvmbslAR|({SRjSeo@2kD}I~Y}L;m6Kn1FgS%SQk(Q&s{xD{Z`>Tk7r#>j( zf7oZ@VuN`cKZaL~f1{HY{{%w(u^dd4E8# z^Q7Z41)Jod5i{^6pMf{{J;Gdib(B&}t55Tc|0rmDI=cd=PjfSCJScm`O!%yGYJ%*~2zauz+3P_>J67 zo4%HlXw_G8Hn~6HPJN^$;Q3beh?M*TdP=r4nI1DJch=W0W5bCB_|0_a9PhsPS#ZLj zIH=={>|mQIIFGLibexqxX5>G~e^1F4C5a->!u8$V@>Nuqs5q(Q6JG5rkwiN22~VOX zgHl9^f050BTkOi!B2#JnASEuac#x99*uxaGDP`mxYL0uMKrt}dlmvh7Zh4IE#YD4v zWHW6{QOqOfO%?KSnm>ST!PbXP_R>o}w;9@0)!>x13tAf?W|mw695y zyJF5flG6Ua-f;#LB7MCdUnouajME$6%eJ(izX8K&Yl<>zObWiz@f)J-N^D4cq3&+$ g71`XxnhL3=!dO!w*HkDq6>3d|siq>rS7E;MpS@S5od5s; delta 2597 zcmbW(du&rx90&0JZqMywEwFYSqpU!;)dw)vvhk7-*pSFTNszZPlLi$fB-JILLXdTe zmB&!Jk{*PBg=po?pt_4=$Tl7upa`f;VcE`!}^OI+1xUcGnT=i{7#f z-)vzv<%Jpr9ht{s%>D4grv)LysQV!^vlE4VBgFUV17Eqgp?#q4rN_UdP-E&8eM9S9 zRQll^0a7SJsTvE>{RgiZVu+6XSg%mbgBGv1zt)FfX{3^(U4`JwXk{IO^^r;(ca9U8 zuPkPccj=yO`g>%MS33ebFheSYdAl^~N%#44X_Ug`PvXur8fG4kzL9c2o@rQ>TslzC z;ycr5xUi16%1%@I%88hY<_Q>*2BQ$mZQ~KQzyj=UE=sv=I{Hk|!dKd<=YT~BQ=l(Q zgqiRjyn{R(#FS}>qj~-m@mt^qc^mPMZbKfZ=7u!d5ZOZ+_7I6Qc5-UvZh4tuo@=Ls zc+|p=Usb;+S(Q9p-q^!c@s=@U^Vvd{&|p&qt%(&1?rscqTWHEs97#$yyb zMrF{*^nMLjG%)Fe2rT>fLrUtRNl-~ z7Rfz&#`Y>q66e|3+hF%6?VuYpP};Bd3hCR*$sPOFYJR#sDk})01m>B@Dm(@pW!eZ zfuryX{0hIpF{p;$;SV?tC!hvS!YMclZL8zD64q|~IW(My3vdzY;1XPhD{vL+p#iSJ zb+`dH;TAMP6WoS7a2Jexbs0zM;1wqL&$C-JOKLpNbmXsRGgJl~VpBYy zUC)}y#Ai0JJTgj+4NNCI;Wh0cs<_+9aQ-IIMr_T0FLJzCP@FEx8*nlw@$5=HSOTiwZkVp8hMF1r* z5J3fM(0~?VKnHqg2OU7Z5wR!@V1zg@K|FMX1n2~2=nP$;?G}Z*BJKt@r6Tb`W3=<> zwt=b2*1udL+A|`dH=q^sQC L$E6Fp^ppMp*Xko3 diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj index 633791f28..23959c65e 100644 --- a/Subsurface/Barotrauma.csproj +++ b/Subsurface/Barotrauma.csproj @@ -1,1446 +1,1445 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {008C0F83-E914-4966-9135-EA885059EDD8} - WinExe - Properties - Barotrauma - Barotrauma - 512 - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 0.1.0.%2a - false - true - v4.5 - - - - x86 - true - full - false - bin\Windows\Debug\ - DEBUG;TRACE;WINDOWS - prompt - 4 - false - - - x86 - pdbonly - true - bin\Windows\Release\ - TRACE;WINDOWS - + + + + Debug + x86 + 8.0.30703 + 2.0 + {008C0F83-E914-4966-9135-EA885059EDD8} + WinExe + Properties + Barotrauma + Barotrauma + 512 + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 0.1.0.%2a + false + true + v4.5 + + + + x86 + true + full + false + bin\Windows\Debug\ + DEBUG;TRACE;WINDOWS + prompt + 4 + false + + + x86 + pdbonly + true + bin\Windows\Release\ + TRACE;WINDOWS + .allowedextension - - prompt - 4 - false - - - Icon.ico - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - C:\Program Files (x86)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll - - - False - .\NVorbis.dll - - - False - C:\Program Files (x86)\MonoGame\v3.0\Assemblies\DesktopGL\OpenTK.dll - - - - ..\packages\RestSharp.105.1.0\lib\net4\RestSharp.dll - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - Designer - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - Always - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - PreserveNewest - Designer - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 4.5 - true - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - - - - - - - - - {0aad36e3-51a5-4a07-ab60-5c8a66bd38b7} - Farseer Physics MonoGame - - - {3b8f9edb-6e5e-450c-abc2-ec49075d0b50} - Hyper.ComponentModel - - - {49ba1c69-6104-41ac-a5d8-b54fa9f696e8} - Lidgren.Network - - - + + prompt + 4 + false + + + Icon.ico + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + C:\Program Files (x86)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll + + + False + .\NVorbis.dll + + + False + C:\Program Files (x86)\MonoGame\v3.0\Assemblies\DesktopGL\OpenTK.dll + + + + ..\packages\RestSharp.105.1.0\lib\net4\RestSharp.dll + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + Designer + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + Designer + PreserveNewest + + + PreserveNewest + + + Designer + PreserveNewest + + + PreserveNewest + + + Designer + PreserveNewest + + + Designer + PreserveNewest + + + Designer + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + Designer + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + Designer + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + Designer + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + Designer + PreserveNewest + + + PreserveNewest + + + Designer + PreserveNewest + + + PreserveNewest + + + Designer + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + Designer + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + Always + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + PreserveNewest + Designer + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + + + False + Microsoft .NET Framework 4 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 4.5 + true + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + + + + {0aad36e3-51a5-4a07-ab60-5c8a66bd38b7} + Farseer Physics MonoGame + + + {3b8f9edb-6e5e-450c-abc2-ec49075d0b50} + Hyper.ComponentModel + + + {49ba1c69-6104-41ac-a5d8-b54fa9f696e8} + Lidgren.Network + + + + --> \ No newline at end of file diff --git a/Subsurface/Source/Networking/ChatMessage.cs b/Subsurface/Source/Networking/ChatMessage.cs index 28c8b33f9..e6d0d63e9 100644 --- a/Subsurface/Source/Networking/ChatMessage.cs +++ b/Subsurface/Source/Networking/ChatMessage.cs @@ -1,5 +1,4 @@ using Barotrauma.Items.Components; -using Barotrauma.Networking.ReliableMessages; using Lidgren.Network; using Microsoft.Xna.Framework; using System; diff --git a/Subsurface/Source/Networking/Client.cs b/Subsurface/Source/Networking/Client.cs index 55c8cfc3a..1002fd918 100644 --- a/Subsurface/Source/Networking/Client.cs +++ b/Subsurface/Source/Networking/Client.cs @@ -1,5 +1,4 @@ -using Barotrauma.Networking.ReliableMessages; -using Lidgren.Network; +using Lidgren.Network; using System; using System.Collections.Generic; using System.ComponentModel; @@ -40,8 +39,6 @@ namespace Barotrauma.Networking public JobPrefab assignedJob; public FileStreamSender FileStreamSender; - - public ReliableChannel ReliableChannel; public float deleteDisconnectedTimer; @@ -55,7 +52,7 @@ namespace Barotrauma.Networking public Client(NetPeer server, string name, byte ID) : this(name, ID) { - ReliableChannel = new ReliableChannel(server); + } public Client(string name, byte ID) diff --git a/Subsurface/Source/Networking/GameClient.cs b/Subsurface/Source/Networking/GameClient.cs index 7c74fe45f..3e551e944 100644 --- a/Subsurface/Source/Networking/GameClient.cs +++ b/Subsurface/Source/Networking/GameClient.cs @@ -2,7 +2,6 @@ using Lidgren.Network; using Microsoft.Xna.Framework; using System.Collections.Generic; -using Barotrauma.Networking.ReliableMessages; using FarseerPhysics; using System.IO; using System.Linq; @@ -17,8 +16,6 @@ namespace Barotrauma.Networking private GUIMessageBox reconnectBox; - private ReliableChannel reliableChannel; - private FileStreamReceiver fileStreamReceiver; private Queue> requestFileQueue; @@ -128,7 +125,6 @@ namespace Barotrauma.Networking client = new NetClient(config); netPeer = client; - reliableChannel = new ReliableChannel(client); client.Start(); NetOutgoingMessage outmsg = client.CreateMessage(); @@ -429,8 +425,6 @@ namespace Barotrauma.Networking DebugConsole.ThrowError("Error while receiving message from server", e); #endif } - - reliableChannel.Update(deltaTime); if (gameStarted && respawnManager != null) { @@ -452,17 +446,7 @@ namespace Barotrauma.Networking } } - var message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.ReliableChannel); - if (message != null) - { - ReliableMessage reliableMessage = reliableChannel.CreateMessage(); - message.Position = 0; - reliableMessage.InnerMessage.Write(message.ReadBytes(message.LengthBytes)); - - reliableChannel.SendMessage(reliableMessage, client.ServerConnection); - } - - message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.Unreliable); + var message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.Unreliable); if (message != null) client.SendMessage(message, NetDeliveryMethod.Unreliable); message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.ReliableLidgren); @@ -525,12 +509,6 @@ namespace Barotrauma.Networking byte packetType = inc.ReadByte(); - if (packetType == (byte)PacketTypes.ReliableMessage) - { - if (!reliableChannel.CheckMessage(inc)) continue; - packetType = inc.ReadByte(); - } - switch (packetType) { case (byte)PacketTypes.CanStartGame: @@ -685,10 +663,8 @@ namespace Barotrauma.Networking break; case (byte)PacketTypes.ResendRequest: - reliableChannel.HandleResendRequest(inc); break; case (byte)PacketTypes.LatestMessageID: - reliableChannel.HandleLatestMessageID(inc); break; case (byte)PacketTypes.VoteStatus: Voting.ReadData(inc); @@ -1226,12 +1202,6 @@ namespace Barotrauma.Networking var chatMessage = ChatMessage.Create( gameStarted && myCharacter != null ? myCharacter.Name : name, message, (ChatMessageType)type, gameStarted ? myCharacter : null); - - ReliableMessage msg = reliableChannel.CreateMessage(); - msg.InnerMessage.Write((byte)PacketTypes.Chatmessage); - chatMessage.WriteNetworkMessage(msg.InnerMessage); - - reliableChannel.SendMessage(msg, client.ServerConnection); } /// diff --git a/Subsurface/Source/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs index 56f0ebe79..349980688 100644 --- a/Subsurface/Source/Networking/GameServer.cs +++ b/Subsurface/Source/Networking/GameServer.cs @@ -6,7 +6,6 @@ using System.Linq; using Lidgren.Network; using Microsoft.Xna.Framework; using RestSharp; -using Barotrauma.Networking.ReliableMessages; using Barotrauma.Items.Components; namespace Barotrauma.Networking @@ -343,9 +342,7 @@ namespace Barotrauma.Networking foreach (Client c in connectedClients) { - if (c.FileStreamSender != null) UpdateFileTransfer(c, deltaTime); - - c.ReliableChannel.Update(deltaTime); + if (c.FileStreamSender != null) UpdateFileTransfer(c, deltaTime); } NetIncomingMessage inc = null; @@ -482,12 +479,6 @@ namespace Barotrauma.Networking return; } - if (packetType == (byte)PacketTypes.ReliableMessage) - { - if (!sender.ReliableChannel.CheckMessage(inc)) return; - packetType = inc.ReadByte(); - } - switch (packetType) { case (byte)PacketTypes.NetworkEvent: @@ -581,10 +572,8 @@ namespace Barotrauma.Networking break; case (byte)PacketTypes.ResendRequest: - sender.ReliableChannel.HandleResendRequest(inc); break; case (byte)PacketTypes.LatestMessageID: - sender.ReliableChannel.HandleLatestMessageID(inc); break; case (byte)PacketTypes.Vote: Voting.RegisterVote(inc, connectedClients); @@ -653,17 +642,7 @@ namespace Barotrauma.Networking foreach (Client c in recipients) { - var message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.ReliableChannel, c.Connection); - if (message != null) - { - ReliableMessage reliableMessage = c.ReliableChannel.CreateMessage(); - message.Position = 0; - reliableMessage.InnerMessage.Write(message.ReadBytes(message.LengthBytes)); - - c.ReliableChannel.SendMessage(reliableMessage, c.Connection); - } - - message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.ReliableLidgren, c.Connection); + var message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.ReliableLidgren, c.Connection); if (message!=null) { server.SendMessage(message, c.Connection, NetDeliveryMethod.ReliableUnordered); @@ -1483,19 +1462,7 @@ namespace Barotrauma.Networking recipients.Add(c); } - AddChatMessage(message); - - foreach (Client c in recipients) - { - ReliableMessage msg = c.ReliableChannel.CreateMessage(); - msg.InnerMessage.Write((byte)PacketTypes.Chatmessage); - //msg.InnerMessage.Write((byte)type); - //msg.InnerMessage.Write(message); - - message.WriteNetworkMessage(msg.InnerMessage); - - c.ReliableChannel.SendMessage(msg, c.Connection); - } + AddChatMessage(message); } public override void SendChatMessage(string message, ChatMessageType? type = null) @@ -1556,17 +1523,7 @@ namespace Barotrauma.Networking public void SendChatMessage(ChatMessage chatMessage, List recipients) { - foreach (Client c in recipients) - { - ReliableMessage msg = c.ReliableChannel.CreateMessage(); - msg.InnerMessage.Write((byte)PacketTypes.Chatmessage); - //msg.InnerMessage.Write((byte)type); - //msg.InnerMessage.Write(message); - - chatMessage.WriteNetworkMessage(msg.InnerMessage); - - c.ReliableChannel.SendMessage(msg, c.Connection); - } + } private void ReadCharacterData(NetIncomingMessage message) diff --git a/Subsurface/Source/Networking/GameServerLogin.cs b/Subsurface/Source/Networking/GameServerLogin.cs index 5b0e54df3..8305d883a 100644 --- a/Subsurface/Source/Networking/GameServerLogin.cs +++ b/Subsurface/Source/Networking/GameServerLogin.cs @@ -1,5 +1,4 @@ -using Barotrauma.Networking.ReliableMessages; -using Lidgren.Network; +using Lidgren.Network; using Microsoft.Xna.Framework; using System; using System.Collections.Generic; @@ -161,7 +160,6 @@ namespace Barotrauma.Networking if (existingClient != null) { existingClient.Connection = inc.SenderConnection; - existingClient.ReliableChannel = new ReliableChannel(server); LogClientIn(inc); return; }