Commit graph

3623 commits

Author SHA1 Message Date
White
36904b673f Submodule update 2016-12-31 11:30:32 +10:30
White
fa0d561a21 Merge pull request #1367 from DogooFalchion/fix_fishing
Document and fix the fishing quest count glitch in SSC.
2016-12-30 12:09:14 +10:30
DogooFalchion
4459a97fdf Document and fix the fishing quest count glitch in SSC. 2016-12-29 18:08:36 -05:00
Lucas Nicodemus
1982a2484d Merge pull request #1355 from DogooFalchion/rope_coils
Add rope coils and the ropes they place to the tile create exceptions.
2016-12-22 04:11:40 -07:00
Lucas Nicodemus
3a9dd32d2e Merge branch 'general-devel' into rope_coils 2016-12-22 04:06:52 -07:00
Rodrigo
94c19b6afd Merge pull request #1354 from DogooFalchion/general-devel
Fix Prefixes in the Forge not being correct.
2016-12-22 10:18:26 +00:00
DogooFalchion
0a1e831fba Add rope coils and the ropes they place to the tile create exceptions.
Fixes #1352
2016-12-21 21:16:00 -05:00
DogooFalchion
84a84bdf05 Remove todo reminder. 2016-12-21 20:44:42 -05:00
DogooFalchion
95c5129fa9 More SSC cleanup. 2016-12-21 20:43:09 -05:00
DogooFalchion
2236a5bb56 More SSC cleanup. Fixes prefix issues. 2016-12-21 20:39:27 -05:00
Lucas Nicodemus
06382bb449
Merge branch 'general-devel' of github.com:NyxStudios/TShock into general-devel 2016-12-18 14:16:02 -07:00
Lucas Nicodemus
9c150e6ce1
Test commit 2016-12-18 14:15:43 -07:00
Lucas Nicodemus
bf0d7416f3 Merge pull request #1353 from ProfessorXZ/general-devel
Added TSPlayer.Logout(); Fix #1347; Update changelog.
2016-12-18 10:30:37 -07:00
ProfessorXZ
75f639ee47 Fixes #1347 2016-12-18 13:30:16 +01:00
ProfessorXZ
84105aee29 Update Changelog.md 2016-12-18 12:45:13 +01:00
ProfessorXZ
7c8bf7712a Added TSPlayer.Logout() 2016-12-18 12:37:15 +01:00
Lucas Nicodemus
bcd00c0243
Merge branch 'mintaka' into general-devel 2016-12-14 14:18:11 -07:00
Lucas Nicodemus
d8118f2ede Merge pull request #1344 from NyxStudios/mintaka-fix-crash
Catch and log on linux socket read
2016-12-14 14:17:38 -07:00
Lucas Nicodemus
564a80cc5b Merge pull request #1335 from NyxStudios/mintaka
Do not merge: Move to Mintaka.
2016-12-14 10:03:50 -07:00
Lucas Nicodemus
b4f37a60c9 Merge branch 'general-devel' into mintaka 2016-12-14 10:02:02 -07:00
Enerdy
024e2a28fb Update submodule (aka Make HeapTile Great Again) 2016-12-14 15:34:50 +00:00
Lucas Nicodemus
6cce064066 Merge pull request #1342 from DogooFalchion/mintaka
Refactor some of the mess that is NetItem and PlayerData.
2016-12-13 19:36:59 -07:00
Enerdy
9572fd0613 Update submodule 2016-12-13 23:51:29 +00:00
Enerdy
00b3ac59f4 Catch and log on linux socket read 2016-12-13 22:59:50 +00:00
DogooFalchion
e1017e92b4 Refactor some of the mess that is NetItem and PlayerData to be more sane. Can not reproduce the SSC corruption with this. 2016-12-12 17:46:44 -05:00
Lucas Nicodemus
f13d8b51c6
Fix Main.rand not being initiated with UnifiedRandom 2016-12-12 13:20:55 -07:00
Lucas Nicodemus
cda07b4be5 Merge pull request #1324 from DogooFalchion/more_dumps
More Terraria dumps for NPC/Item/Projectile/Buff/Prefix
2016-12-12 13:11:59 -07:00
Lucas Nicodemus
8e411b0db9 Merge branch 'general-devel' into mintaka 2016-12-12 11:05:34 -07:00
Lucas Nicodemus
c73ffb8333 Merge pull request #1341 from deadsurgeon42/update-readme
Update readme
2016-12-12 11:00:20 -07:00
Luke
24f75069e8 Submodule update for pressure plate, fixed connections after max slot is reached 2016-12-12 23:52:14 +10:00
Ruby Rose
d14bb46b73 Add quick start highlight 2016-12-12 15:43:05 +02:00
Ruby Rose
640965bb8f Replace old wiki link 2016-12-12 15:41:21 +02:00
Enerdy
c73003fc67 Merge branch 'mintaka' of https://github.com/NyxStudios/TShock into mintaka 2016-12-11 23:44:44 +00:00
Enerdy
e6fe896133 Update version codename
Project Mintaka - The First Star
2016-12-11 23:44:13 +00:00
Rodrigo
2e022aa554 Merge pull request #1338 from ProfessorXZ/mintaka
A possible fix for #1337
2016-12-11 23:41:18 +00:00
ProfessorXZ
962fe35fde Update CHANGELOG.md 2016-12-11 16:44:23 +01:00
White
739892a611 Added TSPlayer.KillPlayer() which uses NetMessage.SendPlayerDeath(...).
Changed /kill to use `TSPlayer.KillPlayer()`
2016-12-11 13:46:57 +10:30
White
02c58b5c93 Submodule update + API version update 2016-12-11 13:46:11 +10:30
ProfessorXZ
1741b0c854 A possible fix for #1337 2016-12-10 21:22:01 +01:00
Luke
703a31580e Build script alterations, submodule update 2016-12-10 21:54:43 +10:00
Luke
272cc31b28 Fixes rest api error on startup without -ip arg 2016-12-10 02:30:15 +10:00
Lucas Nicodemus
e4313b6433
Update to latest stuff from death 2016-12-06 20:34:12 -07:00
Lucas Nicodemus
678f6c7cf8
Update to Mintaka (thanks @enerdy) 2016-12-06 17:36:44 -07:00
White
d728a24902 Merge pull request #1328 from Zaicon/general-devel
Bank3 Implementation
2016-11-24 11:23:46 +10:30
Zaicon Kiroshu
a0a98d19f3 Bank3 Implementation 2016-11-23 18:51:11 -06:00
White
73294cc2e2 Submodule update 2016-11-23 06:03:20 +10:30
White
5902173ec4 Merge pull request #1326 from Zaicon/general-devel
1.3.4.3 Update (API 1.26)
2016-11-21 11:52:30 +10:30
Zaicon Kiroshu
2eb4ee0c22 Fix Version Typo 2016-11-20 19:18:52 -06:00
Zaicon Kiroshu
1331fd14fa API Tick, Submodule Update, Changelog Update (Part 2) 2016-11-20 19:16:51 -06:00
Zaicon Kiroshu
02815a23ef API Tick, Submodule Update, Changelog Update 2016-11-20 15:15:53 -06:00