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

3825 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ziteng Wang
7f8381e56d Merge pull request #1497 from Pryaxis/new-commands 
Switch to msbuild commands
 2017-10-04 10:09:24 -07:00
Ziteng Wang
5781bc8b07 Merge branch 'general-devel' into new-commands 2017-10-04 10:04:57 -07:00
Lucas Nicodemus
2abb377e75 Merge pull request #1481 from Leeleo3x/fix-build 
Add more HintPaths for OTAPI
 2017-10-04 09:29:18 -06:00
Lucas Nicodemus
4f3fa06028 Merge branch 'general-devel' into fix-build 2017-09-25 12:40:26 -06:00
Lucas Nicodemus
2046768ca1 Merge branch 'general-devel' into new-commands 2017-09-25 12:30:29 -06:00
Lucas Nicodemus
6f8d795a65 Switch to msbuild commands 
Fixes #1494
 2017-09-25 12:28:59 -06:00
Ivan
623815b9f6 Merge pull request #1486 from bartico6/issue-1485 
Add "less than 2gb ram" warning
 2017-09-20 21:17:16 +02:00
quake1337
d396dc5cbb Add CHANGELOG.md entry 2017-09-20 18:42:36 +02:00
quake1337
7d5a74330a Ate one newline. 2017-09-20 17:42:32 +02:00
quake1337
a00950e480 Merge branch 'issue-1485' of https://github.com/bartico6/TShock into issue-1485 2017-09-20 17:40:19 +02:00
quake1337
4aa81a3d30 Add changes requested by @hakusaro 2017-09-20 17:39:38 +02:00
quake1337
f4775a1e1e Merge branch 'general-devel' into issue-1485 2017-09-20 10:31:39 +03:00
quake1337
e6ec63a90e Add @ijwu's changes + add /proc/meminfo trick for linux 2017-09-20 09:27:28 +02:00
Ivan
a3762177c3 Merge pull request #1493 from koneko-nyan/patch-1 
Fix #1492
 2017-09-19 21:28:37 +02:00
koneko-nyan
65582ceaec Update CHANGELOG.md 2017-09-19 21:22:56 +02:00
koneko-nyan
51cdf0f23a Merge branch 'general-devel' into patch-1 2017-09-19 21:20:16 +02:00
Lucas Nicodemus
90600c83f6 Merge pull request #1479 from Pryaxis/add-pr 
Add PR template file
 2017-09-19 13:16:17 -06:00
koneko-nyan
c8549db087 Update Commands.cs 
(time % 1.0) * 60.0 can be equal to 59.8, then it gets rounded to undesirable 60 displayed in the time format
 2017-09-19 21:00:15 +02:00
Patrikk
c4452c6d13 Merge pull request #1491 from ProfessorXZ/professorx 
Fixes #1469
 2017-09-16 01:48:45 +02:00
ProfessorXZ
5a04b66514 Make Utils.GetBuffDescription actually return the buff's description & properly read 'buffTime' from the stream. Fixes #1469 2017-09-08 21:59:13 +02:00
quake1337
68437f0a22 Add "less than 2gb ram" warning 2017-08-14 14:39:22 +02:00
Ivan
9dce68e6e2 Merge pull request #1477 from deadsurgeon42/user-equatable 
Implement IEquatable<User> for User class
 2017-08-05 21:50:26 +02:00
Ivan
a9e1d835b8 Merge branch 'general-devel' into user-equatable 2017-08-05 21:46:39 +02:00
Ivan
5f78bbb63f Merge pull request #1484 from bartico6/general-devel 
Change field visibility
 2017-08-04 13:47:26 +02:00
quake1337
031ef517e3 Change field visibility 2017-08-04 12:52:07 +02:00
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