e8725b38ab
Colorize the messages for when a /game start fails
2015-09-25 14:06:35 +12:00
21d9f5767e
CustomTagFix support changing and removing of names.
2015-09-04 19:23:33 +12:00
64b9cd201c
snake crap
2015-08-29 16:02:14 -07:00
6ae801314c
Fix spawning
2015-08-29 15:07:51 -07:00
5030ae7d57
For Chiss, may the code never break.
2015-08-29 15:03:22 -07:00
f0f9a4c674
Push it like a pushy pushy lady.
2015-08-29 13:46:09 -07:00
b7b81ecaaa
snake
2015-08-29 13:38:40 -07:00
d2bc4b8cb4
SNAAAKE
2015-08-29 13:13:04 -07:00
5d28509474
Snakes tail final location instead of rel movement
2015-08-29 12:38:19 -07:00
e7f861a6c2
Push golem changes, snakes code and rename bossability thingy
2015-08-29 12:04:53 -07:00
1f5cd624a4
Fix up iron golem, add slam attack
2015-08-28 11:42:33 -07:00
379ee9271a
Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta
...
* commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b':
Iron Wizard, fixed iron golem custom name
Push golem block shot as per request
2015-08-27 16:34:46 -05:00
9d3f125c9e
Iron Wizard, fixed iron golem custom name
2015-08-27 14:18:10 -07:00
69afefd66f
Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java
Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.
2015-08-24 20:55:29 -04:00
ba41118da7
Load boss battles properly
2015-08-25 01:58:57 +12:00
8798244351
Bosses stuff
2015-08-24 08:34:29 +12:00
a9f5197c64
Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Database/src/mineplex/database/Account.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
2015-08-22 15:18:51 -04:00
39ede2064a
Bosses game progress
2015-08-21 16:12:26 +12:00
a1ea03f74b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
...
Conflicts:
Plugins/.idea/misc.xml
Plugins/.idea/modules.xml
Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
Plugins/Mineplex.Database/src/mineplex/database/Routines.java
Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
2015-08-14 19:44:56 +12:00
80588a308b
balanaced brawler
2015-08-13 21:03:48 +02:00
a1ba2cffac
fixed needler not doing posion
2015-08-13 20:56:02 +02:00
1487692609
completely disabled team armor in arcade. avoids typing it just as game starts.
2015-08-13 12:57:30 +02:00
f3b58fe9b6
disabled team armor command in games D:
2015-08-13 12:51:57 +02:00
8476578bc0
Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
Various Fixes.
2015-08-13 01:52:16 -05:00
a308244966
Merge pull request #29 in MIN/mineplex from foo to master
...
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
minor grammar issue
remove duplicate method
manually updating something
*crosses fingers* please work!
please work...
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Fixed double-half-slabs (line 68)
remove custom level to fix merge conflicts
squirrel!
fix getting snowballs from bedrock
add jnr_dev to updaterank
fix this agaaaaain
FOOIFY IS A NOOB OKAY
fix concurrentmodificationexception
fix turfforts bug
prevent STATIONARY_LAVA from breaking in creeper smash
fix creeper smash exploding lava and bedrock
fix spleef lava issue
ishh also wanted this :P (let me know if I should remove it)
ishh wanted it...k
...
2015-08-13 01:49:00 -05:00
0ff7cee229
Merge pull request #32 in MIN/mineplex from Alex_MILKCOW to master
...
* commit 'cc24bb78d3968c0c364164fb43e19724007e3833':
Fixed Cows being able to fly if they had the Rabbit Farmer kit
Fixed new classes not appearing in repository
Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
2015-08-13 01:45:56 -05:00
d6f17c609b
carl
2015-08-12 08:58:46 +02:00
c00f9a7aaa
Merge branch 'Bonus'
2015-08-12 08:39:31 +02:00
be699558f1
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-12 08:38:18 +02:00
af19754bcd
Implementing Carl to Arcade.
2015-08-12 08:37:54 +02:00
7cda53cb28
carl spinner in arcade/
...
tutorial fixes
2015-08-12 08:36:21 +02:00
ddc663cc75
remove duplicate method
2015-08-11 09:52:04 -07:00
10f979772b
Merge remote-tracking branch 'origin/master' into foo
2015-08-11 09:51:13 -07:00
18843c2cc6
Merge branch 'Bonus'
2015-08-11 17:05:59 +02:00
89dab7ec85
some little fixes
2015-08-11 16:33:32 +02:00
cfcfbbed3b
removed double gem
2015-08-11 13:34:32 +02:00
b348c62a3f
Merge branch 'EventGameUpdates'
2015-08-11 13:01:33 +02:00
fe153bee11
Fix revert issues
2015-08-11 03:19:27 -05:00
2c30d20cb1
changing OP method, setHost permissions and /e command.
2015-08-11 09:26:01 +02:00
d457e3a955
changing the setOP Event.
2015-08-11 08:36:39 +02:00
fef269b856
Fixing /e set.
2015-08-10 17:28:27 +02:00
b8b19ed4a5
Merge remote-tracking branch 'remotes/origin/master' into Bonus
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-08-10 03:24:59 -05:00
f8a6a25b46
Various Fixes.
...
• Merged w/ master
• Changed to William's method of Projectile limiting.
- Prevented TNT hitting Teammates
• Fixed gem count for Sniper
• Added gems for direct hits + TNT Thrown
• Removed assists counting for kills in 6 kill.
2015-08-09 15:01:27 -04:00
ee65c72e86
and wizards!
2015-08-09 18:46:02 +02:00
fdfc9ae99d
longer games wont announce stay msgs
2015-08-09 18:17:29 +02:00
ac5ff08fad
Git fix
2015-08-09 17:23:38 +02:00
0d70fb6b96
removing deop of Admins and adding OP condition to setHost.
2015-08-09 16:55:10 +02:00
090c1f135d
Merge branch 'SarahsAwesomeBugFixes'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
2015-08-07 21:48:35 +02:00
b22706e649
hub update part 1
2015-08-07 21:45:38 +02:00
181b778a9c
Fixing some bugs and disallow MPS while disguised.
2015-08-07 07:39:40 +02:00
libraryaddict
Mini-Chiss
libraryaddict
Ty Sayers
Jonathan Williams
Sarah
fooify
Shaun Bennett
Mysticate