JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
110 Commits 1 Branch 0 Tags 481 MiB
4b1d6756e2
Commit Graph

110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Williams
4b1d6756e2 Added missing PlayerCount project. 2013-09-05 02:12:12 -07:00
Jonathan Williams
22ee1522c1 Added DynamicServer for bungee. 
Added reload commands for balancer, dynamicserver, playercount.
Added depends for lboby on dynamic server.
 2013-09-05 02:11:47 -07:00
Jonathan Williams
9121d429c2 Added armor show/hide for insentient disguises. 2013-09-04 19:56:43 -07:00
Jonathan Williams
97405f6cfa Fixed NPE in SkillPage 
Added some timing debug text // for now
Changed utiltext setting method.
 2013-09-04 18:52:08 -07:00
Chiss
f29b844798 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
resolved
 2013-09-05 07:50:13 +10:00
Chiss
87fa103711 WHITE SPACE CHANGES! 2013-09-05 07:44:53 +10:00
Jonathan Williams
34dd5a1af3 Added broadcast command. 
Added Chat to hub.
Disabled /me
Fixed Pets not returning when pushed off into the void.
Prevented eggs from spawning in hub.
 2013-09-04 11:35:59 -07:00
Jonathan Williams
55b6bd6e95 Fixed memory leaks in SSM kits. 2013-09-04 10:46:33 -07:00
Jonathan Williams
552675b1bf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-04 10:36:13 -07:00
Chiss
010336983a SSM: fixed fissure not working 
Hub: fixed invisibility for tutorial players (others could still see them and throw em)
 2013-09-04 18:03:01 +10:00
Jonathan Williams
2a2c48087f Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-03 23:31:44 -07:00
Jonathan Williams
d5ef0208a1 Added lag meter to hub and arcade. 2013-09-03 23:31:29 -07:00
Chiss
93e59c1c43 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 
Conflicts:
	Plugins/Libraries/craftbukkit.jar
 2013-09-04 16:13:12 +10:00
Chiss
ca6131d1d5 SSM Minor patches 2013-09-04 16:11:50 +10:00
Chiss
48c4ca0e24 SSM minor changes 2013-09-04 15:40:02 +10:00
Jonathan Williams
37897037a3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-03 20:46:48 -07:00
Jonathan Williams
63b4776893 Garrrr, fixed craftbukkit building. 2013-09-03 20:43:32 -07:00
Chiss
f07c23b99b Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-04 11:57:36 +10:00
Chiss
e3eae200ae arcade: fixed kit material NPE 
SSM: added knight
SSM: added placeholder for wither skel
 2013-09-04 11:55:19 +10:00
Jonathan Williams
e63b4b8d66 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-03 17:30:25 -07:00
Jonathan Williams
5a30173aba Updated craftbukkit. 2013-09-03 17:29:50 -07:00
Chiss
23ac045a41 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-04 08:14:20 +10:00
Chiss
6b57a87285 SSM Kit Item Lore 2013-09-04 08:13:59 +10:00
Jonathan Williams
346bdb030e Cleaned warning. 
Fixed punish command on web side.
 2013-09-03 14:10:14 -07:00
Jonathan Williams
c2ec238af5 Fixed kit purchase in SuperSmashMobs 2013-09-03 12:13:15 -07:00
Jonathan Williams
b894aea72a Fixed login speeds. 
Implemented Tasks for Tutorial
Removed compiled files for website.
 2013-09-03 11:34:28 -07:00
Jonathan Williams
cec476c72d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-03 08:52:20 -07:00
Jonathan Williams
d16b674f46 Memory cleanup (Recharge, ClassCombatShop) 
Implemented Tasks.
 2013-09-03 08:51:44 -07:00
Chiss
564c1720bd SSM Balances 2013-09-03 19:18:56 +10:00
Chiss
83567fce50 SSM slime nerf 
disguise 0 velocity packet fix
 2013-09-03 10:47:15 +10:00
Chiss
f2a58ab029 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-03 10:17:06 +10:00
Chiss
835d78e0e7 added hub tutorial 2013-09-03 10:16:44 +10:00
Jonathan Williams
74dba53e32 Fixed ignore update. 2013-09-02 16:24:04 -07:00
Jonathan Williams
5aec6509ca Fixed shop inventory loss bug. 
Added IgnoreUpdate.dat file check for testing with FileUPdater.
Fixed bug in SkillPage
Fixed bug in ClassCombatShop
Disabled dragon spawning in hub.
 2013-09-02 16:20:14 -07:00
Jonathan Williams
59f2b9ebc8 Memory cleanup with all MiniPlugins. 
Added Dragon.
Cleanup memory with Class Restore
 2013-09-02 05:37:33 -07:00
Jonathan Williams
66131ad0b0 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-02 04:20:18 -07:00
Jonathan Williams
8840f04977 Fixed FileUpdater. 
Added FileUpdater to DOM and Arcade.
 2013-09-02 04:19:56 -07:00
Chiss
ad26c519ba Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-02 18:45:31 +10:00
Chiss
45d28569e0 Added idle fix 
fixed hub Dragon.java
ate the rabbit stew.
 2013-09-02 18:45:12 +10:00
Jonathan Williams
d0098b8a46 Removed double jump effect for surrounding players in hub. 
Disabled Dragon spawning in HubManager.java(pending fix)
Fixed priority on MOTD for FileUPdater.
 2013-09-02 01:16:29 -07:00
Jonathan Williams
af7a41ae71 Implemented ServerRestart event on FileUpdate check. 
Implemented cancels in arcade/dom/mk
Implemented Restart updates in server manager page.

Implemented lobby removal is restarting.
 2013-09-02 01:09:28 -07:00
Jonathan Williams
43c3f8cc87 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-01 23:28:22 -07:00
Jonathan Williams
63d2563f92 Added Disguise hurt sounds. 
Enabled disguised hurt sounds in DamageManager
 2013-09-01 23:28:07 -07:00
Chiss
441e6d80b7 lobby kit disguises :D 
slime NPE fix
 2013-09-02 16:01:14 +10:00
Chiss
ee20174d80 lobby adv messagfe 2013-09-02 15:47:08 +10:00
Chiss
d5fd95c53b Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-02 15:07:27 +10:00
Chiss
98b285d819 turf forts self kill fix. 2013-09-02 15:07:07 +10:00
Jonathan Williams
a49f67b33c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-01 22:06:35 -07:00
Jonathan Williams
f0b0c72ddb Fixed arcade packethandler problem. 
Fixed skill page issue for class combat.
 2013-09-01 22:06:20 -07:00
Chiss
c483d869a5 Added SSM Spider and Squid Kit 
prepared DamageManager.java for disguise sounds
minor SSM balance changes
fixed compass targetting self.
 2013-09-02 14:40:06 +10:00