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 |
|