Commit Graph

265 Commits

Author SHA1 Message Date
Mysticate
5e7ddb968e Changes and bug fixes. 2015-10-10 15:54:18 -04:00
Mysticate
ff1431b652 Fixed players glitching to chests before game starts. 2015-10-09 10:21:35 -04:00
Mysticate
9254ca9162 K reverted + fixed bug 2015-10-08 21:12:38 -04:00
Mysticate
2cace7419f Made Destructor sexi 2015-10-08 20:42:29 -04:00
Mysticate
ebd3fbe6d5 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-28 20:19:27 -06:00
Mysticate
571d992dbe Fixed a few bugs. 2015-08-27 20:47:55 -06:00
Mysticate
2659dd4e39 Fixed minor bugs. Head now follows mob altitude. 2015-08-14 23:17:56 -04:00
Mini-Chiss
80588a308b balanaced brawler 2015-08-13 21:03:48 +02:00
Mini-Chiss
a1ba2cffac fixed needler not doing posion 2015-08-13 20:56:02 +02:00
Jonathan Williams
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
Jonathan Williams
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
Mysticate
ed7dbddf4a Redid how kits are done. 2015-08-13 00:12:28 -04:00
Mysticate
ad94b63903 Blaze and Enderman now take water damage. 2015-08-12 10:46:12 -04:00
fooify
10f979772b Merge remote-tracking branch 'origin/master' into foo 2015-08-11 09:51:13 -07:00
Mysticate
bd414cd231 Merge remote-tracking branch 'origin/master' into Myst_EVO
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
2015-08-10 19:47:53 -04:00
Mysticate
a9350bfacd Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-07 11:58:53 -04:00
AlexTheCoder
a86fdc3c21 Fixed new classes not appearing in repository 2015-08-03 18:45:16 -04:00
AlexTheCoder
b53b98d6e3 Milk The Cow:
New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost

New Perk - Steady Hands:
- Lowers the amount of milk lost by a dead player to 3
- Removes losing milk in farmer's bucket when a cow charges into them

New Kit - Sturdy Farmhand:
- Iron skin damage reduction of 2.0
- Implements Steady Hands perk
- 2000 gems
2015-08-03 18:30:42 -04:00
Mini-Chiss
2d07cc571c reduced invis in OITQ 2015-08-03 18:53:00 +02:00
Mini-Chiss
2f571aed25 fixed bugs from my vel fixes, WHOOPS. normalisation :( 2015-08-03 18:19:31 +02:00
Mini-Chiss
0a84bd69d8 fixed some OITQ stuff 2015-08-02 23:17:23 +02:00
Mini-Chiss
4cc810f1c0 Merge branch 'Myst_KITS' 2015-08-02 17:55:53 +02:00
Mini-Chiss
afc41c8831 converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity 2015-08-02 11:50:26 +02:00
Mysticate
53a3a29cd2 Extreme revisions. Cheers! 2015-07-31 00:50:32 -06:00
Mini-Chiss
8ef93c0b33 Merge branch 'SSM2PlayerTeams' 2015-07-30 08:42:50 +02:00
Sarah
bf75594853 Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-30 02:33:51 +02:00
Sarah
de4d0a7dc3 Fixing needler, projectiles in SW and "Banannas...". 2015-07-30 02:33:06 +02:00
fooify
5da23fa322 Merge branch 'foo' of http://Fooify@184.154.0.242:7990/scm/min/mineplex.git into foo 2015-07-29 14:13:07 -07:00
Mini-Chiss
71bedbe0fc Merge branch 'WitherAssaultUpdate' 2015-07-29 16:37:29 +02:00
Morten
1a27dea32c Why was these not added... 2015-07-29 16:35:57 +02:00
Mini-Chiss
d570cce1b0 Merge branch 'WitherAssaultUpdate' 2015-07-29 16:33:06 +02:00
Morten
b5d3ad0e0d Adding perks 2015-07-29 16:05:43 +02:00
Jonathan Williams
10549601f8 Merge pull request #21 in MIN/mineplex from Myst_LOBBERS to master
* commit 'd0a45461d07904f70b5e42dee391f69843fb3978':
  Fixed bug with direct hit
  Final tweaks. this is as good as it's goign to get! ;d
  Tweaks
  Fixed waller achievement thing
  Fixed waller kit bc I was stupid before ;c
  Added an exception for a map to make it night.
  Various improvements.
  Added an achievement, removed team one, touched up another. Swag.
2015-07-29 00:15:41 -05:00
Mysticate
99946ef1f3 Tweaks 2015-07-28 17:29:51 -06:00
Mysticate
0e00086b9e Redid evolution! 2015-07-28 00:15:41 -04:00
Mysticate
9a3c4f3a00 Added Ninja Kit to OITQ. New Achievement kit. 2015-07-23 17:46:10 -04:00
Mysticate
e4ecc9e858 http://pastebin.com/BRhT7pZP 2015-07-22 23:31:07 -04:00
Mysticate
6addf00037 LOTS of tweaks :D 2015-07-20 14:27:10 -04:00
fooify
d1e4306684 fix this agaaaaain 2015-07-01 16:38:10 -07:00
fooify
04c863c0eb FOOIFY IS A NOOB OKAY 2015-07-01 16:10:41 -07:00
fooify
4495468c7f fix concurrentmodificationexception 2015-07-01 15:50:07 -07:00
fooify
b7476cec5e prevent STATIONARY_LAVA from breaking in creeper smash 2015-07-01 08:25:17 -07:00
fooify
6dc7384c82 fix creeper smash exploding lava and bedrock 2015-07-01 08:16:14 -07:00
fooify
4ff456b722 Merge remote-tracking branch 'origin/master' into foo 2015-06-29 11:29:22 -07:00
Cheese
ead402d026 skywars art 2015-06-28 14:31:25 +10:00
Cheese
840ebabf2a added delay on mad scientist eggSpawn
fixed Exp bug
2015-06-27 20:39:05 +10:00
Cheese
754026f403 chicken teleport fix
scientist minion name fix
2015-06-27 12:18:12 +10:00
fooify
333c54cff9 Merge branch 'master' into foo 2015-06-26 10:07:13 -07:00
Cheese
027efe02fc skywars! 2015-06-26 16:38:44 +10:00
Cheese
338797f4a6 skywars update 2015-06-26 15:57:47 +10:00