Commit Graph

97 Commits

Author SHA1 Message Date
Cheese
6ed3f93df7 fixed some scoreboard stuff 2015-07-17 16:17:01 +10:00
Cheese
44102842c9 added some velocity debug 2015-07-17 13:27:55 +10:00
libraryaddict
8cf10afb1b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-06-06 18:31:08 +12:00
Cheese
f9b49caeed More gems for bridges/sg kills
Changed Al'Jaha MS name to Bombers
Added Reporting functionality to Builders
Nerfed Iron Hook
Allowed longer AFk during games
2015-06-05 12:21:20 +10:00
libraryaddict
3a6c030f01 ConditionManager: Use a scheduler if the potion effect is being removed due to potion effect's doing something 2015-06-04 16:01:52 +12:00
Mini-Chiss
643ed2c047 Fixed most enchants not working
added commands to event
minor update to snowfight to make it more fun
2015-05-11 19:55:26 -05:00
libraryaddict
12b3a582b2 CustomExplosion: Fixed loop, added max damage 2015-04-12 23:21:19 +12:00
libraryaddict
81aeff86bf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 2015-04-12 20:15:28 +12:00
Cheese
d290078790 Damage multipliers now effect damage modifiers - this also fixes a bug! 2015-04-11 16:33:18 +10:00
libraryaddict
afa372dca7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
Conflicts:
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellButton.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLightningStrike.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSpeedBoost.java
2015-04-11 12:20:29 +12:00
libraryaddict
2d59bb4010 CustomExplosion: Added option to limit falling blocks that spawn, removed 'Reason' to prevent CustomDamageEvent from using a mod instead of initialDamage (wtf?) 2015-04-11 12:12:47 +12:00
libraryaddict
290767c58d CustomExplosion: Added method to change to customdamage, added method to change the block damage differently from the entity damage 2015-04-03 19:36:47 +13:00
Cheese
d4e8c0c9a6 Added Respawn middle screen text
Added Champs capture point mid screen text
Fixed hitbox mults for projectiles
Fixed inconsistent arrow damage
Lots of Champions balance
2015-04-03 15:28:10 +11:00
Cheese
8bd883cb26 fixed damage transfer for mama pigglez kit 2015-04-01 17:43:46 +11:00
libraryaddict
b84756ef7a Revert wizard commits 2015-03-27 22:13:50 +13:00
libraryaddict
d3e37d4578 CustomExplosion & explosion/Explosion.java: Add option to use falling block explosions on CustomExplosion by option in Explosion to only spawn falling blocks, not remove blocks so that CustomExplosion can handle that 2015-03-25 20:32:03 +13:00
libraryaddict
2d4dcdbd8e CustomExplosion: Add method to change block explosion size separately 2015-03-25 19:26:25 +13:00
libraryaddict
1f0e204eb3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
2015-03-18 00:04:41 +13:00
libraryaddict
41469b198a Change wizards spells to use conditions for potion effects 2015-03-17 18:07:43 +13:00
libraryaddict
03d77abed3 Don't allow people holding gold ingots to deal a lot of damage 2015-03-17 17:49:10 +13:00
libraryaddict
f4b6a53adb Add Wither to ConditionFactory 2015-03-15 12:36:18 +13:00
Cheese
c5d48a82a3 Fixed invisibility bug 2015-03-13 11:34:45 +11:00
Cheese
3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11:00
Shaun Bennett
efce714375 DEVP-66 Refactor commonly used classes to Java conventions
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
libraryaddict
53bb67ec4f Magic missile nerfed to no cooldown decrease, nerfed rumble dmg, nerfed lance multihits 2015-02-21 20:41:07 +13:00
Mini-Chiss
26463ba75d Treasure changes :O 2015-02-09 20:24:20 +13:00
libraryaddict
76e6b7530f Meteors now explode everything on contact. Added spellbook for spectators and pregame. Mana cost now obvious when cooling down. Lowered some random item amounts 2015-01-26 09:09:46 +13:00
libraryaddict
c5b444ae6e Wizards push 2015-01-23 21:52:03 +13:00
libraryaddict
dd2418232c Wizards progress 2015-01-21 19:00:07 +13:00
libraryaddict
611d184024 Cleanup code, add custom explosion, add lance and traprune spell 2015-01-18 21:23:47 +13:00
Chiss
f961fd0233 Merge remote-tracking branch 'remotes/origin/searchanddestroy'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-12-23 15:09:58 +11:00
Chiss
ec8e1f0546 more MPS stuff
fixed bridges exploit
2014-12-22 16:31:13 +11:00
Chiss
eba54c6b8a Removed hub snake parkour 2014-12-22 10:21:58 +11:00
Chiss
184c6cb4ba added func to change attackreason for combatmanager 2014-12-19 13:59:18 +11:00
libraryaddict
6d7a71d043 Modifications for SnD test 2014-12-16 15:14:07 +13:00
Jonathan Williams
625d517058 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-08 00:55:43 -08:00
Jonathan Williams
342c44affc Fixed a bunch of clans bugs 2014-12-08 00:55:20 -08:00
Chiss
ef8e5104f1 SnD Kits
minor bug fixes
2014-12-08 17:28:18 +11:00
Jonathan Williams
abaf9f4693 Refactored IRelation method names
Added support for negative amounts in Support server.

Clans in core testing state.
2014-12-03 13:06:50 -08:00
Jonathan Williams
df76f6be10 More work on Clans. 2014-11-15 01:13:14 -08:00
Jonathan Williams
1372f74921 Refactored some names in MiniPlugin
Work on clans.
2014-11-12 19:21:12 -08:00
Chiss
aa45f031ac 3 new achievement Kits
SSM Balance patch
Champs balance
tons of bug fixes
2014-10-31 10:35:47 +11:00
CoderTim
cd5e4234b7 Fixed a couple more achievement bugs
Track damage mods in combat log
2014-10-27 19:00:34 -04:00
CoderTim
2a18888922 Improved NpcManager to work with persistent maps 2014-10-14 22:22:17 -04:00
CoderTim
3ba748f2de Merge branch 'feature/currency-log' 2014-10-13 23:13:44 -04:00
Chiss
9cc28d1ad8 MAC Update 2014-10-12 14:19:35 +11:00
Chiss
e2c72a3ae2 HH update 2014-10-11 14:28:00 +11:00
CoderTim
f6f484c134 Refactored /npc commands 2014-10-02 22:08:00 -04:00
Shaun Bennett
e7f79aa5bf Update IntelliJ files for latest changes 2014-09-03 11:42:50 -05:00
Jonathan Williams
a4871b5509 Updated to latest spigot with 1.8 support.
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
2014-09-03 03:46:24 -07:00