e286a45de8
Code cleanup for spawn location, remove JoinCommand
2014-08-16 16:01:00 -05:00
18e1265afd
Remove join list, adjust intellij import style to be more like eclipse
2014-08-16 15:55:29 -05:00
eac0f9fd6a
MapParser refactoring/changes
2014-08-16 15:50:33 -05:00
4193ee53ea
Merge remote-tracking branch 'origin/master'
2014-08-16 12:13:11 -05:00
ef6871491d
Add MapParser IntellIj configurations
2014-08-16 12:12:59 -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
686203ed8a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-16 00:39:36 -05:00
a888d4f14b
Fixed leaks
2014-08-16 15:39:02 +10:00
249a56360e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-15 23:19:13 -05:00
508ef65fcf
Added missing file
2014-08-16 14:17:15 +10:00
f98dc0c66d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-15 23:03:34 -05: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
5c0e1ad484
Fix issue where null MinecraftServer entries were being returned in getServerStatuses() method in RedisServerRepository.
2014-08-15 15:32:01 -04:00
3c4c537998
Fix issue where broken Jedis instances were returned as functional instances.
2014-08-15 14:49:01 -04:00
3f827a310a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-15 11:54:19 -05:00
efdaa21ae7
Proper cleanup on lobby menu update.
2014-08-15 11:52:57 -05:00
0d38ac4e96
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.ServerData/src/mineplex/serverdata/RedisServerRepository.java
2014-08-15 11:40:15 -04:00
da8aa3f1e3
Fix issue where broken Jedis resources were not being properly handled.
2014-08-15 11:33:34 -04:00
29db90837d
Spleef Update
...
Map parser block stuff
2014-08-15 15:28:50 +10: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
282219fb4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-14 17:31:27 +10:00
74435bac12
fixed bug where players kept inventory open, to be able to enable morphs ingame.
2014-08-14 17:31:14 +10:00
f524ffb093
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-13 21:53:15 -05:00
d1e69a34f1
Fix chiss path errorrrrrrrrrrrrrrrrrrrrs.
2014-08-13 21:53:03 -05:00
c72f4b6057
Dragon target cancel fix
2014-08-14 12:35:49 +10:00
5f80d9c57a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-08-14 11:24:51 +10:00
b6ba142c5a
Mineplex in scoreboard is fancier.
2014-08-14 11:23:48 +10:00
b9534bd245
Merge remote-tracking branch 'origin/master'
2014-08-13 20:07:01 -05:00
cfe45139b6
Adjust lobby text for the removal of premium kits
2014-08-13 19:56:47 -05:00
83f04273fa
Sort kits properly when a game uses NullKit
2014-08-13 19:45:38 -05: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
5c5a57b048
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-13 16:37:20 -04:00
4b4f43ac16
Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section.
2014-08-13 16:37:05 -04:00
93811b200d
Small adjustment to lobby balancer code.
2014-08-12 17:01:54 -05:00
5363f686e5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-12 13:00:24 -05:00
5618a3edad
Removed extra free version generator in server monitor.
2014-08-12 13:00:17 -05: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
7191d48bd0
fixed paintball pre-game bug
2014-08-11 14:25:11 +10:00
e4871c4988
Disabling cosmetics 5s before game starts, was having some carryover due to lag.
2014-08-11 11:55:00 +10:00
d81b32bd3a
Sneaky Assassins balance+polish
2014-08-10 21:05:41 +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
cfd1d868b5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 09:41:07 -05:00
f15e539841
Added showing of only 3 full servers in server menu.
2014-08-09 09:40:59 -05:00
616a0ecf11
Staff get all kits unlocked.
2014-08-10 00:32:50 +10:00
38fd85335f
Fixes disguises being disabled.
2014-08-10 00:21:45 +10:00
62cc422f42
FINAL FIX
2014-08-10 00:13:04 +10:00
c95cf79aa6
fxied more
2014-08-10 00:10:08 +10:00
a43a5b2c0e
bacon brawl fix
...
signel game ultra shows in hub scoreboard
2014-08-10 00:09:39 +10: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
1a6540b4d0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 23:25:26 +10:00
3d1ddecffb
Smash Kit fix
...
Gem Booster (dragons) fix
2014-08-09 23:25:13 +10:00
dffc56e3e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 08:11:01 -05:00
cac7f85410
Single game ultra kit unlock
2014-08-09 23:10:40 +10:00
dbf59a032b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 08:08:41 -05:00
0cdfda7765
Fixed message on free timer.
2014-08-09 08:08:24 -05:00
175d9f9886
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-09 23:00:07 +10:00
23f93e55cf
fixed dragons destroying pregame lobby
2014-08-09 22:59:54 +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
800658ff48
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 07:26:05 -05:00
2c75bcbdfe
Added ability to store gem boosters in enjin.
2014-08-09 07:25:58 -05: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
4e93707f0d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-09 00:06:53 -05:00
0de8d22e62
Changed invis in hub to only be on server npc shops
...
Fixed /a for senior mods and developers.
2014-08-09 00:06:44 -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
3d909b7cbe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-08 23:06:26 -05:00
3f54881a3e
Fixed multiple purchase of Gem Booster.
2014-08-08 23:06:16 -05:00
fb19e93992
Gem text
2014-08-09 13:46:41 +10:00
c93a49add2
More gem boosty!
2014-08-09 13:42:29 +10:00
2e95548b6e
Gem Boosters!
2014-08-09 13:39:57 +10:00
3a220b6f1c
Micro Update
...
SGTeams inv click fix.
2014-08-09 13:11:32 +10:00
7fd40b38dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-08 22:10:09 -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
97cf02eb37
Hub changes
2014-08-09 12:35:36 +10: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
26c4045bc3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/inventory/ui/page/Menu.java
2014-08-08 20:49:27 -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
b36b1cb007
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-08 17:05:23 +10:00
fa3695be4e
Gem Booster In Lobby
...
Achievement Stuff
2014-08-08 17:05:11 +10:00
9395711dcb
Merge remote-tracking branch 'origin/master'
2014-08-08 01:51:50 -05:00
b7ecf5eb04
GET MINEPLEX ULTRA FOR AMAZING FUN TIMES
2014-08-08 01:51:11 -05: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
57cf3e4da6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-07 21:22:28 -05:00
e051c1d62c
Work on inventoryManager and Enjin translator.
2014-08-07 21:22:18 -05:00
2fd7621a81
Display proper team in Arcade Lobby (Fixes bug where a player connecting will break scoreboards)
2014-08-07 18:44:27 -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
0317795a04
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-07 17:31:01 +10:00
dc1a37a92e
Gadget STuff
2014-08-07 17:30:46 +10:00
8d05938306
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-07 00:00:01 -04:00
8a74b08b0d
Fixed silly mistake I made
2014-08-06 23:59:52 -04:00
04487fae3e
Only show 5 open servers on Server Gui
2014-08-06 21:31:53 -05:00
0b942e5180
Stop DragonMount from causing the news bar to flicker
2014-08-06 21:03:48 -05:00
f7f9d3e703
Sneaky assassin power-up maximum is 5 and hanging entities cannot be damaged
2014-08-06 21:35:11 -04:00
c647e6b48d
Missing morphs
...
Bacon brawl knockback increase over time
Parse color error fix
2014-08-07 09:47:11 +10:00
a737aa8624
Game desc
2014-08-06 19:16:17 +10:00
c4768a8a9c
Smokebomb doesnt end instantly :o
2014-08-06 19:13:25 +10:00
f68586cca4
Micro Battle
2014-08-06 19:00:18 +10:00
248111749f
Sneaky Changes
2014-08-06 17:14:07 +10:00
bea6eabb95
Sneaky Assassins: Revealed players have wither effect. Fireworks are yellow. Additional announce messages
2014-08-06 01:41:50 -04:00
16353c4bc9
Changes to Sneaky Assassin power-ups, including addition of compass power-up.
2014-08-06 01:23:06 -04:00
9e047847c2
scoreboard fix
2014-08-06 12:42:07 +10:00
4108a02f50
Sneaky scoreboard order
2014-08-06 12:37:41 +10:00
a0010668c6
Sneaky Assassins changes
2014-08-06 12:23:02 +10:00
f09506e436
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java
2014-08-06 11:09:16 +10:00
c8dfb2f02e
Parser Fixes
...
Sneaky Stuff
2014-08-06 11:07:49 +10:00
3ee0b271b6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-05 01:23:37 -04:00
0240d50029
Sneaky Assassins Changes:
...
- when you get a kill, give an armor upgrade and 1 smoke bomb
- Revealer range increased to 12 blocks
- NPC dies once every 2 seconds
- Lose 1 hunger every second. Gain 8 when damaging player or NPC
- Reveal all players every 60 seconds, for 2 seconds
- Added cloaking back to smoke bomb
- Power-up is always green and type alternates per player. Power-ups always include smoke bomb and mushroom soup.
- NPC speed slightly decreased
- Corrected sword power-up progression
2014-08-05 01:23:24 -04:00
2e43d565bd
Resolve merge conflicts.
2014-08-04 19:14:04 -04: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
e8d14e9fbf
Remove created by comment
2014-08-04 00:33:34 -05:00
1c5b3919e1
Merge remote-tracking branch 'origin/master'
2014-08-04 00:31:56 -05:00
0edb0d74a7
Fix bugs with kit sorting + cost of kits
2014-08-04 00:31:46 -05:00
e7d3cf9e02
Sneaky Assassins previous commit bug fix
2014-08-04 01:06:11 -04:00
012382ec48
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-04 01:02:27 -04:00
8a727e1365
Smarter Sneaky Assassins AI
2014-08-04 01:02:05 -04:00
e4662ab563
Update my SneakyAssassinKit change to work with Tim's changes
2014-08-03 23:41:54 -05:00
34dfe8dacd
Merge remote-tracking branch 'origin/master'
2014-08-03 23:32:37 -05:00
fe32cf5444
Remove KitAvailability.Blue
2014-08-03 23:31:55 -05:00
39e23c16f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-04 00:00:12 -04:00
482f48f994
Prevent players in Sneaky Assassins from breaking paintings and item frames
2014-08-04 00:00:04 -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
35b16e026c
Blue kits cost gems instead of being premium kits
2014-08-03 22:44:01 -05:00
7408afa697
Reverted Free/Premium split in Server Monitor.
2014-08-03 20:01:37 -07:00
6d7e8072d5
Remove premium server restriction in ServerCommand
2014-08-03 13:41:14 -05:00
69b709b3ab
Change clock timer to be 35 seconds
2014-08-03 13:28:56 -05:00
69aa881ba2
Remove reference to server split in clock text
2014-08-03 13:27:04 -05:00
db61a10c7f
Remove server split from server selection pages
...
Select any server with portals
2014-08-03 13:24:13 -05:00
cb1a466a5b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-02 03:01:53 -07:00
51faf5cd15
Reduced free timer.
2014-08-02 03:01:36 -07: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
5d1ab654b9
Merge remote-tracking branch 'origin/master'
2014-08-01 03:57:57 -05:00
232088cd55
Make sure servers are in progress before counting them
2014-08-01 03:57:34 -05:00
874c1413a3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-01 00:46:34 -07:00
f2d1380478
Fixed bug with Server monitor.
2014-08-01 00:46:00 -07:00
fb1f4ed5ac
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-01 17:45:35 +10:00
07fe476fd3
fix for stuff that jon broke
2014-08-01 17:45:22 +10:00
b056733ba1
Removed duration code and replaced with 60000L
2014-08-01 00:09:35 -07: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
a608783580
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-01 00:03:42 -07:00
b6fe33e6fb
Ultra/hero gems removed
2014-08-01 17:03:07 +10:00
95a45409a9
Use UtilPlayer and F.main for messaging
2014-08-01 01:43:50 -05:00
46fb27afbb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-31 23:39:08 -07:00
eae4bed630
Removed unused ServerManagerUpdater.java
...
Tweaked ServerMonitor to handle Free/Premium
2014-07-31 23:37:39 -07:00
15d48d2867
Fix flashing clock (oops!)
2014-08-01 01:25:11 -05:00
fbe6ab2fdb
Sound effects and knockbacks!
2014-08-01 01:22:01 -05:00
fd01b4933b
Flashing wool instead of clock for the timer
2014-08-01 00:39:38 -05:00
6b18fdf396
Change duration of timer. Don't punish a party if the leader has ultra
2014-08-01 00:38:26 -05:00
ccf5893051
Lighten load on our servers, not free servers!
2014-08-01 00:04:12 -05:00
5ea6eaeb9e
Lore edit on clock item
2014-08-01 00:03:26 -05:00
c01e9abf29
Place players on correct server corresponding to their rank via portals
2014-07-31 23:56:51 -05:00
7d1da7114f
Visual clock update
2014-07-31 23:49:52 -05:00
0f9e72d623
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-01 14:06:13 +10:00
599a6eb1f7
Changed kit availability to be based on free/premium.
2014-08-01 14:05:53 +10:00
c36242cc47
Added stained glass around power-up beacon base in sneaky assassins to identify power-up more easily.
...
Added workaround to make revealer fireworks explode consistently
Power-ups use UtilPlayer.message and have a sound effect is player when a power-up is aqcuired
Power-up bug fixes
2014-07-31 23:35:50 -04:00
6ac00cde99
Move Sneaky Assassins NPCs during Prepare and Live
2014-07-31 23:32:26 -04:00
22748eb225
Updated KitRevealer description
2014-07-31 23:31:42 -04:00
cf724272dd
Fix lore messages not displaying correctly under certain circumstances
2014-07-31 17:30:02 -05:00
41128cbc9d
Use constants for lore messages on server page
2014-07-31 17:17:05 -05:00
4c74ce60eb
Prevent free players from joining servers before time limit
2014-07-31 15:36:00 -05:00
c2b1f2a52f
Deny joining Premium servers through server command without premium
2014-07-31 13:47:51 -05:00
77b6f0250e
Play zombie_unfect sound when PerkRevealer explodes
...
PerkSmokeBomb also applies effects to NPCs
PerkSmokeBomb now uses HUGE_EXPLOSION effect
Set Sneaky Assassins PrepareFreeze flag to false
2014-07-30 23:56:40 -04:00
308c2e1b91
Kit availability
2014-07-31 13:00:05 +10:00
a4d579789c
Sneaky Assassins changes :)
2014-07-31 12:58:33 +10:00
fb0469adfa
Chat filter API changes from TwoHat/PottyMouth to Inversoft/CleanSpeak.
2014-07-30 20:09:58 -04:00
b93d6b9cb1
Fix "Click to Spectate" formatting
2014-07-30 17:44:09 -05:00
3e9aebdb87
Identify free servers from server name
2014-07-30 17:30:46 -05:00
dcc8eaaa21
Add Server Menu for Premium Servers. Item lore still needs some work
2014-07-30 17:19:51 -05:00
4d397438be
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-29 21:11:15 -07:00
f235f67aa5
Added +20 player buffer for lobbies.
2014-07-29 21:11:07 -07:00
ff5bc3f485
Added file logger to ServerMonitor.
...
Fixed Statifier pulling inactive bungee records.
2014-07-29 21:10:52 -07:00
9c952a7b04
Cleaned up date format creation every call in LobbyBalancer
...
Reduced times to call per second.
2014-07-29 21:10:08 -07:00
d129f722a3
Cleaned up Firework util.
2014-07-29 21:09:16 -07:00
0382afecd8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-29 20:24:04 -04:00
fa91bf0a00
Disable dropping hunger in Sneaky Assassins
2014-07-29 20:22:46 -04:00
46cc2576dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-26 10:41:04 -07:00
4e1a05e9bd
Fixed whitelist issue with tournament mode.
2014-07-26 10:40:49 -07:00
78b3d3b35c
restored original bridge timer :)
2014-07-26 21:05:12 +10:00
3f4e4b6607
fixed -1 not working
2014-07-26 21:03:50 +10:00
802415be8f
-1 team kills for suicide (only after bridge drop)
2014-07-26 20:57:40 +10:00
f090ed9313
end game fixes
2014-07-26 20:53:48 +10:00
4f46ccc8aa
Winner is decided on bridge tourney timeout
2014-07-26 20:29:01 +10:00
fa73ab5335
Bridges Tourney stuff
2014-07-26 17:40:17 +10:00
21314afabe
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-26 17:03:30 +10:00
107388baa3
Added game flag to allow clicking in inventory during games
2014-07-26 17:03:03 +10:00
a455042c07
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-25 23:38:38 -07:00
12b42cad29
Made tournament changes:
...
Staff can't see team chat
Bridge tournament time is 90 min
Kits are not all free
Removed twitch charity text/motd
If team not picked, you go to spec.
2014-07-25 23:38:21 -07:00
d6e06f4556
Removed some unnecessary logic in Lobby Balancer
...
REmoved unused code in mineplexer.
2014-07-25 23:37:24 -07:00
c747638303
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-25 18:33:34 -04:00
fe46355130
Added missing description to Sneak Assassin revealer items
2014-07-24 21:25:59 -04:00
fe356add41
Restore original blocks when Sneaky Assassin power-up beacon is removed
2014-07-23 15:45:30 -04:00
d7037f1619
Breaking up "/news" commands (like "/npc" sub-commands) using multicommandbase.
2014-07-22 22:18:29 -04:00
e8d4ab2517
Re-enabled News commands after adding check to "Reset newsIndex if outside of bounds of news array after RefreshNews but before UtilTime.elapsed" in NewsManager.java
2014-07-21 18:06:33 -04:00
a6a274069c
Prevent power-up message spam when player is fully powered-up
2014-07-21 17:26:45 -04:00
4460f2e651
Prevent fully powered-up Sneaky Assassin players from using additional power-ups
2014-07-21 16:29:15 -04:00
5bc7549b8c
Disabled news because of console errors.
2014-07-19 14:48:05 -07:00
fc43f434f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-19 13:56:30 -07: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
de5c0a77ef
Added another requirement for Lobbies in ServerMonitor 1500 available slots
2014-07-19 13:54:27 -07:00
e6818c4c46
Added small tweaks to lobby balancer and sorter for better spread on connect.
2014-07-19 13:54:03 -07:00
8b747a81e1
Fixed filter bypass
2014-07-19 13:53:14 -07:00
d2038670d6
Merge remote-tracking branch 'origin/master'
2014-07-18 02:52:26 -04:00
efa74f509a
Fixed bug where revealer doesn't always work
...
Prevent players from trading with sneaky assassin npcs
Display message when user powers up
2014-07-18 02:48:06 -04:00
Shaun Bennett
Jonathan Williams
Chiss
CoderTim
Ty
Peter Miller