themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions
3496 commits 1 branch 1 tag 88 MiB
Commit graph

3496 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Enerdy
97b6f08523 'auth' no longer kicks superadmins when disabled 2016-10-15 00:31:57 +01:00
Enerdy
2320a913b4 Mark pointless permission as obsolete 2016-10-14 23:13:25 +01:00
Enerdy
b6267bbaa7 Auth system now checks if a superadmin exists 
The 'auth-verify' command was also removed and its alias was added to 'auth', which now does both things.
 2016-10-14 23:07:29 +01:00
Lucas Nicodemus
1c9faa84a8 Merge pull request #1293 from NyxStudios/new-contributing-guidelines 
Add new contributing guidelines
 2016-10-13 12:45:28 -06:00
White
0f86c6bf0f Submodule update for wyverns build 2016-10-13 12:49:45 +10:30
Lucas Nicodemus
0e97f299ee Gonna be completely honest I forgot 
I started typing this commit message and then forgot what it was.
I'm sure it's related to what wolfje said though.
 2016-10-10 18:21:19 -06:00
Lucas Nicodemus
cff0ecbc60 Add submodule init note change (thanks @levi-middleton) 2016-10-10 17:09:17 -06:00
Lucas Nicodemus
8a593f9504 Add note about taking suggestions 2016-10-10 17:06:37 -06:00
Lucas Nicodemus
9d2b655505 Update contributing with new pr-wanted & suggestion stuff 2016-10-10 16:58:23 -06:00
Lucas Nicodemus
c4cf2d496d Changed the taken account message to be more clear 
Thanks to Gameroom, Kirbyrocket, ProfessorX, etc. for drawing attention to this.
 2016-10-09 21:04:53 -06:00
Lucas Nicodemus
f8039c8f80 Rest API uses 'permissions' on /v2/groups/update 
Arguably this should be a change to a new API version, but the
current functionality is broken so this just kinda fixes that.

Fixes #1292
 2016-10-05 08:28:01 -06:00
Lucas Nicodemus
8cac17442d Revert "Experiment: Can travis run create_release.py?" 
This reverts commit e0e1de98d0.
 2016-10-04 09:16:26 -06:00
Lucas Nicodemus
e0e1de98d0 Experiment: Can travis run create_release.py? 2016-10-04 09:11:48 -06:00
White
93cc71a753 Fixed a typo in the changelog and ticked assembly version 2016-10-04 21:04:08 +10:30
White
d72bbb31a6 Changelog update 2016-10-04 21:02:27 +10:30
Lucas Nicodemus
4d641cd9c8 Update submodule for vitamin fixes 2016-10-04 04:14:36 -06:00
Lucas Nicodemus
c3855cb95f Update submodule for 1.25 2016-10-03 21:45:08 -06:00
Lucas Nicodemus
bcf8cb644f API Version Tick: 1.25 
Fixes compatibility with new API revision
 2016-10-03 21:40:13 -06:00
Lucas Nicodemus
5c1d5ae586 Use WorldPosition instead of ChestPosition 
Fixes build with 90d732b840 (I'm 99% sure WorldPosition is what we want to use but could be wrong)
 2016-10-03 21:05:39 -06:00
White
09fceeb73b Submodule update 2016-10-04 13:27:12 +10:30
ProfessorXZ
9948239cbf Fixed MagicalIceBlock checks 2016-09-30 20:43:13 +02:00
White
6050f23a01 Merge pull request #1288 from Patrikkk/general-devel 
Fix #1287 | Quickstack to nearby chests issue
 2016-09-25 20:05:17 +09:30
Patrikk
d77f363157 Fix #1287 | Quickstack to nearby chests issue 
CheckRangePermission accepts coordinate which is divided by 16.
The Position variable which is passed in ForceItemIntoChestEventArgs is
multiplied by 16.
(To be more exact. `new Vector2((float)(Main.chest[i].x * 16 + 16),
(float)(Main.chest[i].y * 16 + 16))`)
The + 16 is there to get the middle of the player so it can make an
accurate check when checking distance between chest and player.
So I'm not really sure if the Position arg should be even passed in the
eventarg.

Anyway, CheckRangePermission always returned true because of the above,
and handled the event, so players could never quickstack into nearby,
unless they had RangeChecks off.
"True if the player should not be able to place the tile." (In our case,
stack items into chest)

Why doesn't CheckRangePermission contain a check on an actual range
permission of the player's group? So groups with the permission could
bypass the check.
Just wondering if there is any legit reason for that.
 2016-09-25 02:07:15 +02:00
Lucas Nicodemus
70565da77f A bunch of random bs 2016-09-24 12:34:42 -06:00
White
0a8a6a2df2 Version 4.3.18 2016-09-23 18:52:00 +09:30
White
b19ad19f3a Updated CHANGELOG.md 2016-09-23 18:51:27 +09:30
White
36343dd8e7 Add a sandstorm command 2016-09-22 19:13:50 +09:30
White
9520e7e782 Update submodule for sandstorms 2016-09-22 19:12:48 +09:30
Rodrigo
db11897ed5 Merge pull request #1271 from ProfessorXZ/itemdrop-fix 
Fixed item duplication issues
 2016-09-19 13:33:04 +01:00
Rodrigo
d48300fe31 Merge pull request #1283 from ProfessorXZ/wind-fix 
Fixed UI issues caused by setting wind speed to high values
 2016-09-19 13:31:42 +01:00
White
b50a256581 Submodule update 2016-09-17 23:08:49 +09:30
White
6b41d96a99 Another submodule update for a real build fix 2016-09-16 01:15:02 +09:30
White
4612996483 Submodule update with fixed build 2016-09-16 00:42:42 +09:30
White
0848f880f5 Update submodule for 1.3.3.x 2016-09-15 23:31:17 +09:30
ProfessorXZ
4d4679da3b Merge pull request #1282 from ProfessorXZ/icerod-fix 
Fixed IceRod not placing ice blocks
 2016-09-12 22:25:52 +02:00
ProfessorXZ
9974441868 Added an extra IceRod check to HandleTile 2016-09-12 22:20:06 +02:00