4e43a2ca73
Extended range of snake parkour, ensuring people tp back to it when they fall.
2014-08-27 15:19:08 +10:00
9439daa852
Fixed bug where spectators could trigger anti-cheat in bridges
2014-08-27 15:16:20 +10:00
d9ef5f50be
disabled minestrike
2014-08-27 14:23:31 +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
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
Chiss
CoderTim
Shaun Bennett
Jonathan Williams
Ty