fooify
|
5767d4e2db
|
SSM bug fix: magma cube flame dash doesn't make player invisible
|
2015-11-14 16:08:14 -08:00 |
|
Shaun Bennett
|
f90b137ccd
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-14 16:46:03 -05:00 |
|
NewGarbo
|
e4981c7491
|
Undead camp finishing stuff
|
2015-11-14 20:30:37 +00:00 |
|
Mysticate
|
746aab7786
|
Merge remote-tracking branch 'origin/master' into Myst_KITS
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java
|
2015-11-14 14:50:48 -05:00 |
|
fooify
|
db21d627d8
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-11-14 09:13:51 -08:00 |
|
Jonathan Williams
|
daee44d262
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-14 02:01:24 -06:00 |
|
Shaun Bennett
|
9f37e3e595
|
Merge remote-tracking branch 'origin/master'
|
2015-11-14 01:46:44 -05:00 |
|
Shaun Bennett
|
2bb82da735
|
Motd update
|
2015-11-14 01:45:55 -05:00 |
|
Jonathan Williams
|
4a73bce586
|
Added gadget and projectileUser logging.
|
2015-11-14 00:36:34 -06:00 |
|
Shaun Bennett
|
487f974951
|
Clan Gui updates and code cleanup
|
2015-11-13 23:53:34 -05:00 |
|
Cheese
|
e7b86b4462
|
hub skytext
|
2015-11-14 13:05:11 +11:00 |
|
Cheese
|
60a6a81587
|
faster cleanup
|
2015-11-14 13:03:41 +11:00 |
|
Cheese
|
9518b64e3c
|
clean up snowballs
|
2015-11-14 12:55:43 +11:00 |
|
Cheese
|
259397b6ae
|
READY 2 GO
|
2015-11-14 12:52:14 +11:00 |
|
fooify
|
f9f4c2addc
|
fixed several smash bugs and one global issue
|
2015-11-13 17:28:25 -08:00 |
|
Cheese
|
770e2be44b
|
Merge branch 'master' into alex-ctf
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
|
2015-11-14 11:07:44 +11:00 |
|
Cheese
|
5586132429
|
champions balance
|
2015-11-14 11:05:51 +11:00 |
|
NewGarbo
|
8a972075da
|
Formatted WorldEventManager (seperate commit for formatting so that confusion doesn't arise in future commits)
|
2015-11-13 21:19:50 +00:00 |
|
NewGarbo
|
a0ac15dec5
|
Allowed Jr.Devs to start/clear world events.
|
2015-11-13 21:01:09 +00:00 |
|
NewGarbo
|
98be3a51a0
|
Added a Speed I effect to the UndeadWarrior and UndeadArcher creatures that spawn in the UndeadCamp world event.
|
2015-11-13 21:00:08 +00:00 |
|
NewGarbo
|
010f30f064
|
Made the alpha login message only send one (forgot to save the task manager stuff)
|
2015-11-13 20:57:33 +00:00 |
|
Shaun Bennett
|
8ba9a8f6c4
|
Fix border radius
|
2015-11-12 22:38:26 -05:00 |
|
Shaun Bennett
|
40138b6914
|
1.8 fix
|
2015-11-12 22:35:56 -05:00 |
|
Shaun Bennett
|
f3e94cc035
|
Map fix (probably broken?!)
|
2015-11-12 21:35:01 -05:00 |
|
AlexTheCoder
|
016e54977d
|
- Finish game [FINALLY]
|
2015-11-12 21:16:58 -05:00 |
|
Cheese
|
9de3981dec
|
ms update
|
2015-11-13 11:24:11 +11:00 |
|
fooify
|
a0c0f6b891
|
Slightly bumped Monster Maze jump time value
|
2015-11-12 16:19:33 -08:00 |
|
Shaun Bennett
|
bbc7bf770c
|
1.8 Fixes - Still doing map fix
|
2015-11-12 19:18:42 -05:00 |
|
Shaun Bennett
|
639d2d110f
|
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
|
2015-11-12 17:55:33 -05:00 |
|
Shaun Bennett
|
c4e188296a
|
Fix compiler and misc
|
2015-11-12 17:55:00 -05:00 |
|
Shaun Bennett
|
0b41450603
|
Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""
This reverts commit 6c17b2926c.
|
2015-11-12 17:51:13 -05:00 |
|
Cheese
|
3122397f7a
|
Merge branch 'master' into minestrike-update
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
|
2015-11-13 09:19:44 +11:00 |
|
Shaun Bennett
|
6c17b2926c
|
Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
|
2015-11-12 16:35:31 -05:00 |
|
Sarah
|
4958ce347d
|
Fixing boss not despawning bug, scoreboard end bug and some achievements.
|
2015-11-12 18:41:40 +01:00 |
|
AlexTheCoder
|
bc1b185f0e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-12 02:44:54 -05:00 |
|
AlexTheCoder
|
a8b27e66d1
|
- Finalized game to chiss and sigils' requirements minus flag status in scoreboard, will add next commit
- Fixed items ever being lost from treasurechests
|
2015-11-12 00:06:21 -05:00 |
|
fooify
|
ac4a276aff
|
fixed bridge bug "Death Bomber counts suicides as well"
|
2015-11-11 20:38:36 -08:00 |
|
fooify
|
8a0906587d
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-11-11 20:15:31 -08:00 |
|
Shaun Bennett
|
875c399c9f
|
Merge branch 'master' into clans-beta
|
2015-11-11 21:31:03 -05:00 |
|
Shaun Bennett
|
33680e829a
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-11 21:25:32 -05:00 |
|
libraryaddict
|
25f299b490
|
Fix interact types
|
2015-11-12 14:34:12 +13:00 |
|
Shaun Bennett
|
e66bebcfb1
|
Give all treaure items when opening the chest
|
2015-11-11 18:13:47 -05:00 |
|
Shaun Bennett
|
994a9e3e43
|
Clans Gui Work, commiting so I can switch branches
|
2015-11-11 18:05:48 -05:00 |
|
NewGarbo
|
ce1c09b88f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
Plugins/Libraries/craftbukkit.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
|
2015-11-11 19:35:44 +00:00 |
|
libraryaddict
|
ba7515f761
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-11-12 04:27:17 +13:00 |
|
libraryaddict
|
b915131407
|
Fix some armorstands and interaction bugs
|
2015-11-12 04:26:55 +13:00 |
|
Jonathan Williams
|
27ef2c0bbb
|
Fixed UtilEnt.Leash method.
|
2015-11-11 04:36:10 -06:00 |
|
Jonathan Williams
|
0e6146d5c9
|
Added expire to Stacker throw.
|
2015-11-11 04:32:56 -06:00 |
|
Cheese
|
3ed680e1c2
|
ms update
|
2015-11-11 15:55:48 +11:00 |
|
Cheese
|
ef2411b7d5
|
Merge branch 'master' into minestrike-update
|
2015-11-11 13:43:36 +11:00 |
|