Commit Graph

1649 Commits

Author SHA1 Message Date
CoderTim
aae46bdeda Removed unused intellij module 2014-09-03 16:58:53 -04:00
CoderTim
74e012a811 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-03 16:54:41 -04:00
CoderTim
39b46bc8f5 Fixed some NPEs 2014-09-03 16:53:29 -04:00
Shaun Bennett
e7f79aa5bf Update IntelliJ files for latest changes 2014-09-03 11:42:50 -05:00
Jonathan Williams
e6bc048179 Spigot patch file for mineplex 2014-09-03 03:50:26 -07:00
Jonathan Williams
92191dc19a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java
2014-09-03 03:47:15 -07:00
Jonathan Williams
a4871b5509 Updated to latest spigot with 1.8 support.
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
2014-09-03 03:46:24 -07:00
Chiss
21225d7b65 Minor Fixes 2014-09-03 15:09:14 +10:00
Chiss
50140ef92d Minestrike update 2014-09-03 14:49:38 +10:00
Chiss
246f2e91d9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-03 12:38:57 +10:00
Chiss
58f98881f2 Minestrike Update 2014-09-03 12:38:44 +10:00
Chiss
1dec79c0fa Minestrike update 2014-09-03 12:28:45 +10:00
Shaun Bennett
4dbe7003b2 Update Arcade Icon in the game menu 2014-09-02 21:09:12 -05:00
Shaun Bennett
8d06cddfb2 Remove Chiss' debug message for shop 2014-09-02 20:36:25 -05:00
Shaun Bennett
9168de20da Update PlayerConnection method to latest spigot (Fixes right click bug, caused from old spigot code) 2014-09-02 20:33:00 -05:00
Shaun Bennett
08e6b73b1f Disable Treasure stuff for now 2014-09-02 19:04:43 -05:00
Shaun Bennett
2b3f6c9dbc Prevent minecart mounts from being broken by others 2014-09-02 19:03:14 -05:00
Shaun Bennett
2d5c676e1b Merge remote-tracking branch 'origin/master' 2014-09-02 18:57:35 -05:00
Shaun Bennett
4ad034b8d9 more treasure stuff, really basic holograms 2014-09-02 18:33:40 -05:00
Chiss
d5766d62ae nerf p90 2014-09-02 16:49:45 +10:00
Chiss
449281501f MineStrike Update 2014-09-02 16:49:15 +10:00
Jonathan Williams
006c7d1e65 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-01 20:04:02 -07:00
Jonathan Williams
a568631df8 Work on AccountAdministrator 2014-09-01 20:03:08 -07:00
Chiss
5d6834633f MineStrike update 2014-09-02 11:16:17 +10:00
Shaun Bennett
df882012e5 When items are dropped in The Bridges, only the player that broke the block can pickup the item for 8 seconds. (Only applies to specific item types) 2014-09-01 15:38:07 -05:00
Chiss
05623b7522 Initial MineStrike push
fixed frames being breakable in games
2014-09-01 21:37:39 +10:00
Chiss
492b3cc0a4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-01 17:57:17 +10:00
Jonathan Williams
8198bb31c8 Added sneaking to player disguise.
Did work on DDoSProtectionSwitcher
Work on AccountAdministrator to fix rank issues.
2014-09-01 00:56:32 -07:00
Shaun Bennett
5905ef5ef7 Treasure Stuff 2014-08-30 14:27:11 -05:00
Chiss
116c54352b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-30 20:49:46 +10:00
Chiss
207de0e67a fixed MAC kicking players on lillypads 2014-08-30 20:49:32 +10:00
Jonathan Williams
c8bc697888 Fixed mounts and gadgets for rank messages...no Purchase. 2014-08-30 02:37:27 -07:00
Jonathan Williams
f6dcebc3dc Fixed extra spacing in cosmetic menu. 2014-08-30 02:33:37 -07:00
Jonathan Williams
72aa05f73e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-30 02:26:16 -07:00
Jonathan Williams
829736ed07 Fixed purchase info. 2014-08-30 02:26:07 -07:00
Shaun Bennett
e52f6deab4 Merge remote-tracking branch 'origin/master' 2014-08-30 04:24:34 -05:00
Shaun Bennett
6a58b86a19 Don't display wins and losses to other players on Achievement Gui 2014-08-30 04:24:25 -05:00
Chiss
2b333859d1 PUUSH 2014-08-30 19:24:04 +10:00
Chiss
f58aca7990 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-30 19:07:55 +10:00
Chiss
3767911718 updated game desc output 2014-08-30 19:07:43 +10:00
Jonathan Williams
b07670f6af Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-30 02:04:32 -07:00
Jonathan Williams
1bd0209b39 Added multi-server tags for npcs
Fixed Customer support packages.
Fixed Account rank expire for Hero
Added SNR mod to update Rank
Changed SNR mod color to gray.
2014-08-30 02:04:04 -07:00
Chiss
7696349187 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-30 16:34:10 +10:00
Chiss
2c30cc3ef4 Implemented new servers flags
Removed OP from Admisn in HUB, gave them /gm command instead
2014-08-30 16:33:56 +10:00
CoderTim
b7baa1b2f4 Count disconnecting from the server as a loss 2014-08-30 02:30:07 -04:00
CoderTim
34f04ad4e3 Fixed Champions Assassination and Longshot achievements 2014-08-29 21:09:51 -04:00
Chiss
41daba98c4 Background work for Minestrike
Admins no longer have OP in hubs. They have /gm command to gamemode.
2014-08-29 18:21:08 +10:00
Chiss
1f6b9374eb disable le minestrike 2014-08-29 11:55:06 +10:00
Chiss
c3bb0ddbcb Chest example gadget for shauny 2014-08-29 11:00:16 +10:00
Jonathan Williams
fa56aa0843 Fixed regular players not able to join Beta servers. 2014-08-28 14:02:55 -07:00