8b5d6ecb6c
Cleanup of warnings.
2014-12-29 07:10:41 -05:00
419f33fcc3
Refactored AntiHack a bit to try and remove CCM
2014-12-29 07:07:05 -05:00
97f57b655b
Prevent horses from spawning in Clans
...
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
a7f77c09fe
Work towards another memory fix.
2014-12-29 06:42:43 -05:00
5a57c5f372
Added Gold saving/retrieval from mysql.
...
Converted DonationManager to MiniDbClientPlugin.
Fixed bug in DonationRepository with gold.
2014-12-29 06:42:20 -05:00
d83a63ef57
Changed FriendManager to start supporting expiry friend requests.
2014-12-26 07:36:07 -05:00
8702bafbd0
Changed storage to player names instead of Player object for CustomTagFix
2014-12-26 00:29:57 -05:00
81e423fa4f
Fixed Server transfer stuff. Portal send works!
2014-12-24 14:35:34 -05:00
eb5a7b4276
Added Legend package for support.
...
Refactored Key/Chest commands and added FrostLord package.
Removed password, added whitelist.
2014-12-24 03:41:17 -05:00
adc5769890
Fix wither not accessible for ranks, fix wither having weird naming in inventories
2014-12-24 04:07:28 +13:00
5dcda626e7
Fixed port stuff for MPS
2014-12-23 08:08:41 -05:00
07cca7a1d4
Fixed NPE in GameHostManager
...
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00
4bfd34034b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 22:19:50 +11:00
8c2d879036
added ownership of legend particle for legends.
2014-12-23 22:17:39 +11:00
d2e078f890
Fixed ranks for MPS
2014-12-23 06:04:42 -05:00
fb841c3831
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
2014-12-23 05:57:45 -05:00
bb8b1d60f9
30 seconds recharge on ability to host locally.
2014-12-23 05:56:17 -05:00
5f509ca488
Rank fixes, visual fixes, lets hope things work!
2014-12-23 04:55:00 -06:00
7ef2edd498
Removed extra enjin message.
...
Added retrieval of servergroups to identify if server is a player server or not.
2014-12-23 04:19:24 -05:00
9a767af018
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 03:44:05 -05:00
f00854ee4c
Removed bad code thats bad from the bad birdy.
...
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.
Updated Enjin to handle more versatile inventory purchases.
2014-12-23 03:43:56 -05:00
6b5b072ae8
missing file
2014-12-23 19:36:23 +11:00
7496f64d58
benefit
2014-12-23 19:36:10 +11:00
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
2a585936b7
Maybe I should test before I commit!
2014-12-23 00:37:29 -06:00
2848ec2751
Use the correct data value this time!
2014-12-23 00:33:47 -06:00
48fdfbb8f0
Hub changes for private servers
2014-12-23 00:30:15 -06:00
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
0e85b7e6cc
Added HostName to server groups.
...
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
2014-12-23 00:49:52 -05:00
0659f497c0
frost lord update
2014-12-23 15:00:32 +11:00
4797b251b1
YAY Champions enable/disable works.
2014-12-23 11:39:03 +11:00
825b25e8d1
fixed my bug in miniplugin
2014-12-23 11:29:48 +11:00
ec9401506c
Game servers can now run champions/normal on the fly.
2014-12-23 11:18:48 +11:00
a197724de8
fixed le bugs.
2014-12-23 10:48:15 +11:00
224d1bbf63
blizzard particle redo
...
hub text
2014-12-23 10:36:48 +11:00
b83a81ec7e
Fixed little conflict issue.
2014-12-22 09:25:02 -05:00
9b3350c8c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-22 09:22:50 -05:00
d920439ec5
Clans update. Laying groundwork for energy
2014-12-22 09:22:10 -05:00
4a50e3ae62
Merge branch 'chissbrokethis'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:57:39 +11:00
98b614848d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:54:31 +11:00
1a56f074b3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-22 10:22:13 +11:00
eba54c6b8a
Removed hub snake parkour
2014-12-22 10:21:58 +11:00
52cc0862d7
Memory leak fix for CUSTOM TAG
2014-12-18 18:29:33 -05: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
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
2677d2e557
Fancy icons for 1.8!
2014-12-17 19:15:31 -06:00
d19431a47f
Rename Clicked to onClick
2014-12-17 18:40:44 -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
83218c9a73
Pushing unfinished code for laptop
2014-12-16 11:42:06 -06: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
1907014db4
disguise wither update
2014-12-16 13:28:59 +11: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
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
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
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
78a34b1517
hopefully fixed a bug where pumpking king despawned.
...
removed 11 disc from loot
2014-12-13 11:55:12 +11: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
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
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
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
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
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
7402eb2f91
Merge remote-tracking branch 'origin/master'
2014-12-06 01:00:40 -06:00
1276e0c0d5
Chat Slow Command
2014-12-05 21:33:31 -06: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
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
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
1fd1e5cc34
Removed unused gem booster code.
2014-12-02 12:50:53 -08:00
Jonathan Williams
libraryaddict
Chiss
Shaun Bennett
Shaun Bennett