Jonathan Williams
fa0049d22a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 23:01:15 -07:00
Jonathan Williams
f206441999
Fix partial commit.
2014-10-31 23:00:53 -07:00
Jonathan Williams
c85ba72730
Added null check for dragooon.
...
Added two treasure keys for halloween give away.
2014-10-31 23:00:13 -07:00
CoderTim
f3770933b6
Merge branch 'feature/database-pool'
2014-11-01 01:59:07 -04:00
Chiss
da88d68513
UHC does not record team stats
2014-11-01 15:42:52 +11:00
Jonathan Williams
f1966be6a2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 17:29:57 -07:00
Chiss
7f642673bc
fixed deathbomber achievement
2014-11-01 11:25:08 +11:00
Jonathan Williams
1f26aee006
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 17:12:27 -07:00
Chiss
0095a03df7
returned bridges to normal
2014-11-01 11:11:35 +11:00
Jonathan Williams
2aced64191
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 17:03:15 -07:00
Jonathan Williams
45da22b0bf
Fixed bug with parkour enchantment checks.
2014-10-31 17:03:06 -07:00
Chiss
de28906aa5
restored 10 min timer for bridges
2014-11-01 09:18:44 +11:00
Chiss
d0a8a86698
disabled tnt water damage before bridges drop
2014-11-01 09:18:25 +11:00
Chiss
58d6cf199b
fixed foodformassesstat kind of? doesnt update db still
2014-11-01 08:59:57 +11:00
Chiss
83d182db2e
Fixed Villager exploit! oops
...
Some balance stuff in champs
2014-11-01 08:38:36 +11:00
Chiss
b5ef46007f
updated npc info
2014-10-31 18:17:12 +11:00
Chiss
bf6e788f36
1 more fix for sheepy
2014-10-31 16:47:20 +11:00
Chiss
c4264dcea1
fixed sheep skill trigger names
2014-10-31 15:58:11 +11:00
Chiss
50a2bcda66
BACK FROM THE DEAD
2014-10-31 15:40:40 +11:00
Chiss
de08456093
fixed error in block restore
2014-10-31 10:47:18 +11:00
Chiss
aca18bb2e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-31 10:36:06 +11:00
Chiss
aa45f031ac
3 new achievement Kits
...
SSM Balance patch
Champs balance
tons of bug fixes
2014-10-31 10:35:47 +11:00
CoderTim
22daf54f35
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-30 18:20:29 -04:00
CoderTim
cc8912b27e
Added NPC info messages to NpcManager
2014-10-30 18:20:21 -04:00
Jonathan Williams
bd19369ddb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-29 17:16:00 -07:00
Jonathan Williams
2f563f8277
BungeeRotator project.
2014-10-29 17:15:32 -07:00
CoderTim
ee0aa1375d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-29 19:14:57 -04:00
CoderTim
50a457ba51
Database pool tweaks
2014-10-29 19:13:28 -04:00
CoderTim
4fc291ea80
Everything but Mineplexer using database pool
2014-10-29 18:43:21 -04:00
CoderTim
5244f65d8f
All connections to db.mineplex.com/Account use database pool
2014-10-29 17:54:40 -04:00
CoderTim
08f0eb9252
Achievement bug fixes
2014-10-29 01:40:34 -04:00
Shaun Bennett
9819b6c10a
Merge remote-tracking branch 'origin/master'
2014-10-27 20:25:47 -05:00
Shaun Bennett
054c26dfbc
New Coin/Gem Command
2014-10-27 19:59:30 -05:00
Shaun Bennett
01d44cd250
Give Item Command
2014-10-27 19:25:59 -05:00
CoderTim
cd5e4234b7
Fixed a couple more achievement bugs
...
Track damage mods in combat log
2014-10-27 19:00:34 -04:00
CoderTim
f0ba562265
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-27 18:11:29 -04:00
CoderTim
9f8b119fb7
Bug fixes
2014-10-27 18:09:23 -04:00
Jonathan Williams
006e20bb13
Prevent more than 5 players from being processed at a time on server connect.
2014-10-27 04:35:05 -07:00
Jonathan Williams
e926fc1f10
Fixed TransferCommand
2014-10-27 04:34:35 -07:00
Jonathan Williams
0ee9619d3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-25 14:35:12 -07:00
Jonathan Williams
ead014f65e
Increased server startup time to 30 seconds.
2014-10-25 14:34:38 -07:00
CoderTim
a1c4b8840f
NpcManager no longer uses database connection pool
2014-10-25 16:51:58 -04:00
Chiss
849d5f1471
lowered gem rewards for MS a little
2014-10-25 18:37:18 +11:00
Chiss
66b446f1e6
Added some start-game invis to players.
2014-10-25 15:48:49 +11:00
Chiss
cfcfad610f
Improved recruit/prepare countdown timers
2014-10-25 13:56:23 +11:00
Chiss
bd2e7faf3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-25 13:40:53 +11:00
Chiss
4002528c51
Updated GUI text.
...
- recharges/etc now use bottom text
- uses appropriate bottom/top for 1.7 or 1.8
- fixed 1.7 dragon bar so it works as it did pre-1.8
- dragon bar in 1.8 will now send dragon+wither, for more reliability
- renamed utils to be more clear
2014-10-25 13:40:34 +11:00
Jonathan Williams
6f541a8d30
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-24 18:00:18 -07:00
Jonathan Williams
04ba68293e
Removed debug.
2014-10-24 18:00:10 -07:00
Shaun Bennett
6138da5f93
Merge remote-tracking branch 'origin/master'
2014-10-24 19:43:06 -05:00
