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
5ef2772abd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 20:27:51 -04:00
7d6572ff4d
Fixed SheepGame Selfish achievement
2014-08-26 20:27:39 -04:00
8e89dfa1ab
Merge remote-tracking branch 'origin/master'
2014-08-26 19:02:08 -05:00
8439838328
After years of research and experimenting, we settled on an achievement icon
2014-08-26 19:01:59 -05:00
f25f7d3aa2
Fixed 1v3 achievement not giving achievement if players quit (required 4 at END)
2014-08-27 09:52:33 +10:00
48ed5e2cba
Merge remote-tracking branch 'origin/master'
2014-08-26 18:39:10 -05:00
78eee68592
Change achievement icons, fix another typo
2014-08-26 18:39:01 -05:00
b508cd036c
Lazy fix so that polls award gems instead of coins
2014-08-26 18:36:40 -05:00
5540835052
removed micro debug
...
fixed a bug in achievement output
2014-08-27 09:09:06 +10:00
dbf441dd0d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-27 08:57:24 +10:00
f9ce0d353c
Achievements now need 75%+ players at START of game
2014-08-27 08:57:11 +10: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
d9e1f35985
Fixed BadHiderStatTracker and limited stat recording to when games are at least 75% full
2014-08-26 16:30:55 -04: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
17649ce36c
Fixed bug where desc for past-completed achievements was still showing
2014-08-26 21:51:59 +10:00
99951bc573
Fix achievement typos
2014-08-26 04:20:33 -05:00
5fdf466722
Fixed bug in server monitor.
...
re-enabled animal spawn in hub.
2014-08-26 02:02:31 -07: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
3eae26ef80
Updated Achievement Output
2014-08-26 18:03:29 +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
7e7906865f
Fixed some stats being added after send-off
2014-08-26 17:45:35 +10: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
86930de23e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/AssistsStatTracker.java
2014-08-26 08:19:50 +10:00
07ee44508e
Missing Gadgets
2014-08-26 08:17:41 +10:00
933d32d8f8
Fixed team death/kills stats
2014-08-25 18:06:50 -04:00
9acc7d8496
Added team kill and death achievement trackers
2014-08-25 17:43:49 -04:00
4ce537a3a7
Fixed some NPEs and achievement bugs
2014-08-25 16:27:02 -04: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
7669998ad3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-25 08:38:29 +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
23f6d0ae1a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-24 16:46:00 +10:00
3f5cff3e21
Killing cheaters for a few things in bridges
2014-08-24 16:45:47 +10:00
c89461628b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-23 16:00:26 -04:00
fb90336d4e
Finished stats/achievements
2014-08-23 16:00:15 -04:00
642f8b46b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 18:01:35 +10:00
7348a26951
fixed damage dealt npe
2014-08-23 18:00:23 +10:00
af9bf0727a
Fixed damage taken stat NPE
...
Added tournament team auto-rejoin
2014-08-23 17:55:28 +10:00
70beb58bd6
Enabled debugging in Hub/Arcade
2014-08-23 01:49:48 -05: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
3a47a161c5
Enabled snake parkour
...
Updated servermanager/serverNpcPage to handle free and beta timers.
2014-08-22 22:53:15 -05:00
4afafe2d51
Some stats fixes
2014-08-22 21:54:08 -04: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
e40cb17e47
Updated tutorial locations
2014-08-23 08:52:50 +10:00
e5944ff872
Spawn location fix
2014-08-23 08:40:02 +10:00
340be68ef8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 08:39:39 +10:00
9fad775f73
More cosmetics
2014-08-23 07:50:07 +10:00
b2b208bdba
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 17:30:08 -04:00
02bb53578a
Registered stat listeners with each game
2014-08-22 17:20:02 -04: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
591b5c026c
Almost all achievements done
2014-08-21 18:55:40 -04:00
5e47a12531
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-21 15:56:02 -05:00
99d15d3ece
Work on Customer support server.
2014-08-21 15:55:09 -05:00
94f2aade08
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-21 15:01:22 -04:00
1398543490
Fixed bug with Projectile
...
Changed tp out of game to 1 per tick.
2014-08-21 02:07:54 -05:00
ac088e85b2
Added some game flags
...
Dragon escape changes
2014-08-21 13:35:31 +10:00
830eeca835
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-20 20:14:32 -05:00
315da32518
Removed unused code in Party
...
Fixed path var in Core.Common
2014-08-20 20:14:23 -05:00
f266f4e016
More achievements
2014-08-20 19:20:11 -04: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
1912d2c23e
Update EntityPlayer with recent craftbukkit changes
2014-08-19 21:43:12 -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
adf617000d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-20 12:07:15 +10:00
65c880b300
Parser changes
2014-08-20 12:06:24 +10: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
18ca7d5656
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 21:16:44 -04:00
599277b88e
More work on achievements
2014-08-19 21:16:28 -04:00
2ffcfb7737
Parser changes
2014-08-20 11:02:12 +10:00
94e5eb03da
Fixed errors for new getPlayers method.
2014-08-20 10:43:56 +10:00
7535f39d18
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-20 10:39:58 +10:00
afea0ba87f
Parser Merge
2014-08-20 10:39:41 +10:00
09c01d90ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 19:07:37 -04:00
e1a57a673e
Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors
2014-08-19 16:58:55 -05:00
33a1699fce
Minor enjin tweak.
...
Reverted to nullable gem column because sql db wants to take forever converting.
2014-08-18 17:35:03 -04:00
05686cb584
Work on achievements
2014-08-18 16:41:16 -04: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
b99e9d3f70
Simplified poll system, derp
2014-08-18 14:15:32 -05:00
36d5c2c3af
Don't add player's current poll to the queue
2014-08-17 18:11:55 -05:00
34ffc06166
Add functionality to skip polls
2014-08-17 18:07:16 -05:00
6e9d2b3244
Allow setting a time when it should poll again
2014-08-17 17:53:38 -05:00
43fd604695
Queue up polls for players instead of constantly checking for next poll
2014-08-17 17:47:38 -05:00
4ba7da9a54
Polls! Still needs tweaks
...
Hub artifact stuff for IntelliJ
2014-08-17 17:30:35 -05:00
e5340238b6
IntelliJ Hub Configurations
2014-08-17 13:57:20 -05:00
6793deffd0
Copy Command
...
Small Fixes
Single Imports IntellIJ config
2014-08-16 20:17:21 -05:00
b6c31294c7
Parse map properly, bug fixes
2014-08-16 16:19:33 -05:00
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
944e7fca40
Finalizing BONUS clickable text hover text and News Entry issue overall.
...
Fixing bug with "/news set" command with insufficient command arguments.
2014-07-16 18:49:49 -04:00
d9110b4e3b
Implementing BONUS: Clickable Chat Links.
2014-07-15 22:31:53 -04: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
cb4d436605
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-14 22:58:58 -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
64feaf63ed
Implemented Sneaky Assassin Revealer kit
2014-07-15 00:36:38 -04:00
c547801b7b
Added Sneaky Assassin NPC movement
2014-07-11 22:55:48 -04:00
b15534e1b2
Some work on Sneak Assassins NPCs
...
Added /game start <seconds> to start a game faster
Optimized GameTeam.GetSpawn() by avoiding unnecessary square root calculations
2014-07-11 00:56:25 -04:00
2ec8371f98
Implementing /news add and delete commands.
2014-07-10 21:10:35 -04:00
82ba7bf30f
Implementing /news list and set commands.
2014-07-09 20:38:11 -04:00
65b2e14689
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-09 11:15:06 -07:00
193bd82b61
Minor adjustment to rule book.
2014-07-09 11:14:57 -07:00
f38af4ab8a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 22:56:02 -04:00
58092c914a
Initial database access and method stubbing for "news" command.
2014-07-08 22:55:51 -04:00
5cd6bcfc82
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-08 18:08:46 -07:00
03c56535ef
MAPDATA
2014-07-08 18:08:37 -07:00
97422e237f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 18:01:30 -07:00
74817f5f2e
Added rule book to Hub.
...
Fixed mineplexer bungee internet status.
Fixed up ddosprotectionswitcher.
2014-07-08 18:01:03 -07:00
bd6b9b8888
so many fix
2014-07-08 17:35:27 -07:00
c5e05523d3
sneakyfix
2014-07-08 17:34:47 -07:00
dd0040086d
Parser Permissions
...
Sneaky Assasssin thingy.
2014-07-08 17:33:22 -07:00
4d40df45d5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-08 15:14:02 -07:00
1455b4001f
Parser Update
2014-07-08 15:13:30 -07:00
fb5f92df2a
Finalized internet status for bungees
2014-07-08 15:04:59 -07:00
2e5b003cff
More work on internet status stuff.
...
Fixed some buggies with parser.
2014-07-08 13:18:27 -07:00
2ccb27065c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 12:44:26 -07:00
963c71f128
Fixed internet status stuff for bungees.
...
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
848f843fbf
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/WorldManager.java
2014-07-08 12:41:25 -07:00
22709b0cd8
merge
2014-07-08 12:40:28 -07:00
39b2ad57be
Fix for map parser zipping.
2014-07-08 12:37:39 -07:00
6ae35f1b37
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-08 12:20:28 -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
65e7e1e0b3
Parser
2014-07-08 12:18:43 -07:00
cf25bdc44f
Bridges fix being able to break mid chests before gamestart
...
Map parser Updates
2014-07-07 19:04:44 -07:00
082cf98e99
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-07 16:26:08 -07:00
64903ae4b4
Work on DDoS Protection switcher
2014-07-07 16:25:49 -07:00
ef86fe6948
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-07 16:24:43 -07:00
62f6ea815d
Champs Balance Update
...
Map Parser Update
2014-07-07 16:23:55 -07:00
3490db4b6f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-07 19:10:40 -04:00
38e4240a61
Fully implemented Sneaky Assassins Power-Ups
2014-07-07 19:10:29 -04: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
fe1bf95342
Fixed code style and updated IntelliJ code style settings
2014-07-07 14:45:02 -04:00
a66e877028
Cleaned up Bungee mineplexer a bit.
...
Refactored send/server commands for Portal.
2014-07-05 10:56:20 -07:00
ff8c506690
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-04 23:23:30 -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
ce8560bdbf
hub news
2014-07-04 23:20:46 -07:00
df8562e69a
Tourney mode for UHC
2014-07-04 23:11:13 -07:00
c65712c260
UHC fixes
...
Sneaky Assassin listener leak fix
Some map parser stuffs.
2014-07-04 23:04:46 -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
6365ec5351
Started on Sneaky Assassins kits and power-ups
2014-07-04 11:14:34 -04:00
2fb2aadf66
Merge remote-tracking branch 'origin/master'
2014-07-04 11:12:52 -04:00
46c979e088
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-04 11:12:33 -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
d19b34b0e4
Removed debug
2014-07-02 17:14:52 -07:00
22ceba9841
Fixed Scoreboards!
2014-07-02 17:12:52 -07: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
8eaad57516
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-02 16:05:37 -07:00
f1393ffb33
Fixed rankUpdate changing existing higher ranked players.
...
Fixed join limits in arcade and hub.
2014-07-02 16:05:26 -07:00
bea6902198
Spectators can use /tp
2014-07-02 13:09:47 -07:00
82dd94de9b
Scoreboard fix
...
Unbreakable boats in hub
2014-07-02 12:50:04 -07:00
05e116ea0d
Scoreboard flicker fixed!
2014-07-02 12:38:41 -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
6c67ff9106
Resolving issues from Portal.java conflict resolution
2014-07-02 04:09:41 -04: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
9514f6391e
Fixed bug in Arcade with client manager.
2014-07-01 21:42:00 -07: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
081260757d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 18:31:26 -07:00
6fd889d8fc
Added Player mapping.
...
Removed joining full servers for ultra.
2014-07-01 18:31:17 -07:00
31772196a9
More scoreboard stuff (TDM)
...
New Tug game
2014-07-01 18:30:04 -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
f10b081473
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-26 18:38:28 -07:00
3d12196b17
Merge
...
UHC Public
Small refactor for player ranks in games.
Trimed scoreboard teams to 16 chars.
2014-06-26 18:38:11 -07:00
681dfc5f7c
Added ability to copy in schematics from build server.
...
Added in gametype checking on parse.
2014-06-26 12:09:29 -07:00
210264f25b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-25 20:53:39 -07:00
57c52cb9c8
Improved MapParser to allow world loading/saving for immediate testing.
2014-06-25 20:53:28 -07:00
e25101cd59
Continued enhancements...
2014-06-25 20:28:27 -04:00
f6ad5c5549
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-25 12:07:49 -07:00
4f3ffde892
Added timing/debugging code.
2014-06-25 12:06:24 -07:00
bb5aa8e0f3
Work on /server and /send commands with permissions (more permissions need to be implemented).
2014-06-24 22:34:17 -04:00
46849745c4
Champions TDM Update
2014-06-23 16:20:50 -07:00
f2c82cbf95
Refactored TimeUtil and added totalling option.
2014-06-20 20:42:36 -07:00
6cac04d399
Optimized create scoreboards.
2014-06-19 00:48:04 -07:00
231ffd7234
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-15 17:21:47 -07:00
93fbe70e9c
Added more loggingggggg.
2014-06-15 17:21:40 -07:00
c386023a6f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-16 10:18:30 +10:00
fd17c1b254
More staggered teleports on game end
...
Logging teleports.
2014-06-16 10:18:10 +10:00
6515dd13a0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-15 16:25:40 -07:00
0f7885d911
Added safety checks in ClientManager
...
Added logging and teampreference swap fix in arcade.
2014-06-15 16:25:32 -07:00
a756bb88a2
NPE log
2014-06-16 09:25:14 +10:00
7ff3765ba4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-14 22:11:14 -07:00
9a79d0ede7
Fixed CME
...
Gadget cost fix
MapParser fix
2014-06-15 15:10:19 +10:00
04236939d6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-14 21:27:42 -07:00
26e16e8eac
Added button file.
2014-06-14 21:27:33 -07:00
264248ecfa
Added castle siege quick join menu button.
2014-06-14 21:27:21 -07:00
1bfa24cc45
Fixed Fireworks crash bug & portal destroy bug;
...
-Only livingentities bounce off portals
-Fireworks cannot be used near portals
2014-06-15 12:35:09 +10:00
d5c96f95c0
Fixed bug that gave items while respawning.
2014-06-15 12:01:58 +10:00
bac071e084
Map Parser
2014-06-15 10:12:08 +10:00
2170f743dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-06-13 08:42:57 +10:00
7517c0cabc
merge
2014-06-13 08:40:01 +10:00
336c307732
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-12 08:03:02 -07:00
be8fea8ca9
Changed Chat API key.
...
Fixed PreferenceManager not saving asynchronously.
2014-06-12 08:02:47 -07:00
01fbda81ba
More suggested improvements; commented out getEntries method for now.
2014-06-11 02:35:44 -04:00
0be4df4531
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-11 12:14:45 +10:00
6a1ffcd3b7
Fixed some gadget stuff
2014-06-11 12:14:21 +10:00
7bdaaa8ae0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-10 16:09:48 -04:00
63f082b424
Implementing suggested code style/locking changes and recommitting (JIRA-76)
2014-06-10 16:09:33 -04:00
d82396d59b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-10 02:06:22 -05:00
4fca244812
Made ItemGadgets Free.
...
Removed queue dom shop.
2014-06-10 02:00:53 -05:00
661a869116
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-06-10 13:02:17 +10:00
7fc2fbe564
Scoreboard Refactor
2014-06-10 12:51:47 +10:00
Chiss
CoderTim
Shaun Bennett
Jonathan Williams
Ty
Peter Miller
Mini-Chiss