JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,895 Commits 1 Branch 0 Tags 481 MiB
8803941bd8
Commit Graph

1349 Commits

Author SHA1 Message Date
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
e3eae200ae arcade: fixed kit material NPE 
SSM: added knight
SSM: added placeholder for wither skel
 2013-09-04 11:55:19 +10: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
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
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
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
Chiss
789a26471d smash stats Perk 2013-09-02 09:51:53 +10:00
Jonathan Williams
3041cacb26 Renamed disguise methods to lowercase. 2013-09-01 16:38:32 -07:00
Chiss
668a6e4854 changed utilplayer health method to double 
spleef eventhandelr removal
turf forts kit green/blue
added kit stats for smash
nerfed flap in smash
 2013-09-02 09:35:04 +10:00
Chiss
9149cc565e Hub turns off flight (people were staying in flying somehow) 
Spleef block damage fix
Smash kit balances
 2013-09-02 08:16:35 +10:00
Chiss
07dcfeb266 Compass in smash 
can break windows in OITQ
block toss cannot dig tunnels, or take from walls.
chicken missile fixes
remove fire ticks from players on respawn
 2013-09-01 12:18:48 +10:00
Chiss
72bec77237 Queueing now works with less players than teams. 
Added DragonName text-input for hub
Fixed smash bug, where spectators were causing lightning effect
 2013-09-01 08:34:53 +10:00
Chiss
dab3f33cbf Hub text changes 
Hub animal spawns
Hub spawn invisibility
Smash kit balances
 2013-08-31 18:19:23 +10:00
Chiss
6ee2e427b5 Changed TeamEntity from Creature to LivingEntity 2013-08-31 13:58:40 +10:00
Chiss
fb592640a1 Fixed various merge errors. 
(Updates)
 2013-08-31 13:47:48 +10:00
Chiss
81f8503180 Merge commit '13110356aabbcc69d83ce29d8f9e5bec27812009' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitMarksman.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitPyrotechnic.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitDefenceArcher.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitHorseKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanElementalist.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanMarksman.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorArcher.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
 2013-08-31 13:41:58 +10:00
Chiss
e17368a9ac >.< Updates 2013-08-31 13:15:16 +10:00
Jonathan Williams
13110356aa Added Enjin Translator poll ability. 
Fixed up kits for arcade.
Fixed disguise for enderman to not teleport on fire ticks.
 2013-08-30 16:37:21 -07:00
Chiss
7dbfe9d0dc Moremissing stuff. 2013-08-29 16:20:36 +10:00
Chiss
aad017690e FIREFLY 2013-08-29 16:17:52 +10:00
Chiss
a198d0d3cb Added events... 2013-08-29 16:16:22 +10:00
Chiss
8559e77a24 "UPDATES!"loooooooool 2013-08-29 16:13:05 +10:00
Jonathan Williams
a1d622c790 Tweaked disguise movement to cut out jitters. 2013-08-28 15:00:39 -07:00
Jonathan Williams
1b7b549647 Removed class files from source control. 2013-08-27 16:21:57 -07:00
Jonathan Williams
3fb52c5c71 Initial Commit 2013-08-27 08:14:08 -07:00