themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'general-devel' of https://github.com/nyxstudios/TShock into general-devel

Browse source
This commit is contained in:
White 2015-07-10 18:35:49 +09:30
commit d171af4b09
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -2,7 +2,7 @@
This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large. This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large.
## TShock 4.3.2 (Unreleased) ## TShock 4.3.2
* Fixed the issue where using the Super Absorbent Sponge would disable users (@WhiteXZ) * Fixed the issue where using the Super Absorbent Sponge would disable users (@WhiteXZ)
* Fixed an issue in NetGetData where e.Length - 1 would be -1 (@WhiteXZ) * Fixed an issue in NetGetData where e.Length - 1 would be -1 (@WhiteXZ)
@ -20,7 +20,8 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Fixed disappearing NPCs (@WhiteXZ) * Fixed disappearing NPCs (@WhiteXZ)
* Added much more performant code, SendQ, to server module. Reduces downstream network overhead by at least 40% (@tylerjwatson) * Added much more performant code, SendQ, to server module. Reduces downstream network overhead by at least 40% (@tylerjwatson)
* API: Updated TSPlayer.Disable to use new buffs (@Enerdy) * API: Updated TSPlayer.Disable to use new buffs (@Enerdy)
* Updated default max projectile damage to 1,175 (based on 625 people) * Updated default max damage & projectile damage to 1,175 (based on 625 people)
* Fixed support for SSC (@WhiteXZ)
## TShock 4.3.1 ## TShock 4.3.1

2
TShockAPI/ConfigFile.cs
View file

@ -290,7 +290,7 @@ namespace TShockAPI
public bool AllowLoginAnyUsername = true; public bool AllowLoginAnyUsername = true;
[Description("The maximum damage a player/npc can inflict.")] [Description("The maximum damage a player/npc can inflict.")]
public int MaxDamage = 175; public int MaxDamage = 1175;
[Description("The maximum damage a projectile can inflict.")] [Description("The maximum damage a projectile can inflict.")]
public int MaxProjDamage = 1175; public int MaxProjDamage = 1175;

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -53,5 +53,5 @@ using System.Runtime.InteropServices;
// Also, be sure to release on github with the exact assembly version tag as below // Also, be sure to release on github with the exact assembly version tag as below
// so that the update manager works correctly (via the Github releases api and mimic) // so that the update manager works correctly (via the Github releases api and mimic)
[assembly: AssemblyVersion("4.3.1")] [assembly: AssemblyVersion("4.3.2")]
[assembly: AssemblyFileVersion("4.3.1")] [assembly: AssemblyFileVersion("4.3.2")]