JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,531 Commits 1 Branch 0 Tags 481 MiB
16e9263874
Commit Graph

10231 Commits

Author SHA1 Message Date
Jonathan Williams
c0198b1b1f Fixed vegetate...derp. 2013-08-31 01:36:40 -07:00
Jonathan Williams
0f4facd407 whitespace gone. 2013-08-31 01:29:52 -07:00
Jonathan Williams
e530e3b5a8 Fix for npc vegetate. 2013-08-31 01:29:32 -07:00
Chiss
e18239f89a Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-08-31 18:19:55 +10:00
Chiss
dab3f33cbf Hub text changes 
Hub animal spawns
Hub spawn invisibility
Smash kit balances
 2013-08-31 18:19:23 +10:00
Jonathan Williams
50ea1867e9 Added slime vegetate. 
Fixed dominate changes.
 2013-08-31 01:16:39 -07:00
Jonathan Williams
68b7e0e3fa Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-08-30 20:59:23 -07:00
Chiss
6ee2e427b5 Changed TeamEntity from Creature to LivingEntity 2013-08-31 13:58:40 +10:00
Jonathan Williams
63b3cf501f Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-08-30 20:58:27 -07:00
Jonathan Williams
0f7828092c Added missing craftbukkit files. 2013-08-30 20:57:46 -07: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
Jonathan Williams
da08321de4 Added possible second option for pulling purchases to Enjin plugin. 2013-08-30 09:45:25 -07:00
Jonathan Williams
6302869c02 Fixed up lobby balancer. 2013-08-30 02:24:39 -07:00
Jonathan Williams
90de0c3ed2 Added LobbyBalancer for BungeeCord 
Added EnjinTranslator for automatic shop.
Removed enjin module from Hub
Tweaked donation/punish/accountadministrator for shop automation.
 2013-08-30 01:36:55 -07:00
Jonathan Williams
bb2af17856 Cleaned up files. 2013-08-30 01:26:12 -07:00
Jonathan Williams
57d1d8058c DOM-12 2013-08-29 10:04:39 -07:00
Jonathan Williams
606f631559 Fixed up MK 2013-08-28 23:21:59 -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
873c32c359 Added missing files. 2013-08-28 22:57:27 -07:00
Jonathan Williams
b638957517 Removed more class files. 
Fixed DOM-22, DOM-20, DOM-19, DOM-17, DOM-14, DOM-7, DOM-3, DOM-1
 2013-08-28 22:26:40 -07:00
Jonathan Williams
a1d622c790 Tweaked disguise movement to cut out jitters. 2013-08-28 15:00:39 -07:00
Jonathan Williams
cb48c2a037 Test for git push. 2013-08-27 16:47:58 -07:00
Jonathan Williams
1b7b549647 Removed class files from source control. 2013-08-27 16:21:57 -07:00
Jonathan Williams
c9dd8d87eb Fixed DOm crash issue on game start. 
Added Teleport to Hub
Fixed DisguiseManager bleeding over.
Fixed Teleport sub commands
 2013-08-27 16:03:04 -07:00
Jonathan Williams
3fb52c5c71 Initial Commit 2013-08-27 08:14:08 -07:00