Commit Graph

2759 Commits

Author SHA1 Message Date
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
Shaun Bennett
5cf3e6c3a1 Fix for arcade custom tags 2014-10-24 19:36:22 -05:00
Chiss
7dbba0a1f9 Added teleport for map parser
Fixed new method in UtilFirework always being BALL_LARGE
Updated lazer
2014-10-25 11:17:32 +11:00
Chiss
92d9fc4ca0 Deleted deprecated firework module and converted to Util 2014-10-25 11:03:45 +11:00
Chiss
01f311a3d6 Added missing requirements for SG Achievement Kit
fixed a parkour exploit
2014-10-25 10:38:47 +11:00
Chiss
95937db83a changed firework color 2014-10-24 19:10:10 +11:00
Chiss
25fc3c0645 Achievement Kits (3 games)
Halloween Pumpkins
Youtube command (allows kits)
2014-10-24 19:05:57 +11:00
Jonathan Williams
27dc9f7693 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-23 23:58:24 -07:00
Jonathan Williams
d4900c38b1 Halloween server max.
CustomTagFix fix for invis armor stand on your own head.
2014-10-23 23:58:13 -07:00
Chiss
b47dcf12af remvoed debug rank 2014-10-23 14:06:06 +11:00
Chiss
d4512e464a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-23 14:05:54 +11:00
Chiss
c2bb53c887 Halloween pumpkins
Minestrike balance
bug fixes
2014-10-23 14:05:35 +11:00
CoderTim
0472870e78 Fixed bug that prevented the Necromancer purchase menu from displaying 2014-10-21 20:06:13 -04:00
CoderTim
f52a89d2ca NpcManager teleports slimes correctly 2014-10-20 18:19:19 -04:00
CoderTim
db3354176c NpcManager stores test server NPCs under a different server name 2014-10-20 18:08:28 -04:00
Shaun Bennett
a47be7a2f6 Merge remote-tracking branch 'origin/master' 2014-10-19 00:08:13 -05:00
Shaun Bennett
1394e33056 Fix for Arcade Kit NPC Names in 1.8 2014-10-18 21:15:53 -05:00
Jonathan Williams
8630a1ba4c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 23:39:21 -05:00
Jonathan Williams
daf2dc3903 Purhcased ranks will no longer override staff ranks. 2014-10-17 23:39:14 -05:00
Jonathan Williams
e3cd6f0e69 Fixed Mem leak in CustomTagFix
Changed to ServerGameMenu
Fix for overfilling HH servers
Added staff ability to join all servers.
2014-10-17 23:29:24 -05:00
Chiss
68009d3013 A little more time to handle wave 5 2014-10-18 13:51:25 +11:00
Chiss
02ea14bcd1 Damaging Boss restores all hunger 2014-10-18 10:50:17 +11:00