4f5430e390
Added tournament stuff.
2014-09-12 21:52:44 -10:00
e31ab1b37a
disabled treasure again!
2014-09-13 16:44:51 +10:00
054709a859
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2014-09-13 16:44:11 +10:00
31c4a95da5
Disabled Treasure Chests
2014-09-13 16:43:18 +10:00
1e7ed8d491
Treasure rewards + some minor fixes
2014-09-13 01:25:14 -05:00
a196e43fde
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
2014-09-12 19:46:19 -10:00
0afb0f061c
Changes to fireworks animation
2014-09-12 23:43:38 -05:00
aafdc555b1
Oops, accidentally removed some code!
2014-09-12 23:41:50 -05:00
0f44850367
Treasure stuff
2014-09-12 23:30:00 -05:00
5e9cbcef75
Merge remote-tracking branch 'origin/master'
2014-09-12 23:15:58 -05:00
71f42c6e7b
Treasure updates
2014-09-12 23:15:53 -05:00
a31e20d709
treasure styles
2014-09-13 14:09:50 +10:00
4454627b32
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-13 13:41:48 +10:00
e511df4605
Merge treasure
2014-09-13 13:41:37 +10:00
fc6a2633c9
Remove debug message, make sure player is far enough from spawn to open treasure
2014-09-12 22:41:10 -05:00
a8eeef02dd
Adjustments to how treasure rewards are selected
2014-09-12 22:33:22 -05:00
14c4152248
Fixed CustomTagFix.
...
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
2014-09-12 10:03:33 -10:00
20680acea0
More treasure rewards + tweaks
2014-09-12 14:24:30 -05:00
dea6c98fc9
Merge remote-tracking branch 'origin/master'
2014-09-12 14:08:22 -05:00
4ea786a1a5
Fix fireworks for 1.8 client, a bunch more treasure stuff
2014-09-12 14:08:10 -05:00
5de59b6e0e
Hub UHC countdown basics
...
UHC MOTD timer stuff
2014-09-12 18:06:51 +10:00
0dff0412d1
Fixed game flag for not allowing inventory opens
...
Removed some redundant flags in game
Lots of MineStrike updates
Fixed NPE in WinWithoutLosingTeammateStatTracker
2014-09-12 11:47:39 +10:00
b910c5098c
Cross version Holograms (Alignment might be a tad off)
...
A bunch of stuff for Treasure Chests
2014-09-10 12:16:31 -05:00
32bbecd01a
Merge remote-tracking branch 'origin/master'
2014-09-09 19:27:16 -05:00
c4ad00bef1
add armor stand hologram, just to send code to laptop
2014-09-09 19:27:05 -05:00
652075138e
More treasure rewards work
2014-09-08 13:26:18 -05:00
347e2b1bf5
Changed FIRE items to Blaze Powder
2014-09-08 10:14:55 +10:00
3e5b827a7f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-07 18:10:31 -04:00
201782a7cd
Added leaderboard.php
2014-09-07 18:09:46 -04:00
6441b110b4
Treasure stuff from laptop
2014-09-07 13:35:49 -05:00
558231457c
Fixed disguises leaving extra tags
...
Fixed memory problem in Arcade.
2014-09-06 03:39:20 -07:00
86d063dafb
Merge remote-tracking branch 'origin/master'
2014-09-06 01:07:49 -05:00
15b46e8f96
Fix displaying on stats on achievement gui
2014-09-06 01:07:40 -05:00
644d3da050
JOOQ for Eclipse
2014-09-06 11:31:55 +10:00
eb27c1dfbe
Add Util class for sending titles to players
2014-09-05 19:46:11 -05:00
2f8b53f771
Fix for customer support server.
...
Fix for Boss bar junk.
Fix for Disguises.
2014-09-05 14:36:10 -07:00
d01529a344
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2014-09-05 04:38:23 -07:00
1c6790b611
Fixed for DisguiseManager
...
Rewrote packet handling
Fixed up CustomTagFix
Removed swapping kits in Block Hunt
Removed Stacked entities for 1.8 players.
2014-09-05 04:36:01 -07:00
91a2266a04
Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking
2014-09-05 04:00:51 -04:00
b28fc8ee6b
Added custom name tag fix for mobs for 1.8 players
...
Worked on boss bar display.
Bug with <=50% hp.
2014-09-04 11:33:51 -07:00
e7f79aa5bf
Update IntelliJ files for latest changes
2014-09-03 11:42:50 -05:00
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
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
08e6b73b1f
Disable Treasure stuff for now
2014-09-02 19:04:43 -05:00
2b3f6c9dbc
Prevent minecart mounts from being broken by others
2014-09-02 19:03:14 -05:00
2d5c676e1b
Merge remote-tracking branch 'origin/master'
2014-09-02 18:57:35 -05:00
4ad034b8d9
more treasure stuff, really basic holograms
2014-09-02 18:33:40 -05:00
05623b7522
Initial MineStrike push
...
fixed frames being breakable in games
2014-09-01 21:37:39 +10:00
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
5905ef5ef7
Treasure Stuff
2014-08-30 14:27:11 -05:00
c8bc697888
Fixed mounts and gadgets for rank messages...no Purchase.
2014-08-30 02:37:27 -07:00
f6dcebc3dc
Fixed extra spacing in cosmetic menu.
2014-08-30 02:33:37 -07:00
72aa05f73e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-30 02:26:16 -07:00
829736ed07
Fixed purchase info.
2014-08-30 02:26:07 -07:00
e52f6deab4
Merge remote-tracking branch 'origin/master'
2014-08-30 04:24:34 -05:00
6a58b86a19
Don't display wins and losses to other players on Achievement Gui
2014-08-30 04:24:25 -05:00
b07670f6af
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-30 02:04:32 -07:00
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
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
1f6b9374eb
disable le minestrike
2014-08-29 11:55:06 +10:00
c3bb0ddbcb
Chest example gadget for shauny
2014-08-29 11:00:16 +10:00
409e2c6141
Tweaked menus for quick game, Cosmetic menu.
...
Removed debug for Hub
Output a little debug info in LobbyBalancer
Added duplicate check to ServerMonitor
updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra
2014-08-28 14:01:37 -07:00
526ca42add
Fixed Gem booster problem.
...
FIxed stat problem.
2014-08-27 12:48:24 -07:00
311711f2f0
Disabled fireworks for non-gadget enderpearls.
2014-08-27 15:24:10 +10:00
9cde497a5c
Fixed ethereal pearl text
2014-08-27 15:20:55 +10:00
9439daa852
Fixed bug where spectators could trigger anti-cheat in bridges
2014-08-27 15:16:20 +10:00
596bcbfae6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-27 14:23:01 +10:00
da5f953212
Fixed BlockMorph leaving blocks behind when player was teleported.
2014-08-27 14:22:35 +10:00
8439838328
After years of research and experimenting, we settled on an achievement icon
2014-08-26 19:01:59 -05:00
78eee68592
Change achievement icons, fix another typo
2014-08-26 18:39:01 -05:00
c04319345a
Merge remote-tracking branch 'origin/master'
2014-08-26 17:41:07 -05:00
507d356346
Fix last achievement typo
2014-08-26 17:40:58 -05:00
232785a7dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 04:56:34 -07:00
417d398195
Swapped Morph and Pet active slot.
...
Fixed a couple things on Staff server.
2014-08-26 04:56:23 -07:00
99951bc573
Fix achievement typos
2014-08-26 04:20:33 -05:00
064b0e8b36
Removed sheep mount and fixed up server monitor.
2014-08-26 01:31:57 -07:00
81e92c0e8e
changed wording in achi GUI
2014-08-26 18:24:20 +10:00
6f1204c844
Set gem reward for all achievements
2014-08-26 18:20:33 +10:00
ab29a5fa29
Fixed text output in Achi GUI for completed
2014-08-26 18:06:01 +10:00
d62b59776f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-26 17:54:50 +10:00
116fe496a8
Changed post game achievement output
...
Added Reward to Achi GUI
2014-08-26 17:53:54 +10:00
7a8ab5c96a
Comment for weirdness.
2014-08-26 00:53:41 -07:00
a4cf9e2f4b
Fixed stat bugs.
2014-08-26 00:52:51 -07:00
526b5c333a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 00:34:00 -07:00
137b8692e4
Added Gem booster use.
2014-08-26 00:33:48 -07:00
0546c9e175
Fixed so only Supply drop chests trigger achievement
2014-08-26 17:33:23 +10:00
1b15a57fc8
Added Gem Rewards for Achievements
2014-08-26 17:10:20 +10:00
162a86d4b2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
2014-08-25 23:58:54 -07:00
b8b6c031cd
Re-did and added a game to the quick game menu.
...
Fixed npc triggers with non npcs named the same.
Fixed naming pet longer than 16 chars.
Added sugar cane to restricted block type for paintball gun
Properly hooked in gadget block event for paitnball gun.
Added auto purchase page on item gadget ammo empty.
Added check on rank for customer support command.
Fixed ConcurrentModificationException problem with spigot.
2014-08-25 23:56:58 -07:00
95e7517a9e
disabled debug cmd for rave suit
2014-08-26 16:17:38 +10:00
8fc6013ff3
Disabled Chest GUI
2014-08-26 16:12:01 +10:00
dd61077850
Added missing Achievements
2014-08-26 14:46:10 +10:00
1b3e32ca26
Added Arcade Achievements
2014-08-26 14:42:17 +10:00
f0e01aa257
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-26 13:42:54 +10:00
28d523d696
Added Achievements
2014-08-26 13:42:42 +10:00
905d4db6f1
Use emerald instead of bed
2014-08-25 21:32:30 -05:00
2e0b074053
More achievement gui changes
2014-08-25 20:56:21 -05:00
07ee44508e
Missing Gadgets
2014-08-26 08:17:41 +10:00
0e3cf67402
Some new cosmetics
2014-08-25 12:59:29 +10:00
13eb3da0fa
Achievment gui changes
2014-08-25 09:26:01 +10:00
ff441f2262
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-08-24 16:14:29 -05:00
2cb87b23e6
Stat Gui, Start of Treasure Gui (disabled)
2014-08-24 16:08:19 -05:00
642f8b46b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 18:01:35 +10:00
af9bf0727a
Fixed damage taken stat NPE
...
Added tournament team auto-rejoin
2014-08-23 17:55:28 +10:00
fd0c4745f8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-23 00:40:17 -05:00
931cb5ece8
Removed MineKart code.
...
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
2014-08-23 00:40:07 -05:00
0700b9df12
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 15:04:55 +10:00
3ec43f90e8
GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements
2014-08-23 15:04:43 +10:00
a84468157c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 18:21:38 -05:00
ebb4c44bdc
Tweaked player disguise.
2014-08-22 18:21:23 -05:00
9fad775f73
More cosmetics
2014-08-23 07:50:07 +10:00
11597285b8
Changed so it music will never be 'active'.
2014-08-23 05:36:57 +10:00
2e031f1e4a
Added Music Gadget
2014-08-23 05:35:07 +10:00
b67b2f04b7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 13:32:50 -05:00
13b90e1142
Preliminary work on help desk integration with Customer Support server.
...
Updated DisguiseSheep with values from craftbukkit.jar
2014-08-22 13:32:22 -05:00
a159f04d50
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 04:30:52 +10:00
231ef2bbe1
Cosmetic Update
2014-08-23 04:30:41 +10:00
83b3e49151
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 10:48:27 -05:00
70217fe957
Finished first release of Customer Support plugin.
2014-08-22 10:47:46 -05:00
0022586e3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-22 17:08:29 +10:00
97c087a28d
Allowed commands to specify specific ranks
...
allowed youtube/build to start/set games
2014-08-22 17:05:14 +10:00
99d15d3ece
Work on Customer support server.
2014-08-21 15:55:09 -05:00
830eeca835
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-20 20:14:32 -05:00
60869d114e
Dragon Escape changes
2014-08-20 15:45:10 +10:00
217ab51b40
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 22:24:16 -05:00
a7bb84be0b
Revert chris' revert
2014-08-19 21:24:49 -05:00
f60a818e6a
Update craftbukkit to remove the extra _INVALID mappings
2014-08-19 21:22:04 -05:00
24f984a365
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 21:37:11 -04:00
9ee25c6292
Did some cleanup in Pvp project.
...
Did work in Coreclient manager and added StaffServer (still in progress)
2014-08-19 21:36:23 -04:00
94e5eb03da
Fixed errors for new getPlayers method.
2014-08-20 10:43:56 +10:00
e1a57a673e
Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors
2014-08-19 16:58:55 -05:00
d73ffcccfd
Added performance logging in ServerMonitor
...
Added date tracking for gem/coin/account transactions in preparation for Customer Support server.
2014-08-18 15:46:23 -04:00
43fd604695
Queue up polls for players instead of constantly checking for next poll
2014-08-17 17:47:38 -05:00
8aec9e345e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-16 01:37:17 -05:00
df97873d32
Fixed index issue with lobby balancer
...
Added performance output for server monitor.
Removed logging of debug stuff.
2014-08-16 01:37:06 -05:00
d8123795aa
changed the way disguises show rank.
2014-08-16 16:33:18 +10:00
a888d4f14b
Fixed leaks
2014-08-16 15:39:02 +10:00
ae6cb4aa22
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-15 15:56:44 -04:00
19222c6815
Updated IntelliJ environment to be compatible with latest changes
2014-08-15 15:51:29 -04:00
3c4c537998
Fix issue where broken Jedis instances were returned as functional instances.
2014-08-15 14:49:01 -04:00
697897b967
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-15 09:49:12 +10:00
85522cddca
Debug (will clean once fixed)
...
Game stats
2014-08-15 09:49:00 +10:00
846c75453c
Revamping Redis Server status so it uses a consistent time value from redis database.
2014-08-14 07:41:04 -05:00
cacf736f4f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-14 04:10:21 -05:00
682735e994
Added build fixes for ServerMonitor.java
...
Added redis fixes for ServerMonitor
Added ServerStatusManager fixes.
2014-08-14 04:10:11 -05:00
74435bac12
fixed bug where players kept inventory open, to be able to enable morphs ingame.
2014-08-14 17:31:14 +10:00
c72f4b6057
Dragon target cancel fix
2014-08-14 12:35:49 +10:00
b21ae8ef72
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-14 10:32:52 +10:00
7a3bba45a7
Mergey!
2014-08-14 10:32:41 +10:00
27032ac2ed
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
Plugins/Mineplex.Core/src/mineplex/core/portal/PortalRepository.java
2014-08-13 18:59:59 -05:00
6039168601
Updated code base to build #1604 spigot
2014-08-13 18:57:37 -05:00
4b4f43ac16
Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section.
2014-08-13 16:37:05 -04:00
1bbb42214d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-12 11:14:53 -04:00
5b059e96ca
Commit missing PortalRepository.java file and finish clean() method.
2014-08-12 11:14:31 -04:00
95394c51cc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-12 11:24:12 +10:00
2d67d4ce36
Achievement fix + active
2014-08-12 11:23:53 +10:00
36d6a58e0a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
2014-08-11 15:39:56 -04:00
d63137ead2
Merge remote-tracking branch 'origin/master'
2014-08-11 12:44:28 -05:00
4006c454c3
Change order of events when enabling a gadget (Fixes bug where switching gadgets while a gadget is enabled doesn't show up on gadget page)
2014-08-11 12:39:26 -05:00
482b964580
Display particles when shouldDisplay() is true instead of false
2014-08-11 12:30:03 -05:00
7e93ed657f
Display boss bar properly while a dragon mount is spawned in arcade
2014-08-11 12:26:56 -05:00
02270a9d25
TNT effect only triggers off self tnt.
2014-08-11 15:33:45 +10:00
e4871c4988
Disabling cosmetics 5s before game starts, was having some carryover due to lag.
2014-08-11 11:55:00 +10:00
06bcf5079b
Disabled Gem hunter (bugged?)
...
Disabled chicken morph letting people fly
2014-08-10 18:36:18 +10:00
25b525837f
Fixed TNT blowing up lobby when it changed to prepare.
2014-08-10 11:07:05 +10:00
9057246ab8
Arcade Inventory fixes
2014-08-10 10:50:31 +10:00
3533ce1b7e
Particles dont play in stealth games.
2014-08-10 01:04:53 +10:00
53221e267e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-10 00:57:17 +10:00
7aa017772f
Spectators will not play particle effects
...
ALL rank no longer displays on morphs.
2014-08-10 00:55:51 +10:00
e50c179e8d
Fixed pet tag price.
2014-08-09 09:49:00 -05:00
43862ea6bf
Moved Particles to Admin and up only.
2014-08-09 09:44:00 -05:00
21b89d2771
removed particle debug
2014-08-09 23:36:36 +10:00
59859b168f
Fixed multi-morphs
2014-08-09 23:34:12 +10:00
3ea2567079
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 07:41:09 -05:00
9b75ef4f96
Fixed purchasing -2 cost gadgets.
2014-08-09 07:41:00 -05:00
066dfbc9a9
Morph helmet fix
2014-08-09 22:38:58 +10:00
e558796268
fixed TNT not being able to hit anyone
2014-08-09 22:16:49 +10:00
a34ce75252
price fix
2014-08-09 22:02:40 +10:00
6c847e78b7
Gem Hunter exp change
2014-08-09 20:16:21 +10:00
06a444bae6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 19:55:35 +10:00
ff6ea3c798
Added Cosmetics to Arcade
...
Set prices on cosmetics
2014-08-09 19:55:05 +10:00
b0f6435661
Fixed items not updating immediately.
2014-08-09 04:29:34 -05:00
951e1df3d5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 19:05:34 +10:00
8fe4e39207
Split up Cosmetic shop and Inventory
...
Added Ammo purchase for item gadgets.
2014-08-09 03:57:56 -05:00
62eccbcc1e
Snr Mod
...
Creeper knockbak changes
2014-08-09 15:06:00 +10:00
91a79f0345
Pig Morph
...
Morphs have tags/
2014-08-09 14:57:01 +10:00
3f54881a3e
Fixed multiple purchase of Gem Booster.
2014-08-08 23:06:16 -05:00
6bd9273edf
Refactored getting item count for ClientInventory
...
Fixed up Arcade gem boosters so they are hooked into inventory.
Cleaned up unused code.
2014-08-08 22:10:02 -05:00
db90bcc958
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 12:16:53 +10:00
313f675ae4
Hub Parkour update
...
Smash kit prices
2014-08-09 12:16:37 +10:00
e7847cc495
Tweaked Gem booster description.
2014-08-08 20:50:07 -05:00
bed2545b04
Added back buttons for sub menus.
...
Added Gem booster pack and booster count display.
Added reason and admin to mute message
Fixed inventory tracking.
2014-08-08 20:48:15 -05:00
ecb0b2d3bb
Fix LobbyBalancer merge issue and convert PortalRepository to a redis-based system instead of MySQL.
2014-08-08 17:35:37 -04:00
02dd579844
Text change for Inventory Menu
2014-08-08 17:16:20 +10:00
e1be732202
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
2014-08-08 02:07:20 -05:00
9f2a83c956
Added Coins to donation.
...
Fixed order of gadgets, mounts, pets, morphs, particles.
Fixed display of active pet in Menu
Fixed coins purchase for most items.
Added Coins reward for ENjinTranslator.
Added Coin transactions.
2014-08-08 02:05:58 -05:00
fa3695be4e
Gem Booster In Lobby
...
Achievement Stuff
2014-08-08 17:05:11 +10:00
8f72ba4ab7
Hooked in statchangeevent
2014-08-08 13:53:58 +10:00
1a33dbb5ee
Achievement Module
...
Gem Booster/Achivement
2014-08-08 13:46:35 +10:00
e051c1d62c
Work on inventoryManager and Enjin translator.
2014-08-07 21:22:18 -05:00
5d89d1f728
Fixed gadget adding/removing from hotbar
...
Fixed stats manager _stats not initializing
Optimized saving call.
2014-08-07 01:46:10 -07:00
2a31bbee95
Added new gadget stuff to core.
...
Hooked up particle page.
2014-08-07 01:20:19 -07:00
c01fbd279d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
2014-08-07 00:48:32 -07:00
055e4c5895
Converted PreferencesManager to RepositoryBase
2014-08-07 00:43:54 -07:00
6d86f403ac
Added coins Currency to web api
...
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager
Redesigned gadgets/morph/particle/pets/mounts page and inventory.
2014-08-07 00:33:24 -07:00
c8dfb2f02e
Parser Fixes
...
Sneaky Stuff
2014-08-06 11:07:49 +10:00
1b7c762942
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/Repository.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerGroupData.java
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
2014-08-04 18:47:49 -04:00
39e23c16f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-04 00:00:12 -04:00
ec48a59301
Added option DISGUISE_TYPE:<ENTITY_TYPE> in WorldConfig.dat for Sneaky Assassins to configure which entity players are disguised as.
2014-08-03 23:59:10 -04:00
6d7e8072d5
Remove premium server restriction in ServerCommand
2014-08-03 13:41:14 -05:00
6a9255e97b
Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes.
2014-08-01 17:56:29 -04:00
53ce70488f
Merge pull request #1 from premium-server-menu to master
...
* commit '95a45409a98c141a115e463e56e440b204ae2029':
Use UtilPlayer and F.main for messaging
Fix flashing clock (oops!)
Sound effects and knockbacks!
Flashing wool instead of clock for the timer
Change duration of timer. Don't punish a party if the leader has ultra
Lighten load on our servers, not free servers!
Lore edit on clock item
Place players on correct server corresponding to their rank via portals
Visual clock update
Fix lore messages not displaying correctly under certain circumstances
Use constants for lore messages on server page
Prevent free players from joining servers before time limit
Deny joining Premium servers through server command without premium
Fix "Click to Spectate" formatting
Identify free servers from server name
Add Server Menu for Premium Servers. Item lore still needs some work
2014-08-01 02:05:39 -05:00
c2b1f2a52f
Deny joining Premium servers through server command without premium
2014-07-31 13:47:51 -05:00
fb0469adfa
Chat filter API changes from TwoHat/PottyMouth to Inversoft/CleanSpeak.
2014-07-30 20:09:58 -04:00
dcc8eaaa21
Add Server Menu for Premium Servers. Item lore still needs some work
2014-07-30 17:19:51 -05:00
1362deca59
More work on FriendManager
2014-07-19 13:56:21 -07:00
2ae3d89496
Fixed issue with RepositoryBase and Friend/MysqlRepo
...
Each db call on login gets its own async after the first two account calls are finished.
2014-07-19 13:56:03 -07:00
8b747a81e1
Fixed filter bypass
2014-07-19 13:53:14 -07:00
3636255e8a
Fixed bug with DisguiseManager undisguising players.
...
Temp fix for emeralds not triggering in Perk Revealer.
2014-07-14 23:48:34 -07:00
1207ed8199
Added DDOSProtectionSwitcher email functionality
...
mineplex.core.Server cleanup.
Refactored RepositoryBase.
Implemented core functionality of Friends
2014-07-14 22:58:36 -07:00
58092c914a
Initial database access and method stubbing for "news" command.
2014-07-08 22:55:51 -04:00
963c71f128
Fixed internet status stuff for bungees.
...
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
e6e86c2042
Updated DnsMadeEasy api.
...
Cleaned up some bungee code.
Added InternetStatus to Bungees.
Fixed some portal stuff.
2014-07-08 12:20:19 -07:00
ddf1a8ff74
Pointed "send" command to "AddTransferRecord" method in Portal module.
...
Corrected "serverTarget" to "playerTarget" in "Player...does not exist!" message.
Cleaned up unnecessary references.
2014-07-07 17:30:03 -04:00
a66e877028
Cleaned up Bungee mineplexer a bit.
...
Refactored send/server commands for Portal.
2014-07-05 10:56:20 -07:00
c882ab1b34
Fixed portal command stuff.
...
Removed temp code from PlayerTracker
Added temp project for future ddos prot switching.
2014-07-04 23:23:19 -07:00
e6666932aa
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-04 14:32:41 -07:00
c265c7ce5c
Fixed sync db Logger.java
...
Added temp test code in player tracker...ignore.
fixed bug in dynamic server sorter.
2014-07-04 14:23:11 -07:00
2fb2aadf66
Merge remote-tracking branch 'origin/master'
2014-07-04 11:12:52 -04:00
b56855c33c
Squished remaining concurrency/checking bugs! Happy 4th o'July!
2014-07-04 02:19:20 -04:00
d2caf23ed7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-03 11:19:23 -07:00
b058665e93
Fixed sync db calls for PlayerTracker
...
Fixed name update with new UUID
Skeleton work for Friends
2014-07-03 11:18:11 -07:00
2531dd7a8f
Implementing user/serverName checks
2014-07-03 00:17:49 -04:00
d0fafce585
Reverted change to helper only joining full, now ultras can.
...
Added check so BETA servers cannot be joined by less than Helper.
Fixed message in AccountAdministrator for rankUpdate
2014-07-02 16:59:31 -07:00
558f79fe34
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-02 10:58:34 -07:00
17c36026f6
fixed bug where player who comes first was not being added to ranks. (get nothing)
2014-07-02 10:57:30 -07:00
e7832fd06c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
2014-07-02 03:47:14 -04:00
1f515565ff
Moving improved server/send command code to separate command files
2014-07-02 03:24:48 -04:00
44a57a485f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 21:39:03 -04:00
41c4d5a0a8
Changed joining full servers to helper+
2014-07-01 18:33:33 -07:00
6fd889d8fc
Added Player mapping.
...
Removed joining full servers for ultra.
2014-07-01 18:31:17 -07:00
b627e8fdf5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 10:25:12 -07:00
9fd3f14248
Added RankUpdate command.
...
Fixed Lobby joinable issue with server monitor.
Changed server monitor to be fully dynamic for us.
2014-07-01 10:23:22 -07:00
7ea818c0c8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 02:20:45 -04:00
7bc3966feb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-30 16:13:15 -07:00
8c461b3e1b
Cooldown on Spec Compass
...
Hub Forcefield Update
Scoreboard MINEPLEX refactor
2014-06-30 16:12:42 -07:00
8e8e66f8c1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-27 20:25:09 -07:00
0287cfb2f6
Refactored Punish a bit so punishments don't expire early or jack up based on server's time.
2014-06-27 20:24:44 -07:00
ccb17d5ac3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-27 19:33:34 -04:00
60a6f22194
Added functionality for retrieving serverName from Bungee
2014-06-27 17:01:54 -04:00
Jonathan Williams
Chiss
Shaun Bennett
Shaun Bennett
CoderTim
Ty
Peter Miller
Mini-Chiss