Commit Graph

4261 Commits

Author SHA1 Message Date
Cheese e8388437b6 botspam now checks for chat as well 2015-10-13 11:58:14 +11:00
Cheese 981002e3dc Merge branch 'Myst_HALLOWEEN' 2015-10-13 11:23:38 +11:00
Cheese 3e5ac58ae9 helpers! 2015-10-13 11:23:00 +11:00
Cheese 37639a413c fixed skill stuff 2015-10-13 11:22:10 +11:00
Mysticate be96842de5 Ultra 2015-10-12 17:02:34 -04:00
Mysticate 3eb36a6581 Prevented farming 2015-10-11 22:43:21 -04:00
Mysticate 2abf3edad4 Made items for titanic cosmetics dyes. 2015-10-11 22:29:26 -04:00
Mysticate b6d573a4d5 Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-11 22:25:25 -04:00
Mysticate 7a4ccdf680 Bug fixes 2015-10-11 22:17:34 -04:00
Cheese e180e0ae78 Merge branch 'Myst_HALLOWEEN' 2015-10-12 12:29:05 +11:00
Mysticate dda65b4c77 Fixed tnt exploding lobbies 2015-10-11 19:56:36 -04:00
Mysticate 606937d227 Fixed flashbang glitch 2015-10-11 09:42:36 -04:00
Jonathan Williams e6485a9009 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 23:02:36 -06:00
Jonathan Williams 5866e0cce6 Reducing max connections for the DBPool to 3. 2015-10-10 23:02:08 -06:00
Cheese f23bf18928 adhering to mysts OCD 2015-10-11 14:50:57 +11:00
Cheese f3e2f3c145 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-11 14:48:17 +11:00
Cheese cb9e8f8e0b pumpkin smasher achievement 2015-10-11 14:48:02 +11:00
Mysticate 435e74225a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-10 23:35:33 -04:00
Mysticate 83d1e011fc Changes. 2015-10-10 23:33:54 -04:00
Jonathan Williams 998d5f6984 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 21:25:29 -06:00
Jonathan Williams 061a7b7c73 Fixed Pet FK errors.
Added SUPPORT to acceptable updateRank command.
2015-10-10 21:24:47 -06:00
Cheese 8b75664627 queued holiday transactions 2015-10-11 12:54:35 +11:00
Cheese 6860fa608a titan placeholder perks
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
Mysticate 72d943f51b Restored skills to pre-eula ultra 2015-10-10 16:20:28 -04:00
Mysticate 5a8e500ec0 Fixed another thing 2015-10-10 16:15:10 -04:00
Mysticate 5e7ddb968e Changes and bug fixes. 2015-10-10 15:54:18 -04:00
Cheese da6b1316d3 removed pumpkins from MPS 2015-10-10 22:47:19 +11:00
Cheese 323842c693 fixed mods staying in flight 2015-10-10 19:36:38 +11:00
Cheese 6f14c75f70 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 19:28:26 +11:00
Cheese 6cf786eb8c Merge branch 'Myst_HALLOWEEN' 2015-10-10 19:28:08 +11:00
Cheese 1026a2ae22 fixed explosions 2015-10-10 19:27:54 +11:00
Shaun Bennett a242c6b592 Halloween Update finishes 2015-10-10 03:23:37 -04:00
Cheese e9207acd7f Merge branch 'alex-halloween' 2015-10-10 17:38:09 +11:00
Cheese 7bc3b4970b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
2015-10-10 17:34:17 +11:00
AlexTheCoder 67a1f4ce8d Titan Giveaway:
- Added Titan pumpkin animation
Titan Perks (For later, Removed from Menu):
- Added Kronos Particle
2015-10-10 02:31:52 -04:00
Mysticate 930cfa5cb8 DONE 2015-10-10 02:30:11 -04:00
Shaun Bennett f1e9acbb58 Titan giveaway 2015-10-10 02:19:05 -04:00
Mysticate 245a42c8e0 animation is sexi 2015-10-10 02:13:04 -04:00
Mysticate 30a9196430 Done with animation. 2015-10-10 01:43:31 -04:00
Mysticate 9a7357e484 Work 2015-10-10 01:00:49 -04:00
Shaun Bennett 36fabf93b6 Merge remote-tracking branch 'origin/master' 2015-10-09 23:14:13 -04:00
Shaun Bennett bc7bf8a2e2 fixes/debug 2015-10-09 23:13:39 -04:00
Jonathan Williams 512e08af19 Removed all create table statements. 2015-10-09 21:02:35 -06:00
Mysticate 1127764cc3 Secsi 2015-10-09 22:44:49 -04:00
Mysticate 7851cb451a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
2015-10-09 22:34:05 -04:00
Shaun Bennett aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Mysticate 90c685617d Animation 2015-10-09 22:14:01 -04:00
Peter Miller 611fb88f15 Commented out unnecessary table creation statements (tables already exist in database and these statements are causing database lag under high player load). 2015-10-09 20:40:50 -04:00
Cheese ed89f5f4cc anim example for myst 2015-10-10 10:46:12 +11:00
Cheese 43f38c18ee animation 2015-10-10 10:40:44 +11:00