Commit graph

4375 commits

Author SHA1 Message Date
Axeel
6f5283fef2
Add cn readme link in readme 2020-04-27 10:32:31 +08:00
Axeel
486829beb8
Add chinese version readme 2020-04-27 10:23:31 +08:00
Axeel
a847c29530
Merge pull request #2 from Pryaxis/general-devel
update
2020-04-27 10:18:14 +08:00
Chris
08aaa1e947
Merge pull request #1691 from Pryaxis/build-debugs
Publish artifacts in github for debug builds from CI
2020-02-12 03:37:44 +00:00
Lucas Nicodemus
df24792352
Publish artifacts in github for debug builds from CI
It's helpful to have debug builds available for people to download if
they need it.
2020-02-11 19:19:28 -08:00
Chris
9c805c0e7e Merge pull request #1690 from Pryaxis/remove-travis
Remove Travis CI integration
2020-02-10 05:49:04 +00:00
Lucas Nicodemus
e3301d04ef
Merge branch 'remove-travis' of github.com:Pryaxis/TShock into remove-travis 2020-02-09 21:45:26 -08:00
Lucas Nicodemus
11d2d63c20
∆: update readme with exp download docs 2020-02-09 21:45:07 -08:00
Lucas Nicodemus
484eccff2c Merge branch 'general-devel' into remove-travis 2020-02-09 21:32:06 -08:00
Chris
7028e3f3fc Merge pull request #1689 from Pryaxis/fix-msbuild-installer
Fix GitHub Actions with updated Windows Server 2019 builder
2020-02-10 05:31:18 +00:00
Lucas Nicodemus
64b2e532be
Remove Travis CI integration
Travis CI is not really worth having around when it doesn't work at all
anymore.
2020-02-09 21:30:22 -08:00
Lucas Nicodemus
c1811b3afb
Fix GitHub Actions with updated Windows Server 2019 builder
This changeset fixes several problems with the github actions build. It
removes the dependency on a repo script to install msbuild + VS. It
switches the shell back to cmd.exe, so that the scripts in build.yml
continue to run. It installs nuget via chocolatey, since that's not on
the path by default. Finally, it also uses built in MSBUILD to satisfy
the first statement.
2020-02-09 21:22:29 -08:00
Lucas Nicodemus
8bc31eed0a Use checkout@v1 instead of v2 for github actions
Checkout v1 supports submodules -- master (v2) does not.
2020-02-09 20:27:57 -08:00
Chris
20dab56407 Merge pull request #1686 from moisterrific/patch-2
Fix BoC false positive kick in NPCAddBuffTimeMax
2020-02-09 23:07:00 +00:00
moisterrific
6007edeb77
Fix BoC false positive kick in NPCAddBuffTimeMax
360 ticks = 6 seconds, according to the wiki, the max possible duration is proportional to dmg taken, so 7.5 seconds would be the max duration (aka 450 ticks)
2020-02-07 16:14:27 -05:00
Chris
ef17fe2262
Merge pull request #1685 from moisterrific/patch-1
Fix for Vortex armor set stealth flicker bug...again
2020-01-19 16:37:15 +10:30
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