Commit graph

3532 commits

Author SHA1 Message Date
Lucas Nicodemus
d1fbebcbc1
Make readme a little more clear on dev builds 2016-10-22 22:43:07 -06:00
Lucas Nicodemus
eb8b1cb8cf
Moved gpl script into the scripts folder
I seriously thought the PR moved it there but I guess not? Oh well.
2016-10-22 22:36:28 -06:00
Lucas Nicodemus
8f7b8db2a1 Put a link to the travis build downloads in the readme 2016-10-21 23:40:51 -06:00
Lucas Nicodemus
c6822b9be7 Remove 'Unreleased' and 'Pre-Release' designation from cl entries 2016-10-21 22:26:26 -06:00
Lucas Nicodemus
3d43834a42 Update submodule & changelog for recent patches
Fixes #1311, and covers commits from PRs in the changelog that
weren't yet added up to now.
2016-10-21 22:23:34 -06:00
White
09bbf8abe8 Removed colour parsing from the ShowFileToUser method.
Also added an info log message if a file contains the old format.
Fixes #1314
2016-10-20 21:03:25 +10:30
Rodrigo
78a4185152 Merge pull request #1312 from Simon311/general-devel
Add /accountinfo, fix offline bans exploit, fix #1309 more
2016-10-18 18:59:13 +01:00
Simon
186bb70186 Add /accountinfo, fix offline bans exploit, fix #1309 more 2016-10-18 09:50:10 +03:00
Lucas Nicodemus
dce26d6928 Merge pull request #1310 from Simon311/general-devel
Fix for HealOtherPlayer exploit, also fix #1309
2016-10-17 08:51:19 -06:00
Simon
68799d9d20 Fix description 2016-10-17 16:17:44 +03:00
Simon
464a52a70a Misleading wiki caused this commit 2016-10-17 16:05:18 +03:00
Simon
1460a7ad91 Fix for HealOtherPlayer exploit, also fix #1309 2016-10-17 15:51:49 +03:00
Lucas Nicodemus
40fdc1160e Add white to a changelog item
(White code reviewed this issue)
2016-10-17 03:07:06 -06:00
Lucas Nicodemus
9b7ca644b5 Version Tick: 4.3.20 2016-10-17 02:41:22 -06:00
Lucas Nicodemus
198825deac Submodule update for #1308 / #921 2016-10-17 02:36:48 -06:00
Rodrigo
c42b6239ed Merge pull request #1307 from va6996/general-devel
Add script for GPL
2016-10-17 07:18:29 +01:00
Vinayak Agarwal
01778531c6 Remove headers from autogenerated file 2016-10-17 11:28:34 +05:30
Vinayak Agarwal
e225b1fb50 Merge pull request #1 from NyxStudios/general-devel
Merge changes
2016-10-17 11:24:54 +05:30
White
9cd43c97e9 Merge pull request #1300 from ProfessorXZ/general-devel
Fixes #1021
2016-10-17 09:48:09 +10:30
Rodrigo
027c3fb390 Merge pull request #1306 from adilsoncarvalho/hacktoberfest-gpl-headers
Update all the GPL headers #1305
2016-10-16 23:13:41 +01:00
Vinayak Agarwal
4bdae494cb Add script for GPL 2016-10-17 03:31:35 +05:30
Adilson Carvalho
ad03215986 Added GPL header on all code files when missing 2016-10-16 17:33:19 -02:00
Adilson Carvalho
49b4effe74 Changed year to 2016 on all GPL headers 2016-10-16 17:06:02 -02:00
Lucas Nicodemus
90c6f4ab22 Update changelog with @Simon311's changes 2016-10-16 09:31:23 -06:00
Lucas Nicodemus
c2a656b8fb Merge pull request #1304 from Simon311/general-devel
Ensure that players can not connect once the server started shutting down
2016-10-16 09:14:42 -06:00
Simon
5be85b9864 Ensure that players can not connect once the server started shutting down 2016-10-16 13:58:05 +03:00
Rodrigo
0ec49ab593 Merge pull request #1303 from Simon311/general-devel
Fix /"
2016-10-16 11:55:45 +01:00
Simon
60a8362e27 Add ToLower() back 2016-10-16 12:42:05 +03:00
Lucas Nicodemus
3416f20d49 Please send PRs that have text in the description 2016-10-16 01:07:04 -06:00
Simon
b16b9e70f2 Add brackets 2016-10-16 09:48:46 +03:00
Simon
54915bcf47 Fix /" 2016-10-16 08:58:55 +03:00
Lucas Nicodemus
bba0d72a29 Can't chmod a file before it exists 2016-10-15 14:33:38 -06:00
Lucas Nicodemus
b20e2060a2 Move decryption of secret key file into create release script 2016-10-15 14:27:17 -06:00
ProfessorXZ
ec4152df81 Separated the Flower Boots check into multiple if statements 2016-10-15 22:19:57 +02:00
ProfessorXZ
fb2fc6772e Fixes #1021 2016-10-15 22:19:57 +02:00
Lucas Nicodemus
b433e2f232 Tell travis not to use sudo 2016-10-15 13:31:12 -06:00
Lucas Nicodemus
b064b3a078 Update private key file for NyxStudios/TShock repo 2016-10-15 13:09:24 -06:00
Lucas Nicodemus
2f6a6921aa Ignore ssh private key files 2016-10-15 12:57:56 -06:00
Lucas Nicodemus
d4ab183e70 Try to turn off strict host key checking 2016-10-15 12:57:04 -06:00
Lucas Nicodemus
d6747e9e4d Tell openssl to actually go to where the key is to decrypt 2016-10-15 12:51:02 -06:00
Lucas Nicodemus
7626e18348 Update create_release with new instructions for existing key 2016-10-15 12:48:09 -06:00
Lucas Nicodemus
c4788fec12 Add private key 2016-10-15 12:47:26 -06:00
Lucas Nicodemus
cf69fc6860 Relative path link xbuild 2016-10-15 11:43:00 -06:00
Lucas Nicodemus
0cbc45ce9a Update travis.yml to run create_release 2016-10-15 11:39:07 -06:00
Lucas Nicodemus
4fcabd5272 Merge branch 'general-devel' of github.com:nicatronTg/TShock into general-devel 2016-10-15 11:37:33 -06:00
Lucas Nicodemus
bbe0462b41 Update create release script for travis 2016-10-15 11:37:02 -06:00
Lucas Nicodemus
f35d84213b Put the logo in the readme 2016-10-14 21:25:10 -06:00
Lucas Nicodemus
f993c03f5b Merge pull request #1302 from NyxStudios/auth-rewrite
Auth rewrite. Closes #1064.
2016-10-14 17:42:13 -06:00
Enerdy
dcaae17ffe Fix that one missing message & Update CHANGELOG.md 2016-10-15 00:39:13 +01:00
Enerdy
a49a7f35cc Fully remove 'auth-verify' because it was unclassy 2016-10-15 00:34:32 +01:00