Commit Graph

4247 Commits

Author SHA1 Message Date
AlexTheCoder 8a94602aef Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text 2015-08-31 16:03:27 -04:00
AlexTheCoder fe4586852c Made rank unlock lore colored based on rank required for item (QA Requested) 2015-08-31 15:59:53 -04:00
AlexTheCoder cbb0d4521c Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for. 2015-08-31 15:49:31 -04:00
AlexTheCoder 5322e9d018 Marked the Bunny Morph to reflect its no longer available status 2015-08-31 15:48:25 -04:00
AlexTheCoder 24fed013ae Fixed previous ownership not being transferred 2015-08-31 15:39:04 -04:00
AlexTheCoder 32a257fa55 Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts 2015-08-31 15:11:57 -04:00
AlexTheCoder b63843930f Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui 2015-08-31 15:08:42 -04:00
Sarah 503b68da2f Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates 2015-08-31 11:32:47 +02:00
Sarah 58ae09ebd4 saving Project for pulling. 2015-08-31 11:32:18 +02:00
Jonathan Williams c61f9ce3c8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-31 00:53:23 -07:00
Jonathan Williams 740899c09e Added dummy CoreClient in the rare event a player joins and gets disconnected during the join event????Weird
Fixes Lobby crashes.
2015-08-31 00:53:07 -07:00
Mysticate becfbe1f13 Fixed possible game breaking bug :S 2015-08-30 20:09:47 -04:00
Mini-Chiss d79794c6d3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-30 15:47:57 -07:00
Mini-Chiss bb66d47e8e meow 2015-08-30 15:47:49 -07:00
Mysticate 33d78a5efd Fixed eating spider eye. Yay! 2015-08-30 18:39:07 -04:00
Ty Sayers b0efe35531 Add restriction to ServerCommand that prevents players from directly connection to a Clans-X server, and instead insists that they join through a Clans hub. 2015-08-30 13:14:01 -07:00
Mini-Chiss 519e668d62 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-30 11:01:23 -07:00
Jonathan Williams 47331658ac Merge remote-tracking branch 'remotes/origin/Myst_EVO' 2015-08-30 00:14:53 -07:00
Jonathan Williams b59511ece4 Added duplicate login kick for network. 2015-08-30 00:12:54 -07:00
Mini-Chiss e8b3085ec5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-29 23:55:18 -07:00
Mini-Chiss d944d2e5c4 Merge branch 'Myst_EVO' 2015-08-29 23:54:28 -07:00
Jonathan Williams c2c23c22e5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-29 14:55:04 -07:00
Jonathan Williams 4e32bad8dd Fixed bug with stats pulling as int.
Fixed bug with Poll recording selections wrong.
2015-08-29 14:54:57 -07:00
Ty Sayers 088068be80 Add 'Clans' to the ignored server groups for ServerMonitor to prevent interference with live Clans servers. 2015-08-29 14:51:17 -07:00
Mysticate 046fa4f8b6 Fixed possible NPE 2015-08-29 14:30:22 -06:00
Mysticate 736d88c82f All achievements fixed. ^_^ 2015-08-29 14:13:15 -06:00
Mysticate 97c7980bbc Fixed evolving into walls. 2015-08-29 10:54:04 -06:00
Mysticate 55a7ea0439 Fixed kit bug. 2015-08-29 10:44:11 -06:00
Mini-Chiss 9ebabed1a8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-29 00:14:26 -07:00
Mini-Chiss 6a28845cb0 Merge branch 'Myst_EVO' 2015-08-29 00:14:15 -07:00
Mysticate 12d9888a1f Fixed wins.. 2015-08-29 00:58:53 -06:00
Jonathan Williams f8729cbd66 Fixed Gadget. 2015-08-28 23:47:27 -07:00
Mini-Chiss d35b5940fc fixed achievements 2015-08-28 23:30:21 -07:00
Mini-Chiss 5ae01f95a8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-28 23:27:35 -07:00
Mini-Chiss 181afaa2d6 Merge branch 'Myst_EVO' 2015-08-28 23:25:51 -07:00
Mysticate b71bcfab4b Fixed achievements. Merge ASAP 2015-08-29 00:19:39 -06:00
Jonathan Williams d4d0c4bed6 Updated Motd. 2015-08-28 23:17:14 -07:00
Jonathan Williams c98a85c2ba Added local storage of login time.
Hooked in onlineTime bonus feature to real values.
2015-08-28 22:09:42 -07:00
Jonathan Williams ba4da32939 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-28 21:44:07 -07:00
Jonathan Williams e47662f855 Added LoginTime setting as RedisTime for use in calculating time on server.
Optimized redis util for time calls to calculate time different and only pull redis time once.
2015-08-28 21:44:00 -07:00
Mini-Chiss 829c1d2ae8 Merge branch 'Myst_EVO' 2015-08-28 21:30:10 -07:00
Mysticate c40fecb03f Removed warning from private servers 2015-08-28 22:06:13 -06:00
Mini-Chiss 041c5ab53c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-28 21:00:34 -07:00
Mini-Chiss 3f1c4d24b9 Merge branch 'Myst_EVO' 2015-08-28 21:00:00 -07:00
Jonathan Williams ad4ba010b7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-28 20:59:08 -07:00
Jonathan Williams 6f0309622c Removed AccountCache.
Converted that to PlayerCache and store account id in there.
2015-08-28 20:58:58 -07:00
Mysticate bb09720450 removed previous commit jesus 2015-08-28 21:56:35 -06:00
Mini-Chiss d68f1fa547 Merge branch 'Myst_EVO' 2015-08-28 20:50:27 -07:00
Mysticate 6628f5a1ae Added a checker for a no kit issue 2015-08-28 21:49:57 -06:00
Mini-Chiss 19b2ff5b58 fixed scoreboard 2015-08-28 20:48:32 -07:00