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

3850 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lucas Nicodemus
471f287f35 Merge branch 'general-devel' into fix-build 2017-07-23 22:06:53 -06:00
Lucas Nicodemus
7768511e6e Update travis ci badge 2017-07-23 22:05:55 -06:00
Leo Li
0753e6d213 Add more HintPaths for OTAPI 
This will help msbuild to find missing libraries when create release
with `/p:Configuration=Release`.

With this patch, the searching order will be:
  - If OTAPI with same configuration found, use that.
  - Else if OTAPI with Release configuration found, use that.
  - Else use OTAPI with Debug configuration.
 2017-07-23 20:42:42 -07:00
Lucas Nicodemus
156ce52845 Closes #1478 
This addresses code feedback in the previously deleted pull request
 2017-07-20 18:10:16 -06:00
Hussein Farran
8b18de5a2a Merge pull request #1465 from ProfessorXZ/validateplaceobject 
Validate tile placement on PlaceObject, update CHANGELOG.md. Fixes #1418
 2017-07-18 13:35:36 -04:00
Hussein Farran
3b32774a0d Merge branch 'general-devel' into validateplaceobject 2017-07-18 10:27:29 -04:00
Rodrigo
15b9537c5d Merge pull request #1476 from deadsurgeon42/tristate-player-hooks 
Turn the player hooks into a tristate #1470
 2017-07-17 17:24:20 +01:00
Ruby Rose
7f68053d3a Update CHANGELOG.md 2017-07-17 09:06:29 +03:00
Ruby Rose
685d9964f0 Change enum names for clarity 2017-07-17 09:06:29 +03:00
Ruby Rose
3764527d3d don't inherit handled event args for them 2017-07-17 09:06:29 +03:00
Ruby Rose
79f66f554f Turn the player hooks into a tristate 2017-07-17 09:06:29 +03:00
Ruby Rose
02be378a2e change doc of Equals 2017-07-17 06:34:30 +03:00
Ruby Rose
5e1be5b19b Fix formatting below IEquatable block 2017-07-17 06:34:30 +03:00
Ruby Rose
c8e31231ba override ToString of user 2017-07-17 06:34:30 +03:00
Ruby Rose
4216501c45 Make User implement IEquatable for more consistent comparisons 2017-07-17 06:34:30 +03:00
Lucas Nicodemus
b387d42e53 Add PR template file 2017-07-16 21:21:42 -06:00
Jordan Coulam
1cdd33a78a Added ignoreVersion and loaded plugin list to StatTracking for issue #1444 (#1445) 2017-07-16 20:56:56 -06:00
Lucas Nicodemus
ae4f1ed779 Merge branch 'general-devel' into validateplaceobject 2017-07-15 13:39:33 -06:00
MarioE
ac8fe2a215 Remove netID handling of GiveItem, and provide a smaller overload 2017-07-15 13:32:35 -06:00
Lucas Nicodemus
983a678ff3 Fix issue 1467 - Password is now hashed when adding a user via REST API 2017-07-15 13:32:27 -06:00
Ryozuki
587d1b7390 fix comment typo 2017-07-15 13:32:09 -06:00
Pia Mancini
db480a16f0 Add backers and sponsors from Open Collective 
Now your open collective backers and sponsors can to appear directly on your README. 
see how it'll look [here](https://github.com/apex/apex#backers)
[More info](https://github.com/opencollective/opencollective/wiki/Github-banner)
Also add badges on top
 2017-07-15 13:32:09 -06:00
ProfessorXZ
6b3f18b1da Validate tile placement on PlaceObject, update CHANGELOG.md. Fixes #1418 2017-07-05 15:09:31 +02:00
Lucas Nicodemus
d891849945 Merge pull request #1425 from piamancini/patch-1 
Add backers and sponsors from Open Collective
 2017-07-01 08:37:40 -06:00
Lucas Nicodemus
05cb443a1a Merge branch 'general-devel' into patch-1 2017-07-01 08:32:04 -06:00
MarioE
a948e0c301 Merge branch 'general-devel' of https://github.com/NyxStudios/TShock into general-devel 2017-06-23 14:47:48 -04:00
MarioE
50a4b07bc3 Add "new" EditActions. 2017-06-23 14:47:38 -04:00
MarioE
241d4c566f Fix incorrect slot calculation, and update submodule. 2017-06-23 14:44:17 -04:00
Lucas Nicodemus
c0f0338006 Merge pull request #1461 from Ryozuki/pr_fix_comment_typo 
Fix comment typo
 2017-06-23 00:19:23 -06:00
Ryozuki
40e3a9d5b8 fix comment typo 2017-06-22 21:05:14 +02:00
MarioE
9ad63c37a6 Fix /spawnmob not spawning negative IDs again. 2017-06-21 01:21:32 -04:00
MarioE
331eeb8cec Fix SaveManager saving when 1 player is on the server and another joins 
The real fix would be to fix ServerLeave to not fire incorrectly when a player joins, but this will do for now.
 2017-06-19 01:15:45 -04:00
Chris
15b53ab726 Merge pull request #1457 from deadsurgeon42/general-devel 
Hooks for Item/Projectile/Tileban permission checks
 2017-06-12 01:02:03 +09:30
Ruby Rose
8ae0a3b5a6 Write proper docs 2017-06-08 17:18:38 +03:00
Ruby Rose
7e08b9a8d0 Merge branch 'general-devel' into general-devel 2017-06-08 15:00:47 +03:00
Ruby Rose
81cb1381b4 Add hooks for item/projectile/tile bans 2017-06-07 15:32:40 +03:00
Ruby Rose
c841a86cdf hooks added 2017-06-07 10:46:46 +03:00
death
81e21f31dc Submodule update and new grass creep checks 
Pulls through the latest OTAPI to make use of the new WorldGrassSpread hook which should allow corruption/crimsion/hallow creep config options work.
 2017-05-16 22:41:27 +10:00
Hussein Farran
0e051d1e80 Changed Slack references to Discord 
So Deathmax can sleep easy
 2017-05-15 14:43:20 -04:00
White
62d2a53141 Version update 2017-05-14 21:31:44 +09:30
White
709328d61f Update CHANGELOG.md 2017-05-14 21:28:02 +09:30
Chris
804dfe1d3e Merge pull request #1449 from mistzzt/fix-itemban 
Fix itemban not working on non-English language
 2017-05-14 21:03:48 +09:30
Chris
585a72bdf3 Merge branch 'general-devel' into fix-itemban 2017-05-14 20:55:10 +09:30
Chris
dcefec678d Merge pull request #1448 from madman2021/butcher_fix 
Increased /butcher damage to defence fixes issue #1447
 2017-05-14 20:54:54 +09:30
Tyler Watson
7e80a6dc4e Submodule update for ILRepack.Lib 2.0.13 2017-05-14 21:12:55 +10:00
Tyler Watson
492bb3ec2d create_release script now compatible with mono 5 2017-05-14 21:08:57 +10:00
ZIT WANG
8116aebd2c Fix itemban not working on non-English language 2017-05-12 18:06:49 +08:00
MadMan2021
194522eaa0 Increased /butcher damage to defence fixes issue #1447 2017-05-11 23:27:56 +01:00
White
02a8e037ba Submodule update to revert recursive resolver 2017-05-11 19:05:29 +09:30
Lucas Nicodemus
ee7a1bb2be Add a comma 2017-05-08 18:20:06 -06:00