JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,342 Commits 1 Branch 0 Tags 481 MiB
905d4db6f1
Commit Graph

432 Commits

Author SHA1 Message Date
Shaun Bennett
905d4db6f1 Use emerald instead of bed 2014-08-25 21:32:30 -05:00
Shaun Bennett
2e0b074053 More achievement gui changes 2014-08-25 20:56:21 -05:00
Chiss
07ee44508e Missing Gadgets 2014-08-26 08:17:41 +10:00
Chiss
0e3cf67402 Some new cosmetics 2014-08-25 12:59:29 +10:00
Chiss
13eb3da0fa Achievment gui changes 2014-08-25 09:26:01 +10:00
Shaun Bennett
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
Shaun Bennett
2cb87b23e6 Stat Gui, Start of Treasure Gui (disabled) 2014-08-24 16:08:19 -05:00
Chiss
642f8b46b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 18:01:35 +10:00
Chiss
af9bf0727a Fixed damage taken stat NPE 
Added tournament team auto-rejoin
 2014-08-23 17:55:28 +10:00
Jonathan Williams
fd0c4745f8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-23 00:40:17 -05:00
Jonathan Williams
931cb5ece8 Removed MineKart code. 
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
 2014-08-23 00:40:07 -05:00
Chiss
0700b9df12 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 15:04:55 +10:00
Chiss
3ec43f90e8 GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements 2014-08-23 15:04:43 +10:00
Jonathan Williams
a84468157c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 18:21:38 -05:00
Jonathan Williams
ebb4c44bdc Tweaked player disguise. 2014-08-22 18:21:23 -05:00
Chiss
9fad775f73 More cosmetics 2014-08-23 07:50:07 +10:00
Chiss
11597285b8 Changed so it music will never be 'active'. 2014-08-23 05:36:57 +10:00
Chiss
2e031f1e4a Added Music Gadget 2014-08-23 05:35:07 +10:00
Jonathan Williams
b67b2f04b7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 13:32:50 -05:00
Jonathan Williams
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
Chiss
a159f04d50 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 04:30:52 +10:00
Chiss
231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10:00
Jonathan Williams
83b3e49151 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 10:48:27 -05:00
Jonathan Williams
70217fe957 Finished first release of Customer Support plugin. 2014-08-22 10:47:46 -05:00
Chiss
0022586e3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-22 17:08:29 +10:00
Chiss
97c087a28d Allowed commands to specify specific ranks 
allowed youtube/build to start/set games
 2014-08-22 17:05:14 +10:00
Jonathan Williams
99d15d3ece Work on Customer support server. 2014-08-21 15:55:09 -05:00
Jonathan Williams
830eeca835 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-20 20:14:32 -05:00
Chiss
60869d114e Dragon Escape changes 2014-08-20 15:45:10 +10:00
Jonathan Williams
217ab51b40 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 22:24:16 -05:00
Shaun Bennett
a7bb84be0b Revert chris' revert 2014-08-19 21:24:49 -05:00
Jonathan Williams
24f984a365 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 21:37:11 -04:00
Jonathan Williams
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
Chiss
94e5eb03da Fixed errors for new getPlayers method. 2014-08-20 10:43:56 +10:00
Shaun Bennett
e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
Jonathan Williams
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
Shaun Bennett
43fd604695 Queue up polls for players instead of constantly checking for next poll 2014-08-17 17:47:38 -05:00
Jonathan Williams
8aec9e345e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-16 01:37:17 -05:00
Jonathan Williams
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
Chiss
d8123795aa changed the way disguises show rank. 2014-08-16 16:33:18 +10:00
Chiss
a888d4f14b Fixed leaks 2014-08-16 15:39:02 +10:00
Ty
3c4c537998 Fix issue where broken Jedis instances were returned as functional instances. 2014-08-15 14:49:01 -04:00
Chiss
697897b967 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-15 09:49:12 +10:00
Chiss
85522cddca Debug (will clean once fixed) 
Game stats
 2014-08-15 09:49:00 +10:00
Jonathan Williams
846c75453c Revamping Redis Server status so it uses a consistent time value from redis database. 2014-08-14 07:41:04 -05:00
Jonathan Williams
cacf736f4f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-14 04:10:21 -05:00
Jonathan Williams
682735e994 Added build fixes for ServerMonitor.java 
Added redis fixes for ServerMonitor
Added ServerStatusManager fixes.
 2014-08-14 04:10:11 -05:00
Chiss
74435bac12 fixed bug where players kept inventory open, to be able to enable morphs ingame. 2014-08-14 17:31:14 +10:00
Chiss
c72f4b6057 Dragon target cancel fix 2014-08-14 12:35:49 +10:00
Chiss
b21ae8ef72 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-14 10:32:52 +10:00