eba54c6b8a
Removed hub snake parkour
2014-12-22 10:21:58 +11:00
9321abdaf5
Merge branch 'searchanddestroy' of ssh://184.154.0.242:7999/min/mineplex into searchanddestroy
2014-12-19 13:59:31 +11:00
184c6cb4ba
added func to change attackreason for combatmanager
2014-12-19 13:59:18 +11:00
52cc0862d7
Memory leak fix for CUSTOM TAG
2014-12-18 18:29:33 -05:00
93314711e7
Modified snd
2014-12-18 17:56:21 +13:00
4c4ba34d39
Merge pull request #5 from feature/chatslow to master
...
* commit '9ef0ea629c57b148d815b93a455f9817ce512960':
Added changes from master to Chat
Chat Slow Command
2014-12-17 20:08:32 -06:00
9ef0ea629c
Added changes from master to Chat
2014-12-17 20:07:39 -06:00
899add5fcd
Merging changes from master
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
2014-12-17 20:07:11 -06:00
437c1aeabe
MPS rank todo
2014-12-18 13:06:57 +11:00
60f567a3fb
fixed some errors ;o
2014-12-18 12:47:00 +11:00
679f7909b0
Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers
2014-12-18 12:45:56 +11:00
56d14b7bc0
Particle stuff
2014-12-18 12:45:45 +11:00
604243dfa3
UI improvements - icon changes, whitelist toggle, notify messages
2014-12-17 19:42:11 -06:00
2677d2e557
Fancy icons for 1.8!
2014-12-17 19:15:31 -06:00
a63c48e338
Refactoring private server menu
2014-12-17 18:45:15 -06:00
d19431a47f
Rename Clicked to onClick
2014-12-17 18:40:44 -06:00
1260e875fd
Add clans to intellij. Update button
2014-12-17 18:38:35 -06:00
6e42894d5c
Refactor button again
2014-12-17 18:33:24 -06:00
12973aba7d
Merge branch 'master' into feature/private-servers
2014-12-17 16:47:19 +11:00
e1db8d6a5d
Why was I missing a entitytype import..
2014-12-17 18:37:58 +13:00
26d92f0381
Add missing class
2014-12-17 18:33:43 +13:00
0e7adab3eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-17 18:32:50 +13:00
17ac36d9ae
Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub
2014-12-17 18:31:51 +13:00
6eb3efa0b6
More changes
2014-12-16 20:37:14 -06:00
62a621270e
More work on private server gui. Still need to do a bunch of refactoring
2014-12-16 13:43:01 -06:00
83218c9a73
Pushing unfinished code for laptop
2014-12-16 11:42:06 -06:00
5b1f4f16fb
Modify giveGems for new give gems
2014-12-16 21:58:17 +13:00
a433ad764d
Wither Morph
...
Legend Particle
2014-12-16 16:18:09 +11:00
c43ee95c55
Added 1.8 hooks for disguise setName and getName
...
Refactored method names in some disguise classes.
2014-12-15 21:46:14 -05:00
0cb5939794
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-15 21:30:20 -05:00
6941c1c827
Added a few more items for BuildingShop in Clans.
2014-12-15 21:29:50 -05:00
1907014db4
disguise wither update
2014-12-16 13:28:59 +11:00
7e6b6bd1b2
Add evolve effect
2014-12-16 15:23:31 +13:00
6d3a1116b9
Changes to SnD
2014-12-16 15:14:10 +13:00
913f827ced
Changes to SnD
2014-12-16 15:14:09 +13:00
da6b4b6a79
Current work for SnD
2014-12-16 15:14:09 +13:00
0026127647
More work done on SnD
2014-12-16 15:14:08 +13:00
f5d9d8dcf0
Modify scoreboard to use teams to support duplicate lines and up to 32 in length
2014-12-16 15:14:08 +13:00
715862b365
Commit current changes
2014-12-16 15:14:07 +13:00
6d7a71d043
Modifications for SnD test
2014-12-16 15:14:07 +13:00
2e7d101850
added material/data for gametypes
2014-12-16 12:26:37 +11:00
75cf80652c
Remove customnametrue from horse mount
2014-12-16 01:36:42 +13:00
ee363f55a6
re-enabled gems for CC
2014-12-15 15:50:25 +11:00
d7eb01e8f0
fixed CC Bug :D
2014-12-15 15:49:52 +11:00
e02bcd8b84
Revert the revert of the revert.
2014-12-14 22:58:49 -05:00
d1be64d7e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
2014-12-15 14:56:09 +11:00
95081a8ab7
Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)
2014-12-15 14:33:38 +11:00
230c6ede13
Disabled gem reward in ChristmasChaos
2014-12-14 22:14:41 -05:00
19dfafe9ed
disabled gems
2014-12-15 13:58:36 +11:00
909c0d9be7
christmas no longer rewards gems
2014-12-15 13:56:48 +11:00
4482e46250
Changed int to atomic for concurrency
2014-12-14 21:53:55 -05:00
eefa4de838
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-14 20:50:35 -05:00
2a58b822a0
Safeguard on connecting vlaues.
2014-12-14 20:50:19 -05:00
d0f8a6a063
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-15 12:26:25 +11:00
9136165d4f
fixed christmas elf name
...
pet names now have limited range
2014-12-15 12:24:40 +11:00
0111db5610
Added safe check for server monitor so it doesn't go off the rails during a network reboot.
2014-12-14 05:54:49 -05:00
9fb2231d76
Added connecting clients as a factor for status snapshot.
...
Added online check for DonationManager rewarding local info.
2014-12-14 02:32:52 -05:00
5b67e2182a
Added disguise to Pet Manager for eventual wither disguised pet.
2014-12-14 02:30:39 -05:00
718e02047e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-13 20:22:48 -05:00
28dc4059a4
Don't reset Lobby index else lower lobby counts can crash due to spam connects.
2014-12-13 20:22:37 -05:00
4e0c91c26d
Adjusted limit on CC game.
2014-12-13 20:22:01 -05:00
80c17c789c
Updated BungeeCord to newest custom version.
2014-12-13 20:21:34 -05:00
0198120c70
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-13 12:39:20 +11:00
78a34b1517
hopefully fixed a bug where pumpking king despawned.
...
removed 11 disc from loot
2014-12-13 11:55:12 +11:00
2f98d95737
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-12 06:47:58 -05:00
fb8b00200c
deep snow no longer slowz
2014-12-12 21:57:43 +11:00
5d1a8af347
fixed arctic armor killing players in hub
2014-12-12 21:53:39 +11:00
514445557b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-12 05:32:13 -05:00
dfd17b1793
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-12 21:29:46 +11:00
3f24325c3c
removed +50% player limit for CC
2014-12-12 21:23:01 +11:00
52fad77297
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-12 05:21:45 -05:00
771c7cba0a
Changed playercount back to current +1
2014-12-12 05:21:23 -05:00
e19c76575b
Merge pull request #7 from feature/animated-motd to master
...
* commit '56bc8dc2325d00cbd95247bcc1d270ba0ed703a1':
Trying to do some hacky things!
2014-12-12 04:19:38 -06:00
56bc8dc232
Trying to do some hacky things!
2014-12-12 04:18:47 -06:00
14c6c1ca4b
Merge pull request #6 from feature/animated-motd to master
...
* commit 'b65ca5f7dd8e07d2d65e59d08a7d907d29b172d6':
Update bungee cord, comment out debug stuff
Fix icon animation + some more tweaks
Some adjustments
Motd stuff for xmas update
pushing this for my laptop. not final code!
2014-12-12 02:54:30 -06:00
b65ca5f7dd
Update bungee cord, comment out debug stuff
2014-12-12 02:53:56 -06:00
4fd6ed80c4
final xmas Updates
...
xmas hub
2014-12-12 19:44:04 +11:00
7b42bd661f
Fix icon animation + some more tweaks
2014-12-12 01:13:02 -06:00
ac02201262
Some adjustments
2014-12-12 00:48:08 -06:00
30a7eea628
Motd stuff for xmas update
2014-12-12 00:28:29 -06:00
9a16616e6c
Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas
2014-12-12 12:40:23 +13:00
adafc95d3f
boss weaker
2014-12-12 10:26:32 +11:00
2be4d7d6d2
XMAS UPDATE
2014-12-12 10:03:25 +11:00
93dc3c9090
pushing this for my laptop. not final code!
2014-12-11 09:17:19 -06:00
3af8a90d3b
near final xmas push :D
2014-12-11 15:23:01 +11:00
3a8ab0afb0
Uncomment SleighHorse
2014-12-11 15:24:10 +13:00
6b1fa91565
Xmas Updates
2014-12-11 12:42:06 +11:00
86b9d8342f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java
2014-12-11 11:27:47 +11:00
ee8d699bd1
Minor text cleanup in the sleighhorse code because you guys seem to like that
2014-12-11 07:25:40 +13:00
2a13255af3
Turn christmas chaos game horses into reindeer
2014-12-11 07:23:47 +13:00
068a0901f9
xmas updatre
2014-12-11 00:16:15 +11:00
91954d43df
Added DataWatcher Vector support.
2014-12-10 03:42:31 -08:00
358d5fde44
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-10 22:38:19 +11:00
450d3eb923
merge
2014-12-10 22:38:08 +11:00
c4fee8e681
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/.classpath
2014-12-10 03:34:53 -08:00
11e09b202c
Fixed PullWhileLeashed bug and ghost bug.
2014-12-10 03:34:05 -08:00
ea034812b9
Fixed path finder crap in UtilEnt
...
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
2014-12-10 03:32:35 -08:00
db8e0484ab
missing files + new pet
2014-12-10 18:23:22 +11:00
0aba82eee6
fixed some eclipse java6 stuff with mail
...
Christmas game update
2014-12-10 15:38:57 +11:00
6de278bb4f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-09 20:24:07 +11:00
bee81ff455
lowered coin rewards
2014-12-09 20:23:56 +11:00
828fabb80a
Initial Christmas Chaos update
2014-12-09 20:04:59 +11:00
625d517058
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-08 00:55:43 -08:00
342c44affc
Fixed a bunch of clans bugs
2014-12-08 00:55:20 -08:00
50358c0c30
removed EULA breach in bridges private blocks
2014-12-08 18:23:47 +11:00
ef8e5104f1
SnD Kits
...
minor bug fixes
2014-12-08 17:28:18 +11:00
64c8edc292
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-08 17:25:03 +11:00
0759a373da
Fix treasure chest hologram
2014-12-07 01:25:36 -06:00
60a46d5adf
Replaced Dwarf Toss with Block Toss in Clans.
2014-12-06 04:23:26 -08:00
4a7b6bd33f
Blame chips
2014-12-06 01:10:08 -06:00
7402eb2f91
Merge remote-tracking branch 'origin/master'
2014-12-06 01:00:40 -06:00
b99da44873
Disable mail and notifications
2014-12-06 01:00:02 -06:00
1276e0c0d5
Chat Slow Command
2014-12-05 21:33:31 -06:00
048aa40590
Remove comments and add comments
2014-12-06 03:25:53 +13:00
307d280534
Read merge message
2014-12-06 02:22:52 +13:00
21e80af6cb
Fixed Cosmetic menu buttons
...
Removed map in wrong location
Removed message for removing armor.
2014-12-05 01:15:25 -08:00
828e8d4115
Fixed bug with ok buttons still active after clicking ok in confirmation page.
2014-12-04 23:48:22 -08:00
3d3f9012ff
Added some base Clans shops.
...
Added support for Gold
Refactored failed db call code a bit.
2014-12-04 23:41:49 -08:00
80971c2fe7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-05 16:27:30 +11:00
4430efd7be
minor updates
2014-12-05 16:25:34 +11:00
54d8fe21fb
Notifications and stuffs?
2014-12-04 22:48:54 -06:00
03bd2ed2c1
Make JsonMessage a little easier to use, might be worth it to increase functionality later as more complicated things are added to json text
2014-12-04 17:48:06 -06:00
f48085d5ca
Merge remote-tracking branch 'origin/master'
2014-12-04 17:41:40 -06:00
0bb2d1db5b
Some changes *_*
2014-12-04 17:29:47 -06:00
fbcc774383
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-04 05:05:43 -08:00
59f93d46ec
Refactored IButton
...
Added ComplexButton
Added Clans farming.
Added Clans Recipes.
Added Clans gameplay.
Added shop files structure.
2014-12-04 05:05:27 -08:00
38639fb58f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java
2014-12-04 13:34:08 +11:00
6cc4ec034b
Champs Updates
...
UHC Y Limit in middle
2014-12-04 13:33:31 +11:00
abaf9f4693
Refactored IRelation method names
...
Added support for negative amounts in Support server.
Clans in core testing state.
2014-12-03 13:06:50 -08:00
1fd1e5cc34
Removed unused gem booster code.
2014-12-02 12:50:53 -08:00
b0f13cc7f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-01 23:53:42 -08:00
63506c9ebc
Changed message in CUST-1
...
Fixed how QueuedCommands are handled, don't rerun website api call if it succeeded.
2014-12-01 23:53:35 -08:00
a8deee5292
fixed a spelling error
2014-12-02 18:04:48 +11:00
340f5d87a4
removed debug
2014-12-02 12:30:59 +11:00
e63ef8a607
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-02 11:50:03 +11:00
5695e845ef
resistence no longer effects hold position.
2014-12-02 11:49:39 +11:00
7a3b4771ee
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-01 16:14:15 -08:00
384f296d60
checkPlayerName returns actual name (casing correct)
...
Refactored chests/keys in support server.
Fixed bug with enjin chest/key giver.
2014-12-01 16:14:02 -08:00
6319bffd42
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-02 09:50:47 +11:00
185b182061
fixed teleports removing you from the game
2014-12-02 09:50:30 +11:00
78a0aa7c96
Added checks to restart UHC servers stuck in restarting mode.
2014-12-01 03:34:37 -08:00
0540168af7
Fixed CCM in AntiHack
2014-12-01 03:01:26 -08:00
e7cf4eb51d
Removed use of Gem Boosters
...
Cleaned up some unused imports.
2014-12-01 02:27:39 -08:00
172f4d20b7
Removed gem transaction logging.
2014-12-01 02:22:51 -08:00
3584c0d8af
Added Key/Chest support for EnjinListener
2014-12-01 02:03:46 -08:00
9d39cb922c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-01 01:22:51 -08:00
433483dcca
Fixed error in GameLootManager
2014-12-01 01:22:43 -08:00
39faf35409
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-01 19:33:55 +11:00
cee48f1978
made it so you can use fireworks without aiming against block in blockhunt
...
removed fire from magma blast
private blocks are no longer private if owner is dead
2014-12-01 19:33:36 +11:00
5038edc46b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-01 00:07:33 -08:00
Chiss
Jonathan Williams
libraryaddict
Shaun Bennett
Shaun Bennett