Commit graph

4359 commits

Author SHA1 Message Date
moisterrific
f50aba8ba6
Fix for Vortex armor set stealth flicker bug
tests on my end showed it fixed, plz confirm as well
2020-01-10 17:55:49 -05:00
Lucas Nicodemus
0ac7e39718
Merge pull request #1682 from Pryaxis/all-contributors/add-sgkoishi
docs: add sgkoishi as a contributor
2019-10-03 06:54:04 -07:00
allcontributors[bot]
260600b15f
docs: update .all-contributorsrc 2019-10-03 13:40:04 +00:00
allcontributors[bot]
4037a9e7ff
docs: update README.md 2019-10-03 13:40:03 +00:00
Lucas Nicodemus
9901281669
Merge pull request #1681 from sgkoishi/general-devel
Add GitHub Actions build
2019-10-03 06:39:38 -07:00
SGKoishi
8edea2c4d0
Fix the space in url 2019-10-02 16:58:08 -07:00
SGKoishi
1915d69f08
Rename the action to Build Server 2019-10-02 16:56:50 -07:00
SGKoishi
fdbc958b34
Include the download script 2019-10-02 16:29:26 -07:00
SGKoishi
79b092b9c1
Add GitHub Actions build script and badge 2019-10-02 14:01:46 -07:00
Lucas Nicodemus
af6e42292b
Delete old github actions workflow
Apparently now we've been upgraded?
2019-09-04 22:21:02 -07:00
Lucas Nicodemus
5788c40aba
Create old style github actions workflow?
Does anything here work?
2019-09-04 22:19:12 -07:00
Lucas Nicodemus
6fb2d7b585
Move test action to workflows folder 2019-09-04 22:15:19 -07:00
Lucas Nicodemus
b40a6f41c2
Create msbuild-test.yml github action
This tests out the github actions system, which is quite weird and undocumented. It says this only works with .NET core by default but also supports "4.5.1" as a version. It also says we aren't in the right github actions beta, so this shouldn't work at all.
2019-09-04 22:12:03 -07:00
Chris
e3bac1871a
Update Bouncer.cs
Removes double occurrence of daybreak buff from dictionary.
Thanks for pointing this out @AxeelAnder
2019-07-18 13:54:20 +00:00
Lucas Nicodemus
38e781caa5
Merge pull request #1672 from Pryaxis/all-contributors/add-AxisKriel
docs: add AxisKriel as a contributor
2019-06-05 06:32:42 -07:00
allcontributors[bot]
f46808476c docs: update .all-contributorsrc 2019-06-05 13:31:50 +00:00
allcontributors[bot]
15bd8e59bd docs: update README.md 2019-06-05 13:31:49 +00:00
Lucas Nicodemus
1a3c23a3c2
Merge pull request #1671 from Pryaxis/all-contributors/add-AviKav
docs: add AviKav as a contributor
2019-06-05 06:25:56 -07:00
Lucas Nicodemus
b2ab8e1feb
∆: Format badge correctly 2019-06-05 06:25:14 -07:00
allcontributors[bot]
321bf8b12f docs: create .all-contributorsrc 2019-06-05 13:22:19 +00:00
allcontributors[bot]
ee464901d4 docs: update README.md 2019-06-05 13:22:18 +00:00
Lucas Nicodemus
84f6c7b0c0
Add sponsorship badge & support
Since we don't have any developers with GitHub sponsorships turned on, and we don't currently accept donations, this enables the sponsor button so people can donate money to very poor people.
2019-06-05 06:03:10 -07:00
Chris
de390a6ad2
Merge pull request #1667 from Pryaxis/backport-verison-tick
Backport (frontport) version number from future master to gen-dev
2019-04-01 14:15:59 +10:30
Chris
3583fd6668
Merge branch 'general-devel' into backport-verison-tick 2019-04-01 13:43:10 +10:30
Chris
bc06c18fec
Merge pull request #1669 from Pryaxis/update-sqlite-binaries
Update to 32bit sqlite 3.27.2 binaries
2019-04-01 13:41:05 +10:30
Lucas Nicodemus
ae2056ae83
Merge branch 'general-devel' into update-sqlite-binaries 2019-03-31 13:14:16 -07:00
Lucas Nicodemus
abe67c9fa0 Update changelog 2019-03-31 13:12:37 -07:00
Lucas Nicodemus
2aecedca95 Update to 32bit sqlite 3.27.2 binaries 2019-03-31 12:49:38 -07:00
Lucas Nicodemus
60f0c3c9df
Merge branch 'general-devel' into backport-verison-tick 2019-03-29 20:45:16 -07:00
Chris
db9ce8180d
Merge pull request #1623 from Pryaxis/player-data
Initialize PlayerData on connect
2019-03-30 14:14:13 +10:30
Lucas Nicodemus
f30f44d00d
Merge branch 'general-devel' into backport-verison-tick 2019-03-29 20:41:51 -07:00
Chris
9b75342bff
Merge branch 'general-devel' into player-data 2019-03-30 13:58:19 +10:30
Chris
b50cac1d2f
Merge pull request #1654 from Pryaxis/fix-1653
Solves #1653
2019-03-30 13:57:59 +10:30
Chris
f3627bb45a
Merge branch 'general-devel' into fix-1653 2019-03-30 13:52:25 +10:30
Chris
59058657cf
Merge pull request #1657 from tysonstrange/general-devel
Added confused debuff for Brain of Confusion
2019-03-30 13:49:32 +10:30
Chris
1ae2e34128
Merge branch 'general-devel' into player-data 2019-03-30 13:47:33 +10:30
Chris
76eeab1090
Merge branch 'general-devel' into fix-1653 2019-03-30 13:46:12 +10:30
Chris
429a5051fd
Merge branch 'general-devel' into general-devel 2019-03-30 13:36:28 +10:30
Ziteng Wang
5fd6280bc8
Merge pull request #1665 from Pryaxis/update-copyright-again
Update copyright to 2019
2019-03-29 18:12:19 -07:00
Lucas Nicodemus
6fce167c10 Verison Tick: TShock 4.3.26 2019-03-29 17:51:35 -07:00
Lucas Nicodemus
79f142f908 Change current TShock codename to "Zombie"
This change incorporates feedback from #1661 which indicates
that we should update the source code when changing copyright
dates.
2019-03-29 17:27:34 -07:00
Lucas Nicodemus
70dd72443d Update copyright to 2019 again
Fixes #1658, most likely.
2019-03-29 17:16:37 -07:00
Tyson Strange
6315086cb1 Added to Bouncer NPCAddBuffTimeMax for Solar Eruption Item ID: 3473, Daybreak Item ID: 3543 2019-02-03 17:41:23 +10:00
Tyson Strange
dbf9264d12 update change log 2019-02-03 17:19:52 +10:00
Tyson Strange
12c34256ac Added confused debuff for Brain of Confusion 2019-02-03 15:56:43 +10:00
Tyson Strange
2440e044b1 Added confused debuff for Brain of Confusion 2019-02-03 15:55:19 +10:00
Chris
550967b430
Merge branch 'general-devel' into player-data 2018-12-24 13:57:10 +10:30
Chris
10d7a4f35b
Update CHANGELOG.md 2018-12-24 13:56:47 +10:30
Chris
9975c445f8
Proposed fix for #1653 - Testing required
From #1653:
>From latest version (2301)
If a player puts on a banned peice of armour, they get the message to say "You are wearing banned equipment"
After they take it off, the messages stop, but they keep getting disabled.
Solution:
Approx line 1131 in tShock.cs on `OnSecondUpdate` the `tsplayer.IsDisabledForBannedWearable` gets set to true, but it never gets set to false.
Change:
```csharp
if (check != "none")
player.IsDisabledForBannedWearable = true;
```
>To:
```csharp
if (check != "none")
player.IsDisabledForBannedWearable = true;
else
player.IsDisabledForBannedWearable = false;
```

Requires testing
2018-12-24 13:54:39 +10:30
Lucas Nicodemus
da645ccaf5
Merge pull request #1648 from AxeelAnder/proj-disable-reason
Concrete information when player disabled by creating banned projectile
2018-10-31 15:22:20 -07:00