60a6a81587
faster cleanup
2015-11-14 13:03:41 +11:00
9518b64e3c
clean up snowballs
2015-11-14 12:55:43 +11:00
259397b6ae
READY 2 GO
2015-11-14 12:52:14 +11:00
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
5586132429
champions balance
2015-11-14 11:05:51 +11:00
016e54977d
- Finish game [FINALLY]
2015-11-12 21:16:58 -05:00
bc1b185f0e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-12 02:44:54 -05:00
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
37fdf53a51
Fixed champion's Illusion crash
2015-11-11 00:21:28 +13:00
d654f1f4b1
- Fixed class edit in lobbies
...
- Fixed conflict between rave suit and assassin
2015-11-10 06:17:25 -05:00
fafc92606c
Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
2015-11-06 18:43:11 -05:00
87d7ff8a8f
- Synced up expire times for proximity weapons
2015-11-05 02:21:36 -05:00
61653347c7
- Fixed proximity weapons not being able to detonate
2015-11-05 02:11:20 -05:00
9c49ab0408
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-05 01:23:40 -05:00
3de906ab19
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
2015-11-03 14:57:25 +13:00
c4e93180fa
Merge branch 'master' into smash-champs-balance
2015-10-30 13:00:30 +11:00
0be51d5629
- Even more bugfixes
2015-10-29 16:48:51 -04:00
12319169a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java
2015-10-18 00:54:18 -04:00
3dda9352e7
Progress
2015-10-16 13:32:23 +13:00
4205dc6c25
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-15 12:34:34 +13:00
86bad0be30
mods can check other players skills
2015-10-14 14:34:30 +11:00
58a86c5abb
That's the easy stuff done..
2015-10-13 19:49:15 +13:00
e1d8b25e91
- Fix misc champs bugs
2015-10-13 01:24:57 -04:00
3e5ac58ae9
helpers!
2015-10-13 11:23:00 +11:00
37639a413c
fixed skill stuff
2015-10-13 11:22:10 +11:00
f497eab633
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-10-12 17:54:11 -04:00
be96842de5
Ultra
2015-10-12 17:02:34 -04:00
6a173073a4
added flag to projectiles
...
work on cow kit
2015-10-12 14:39:14 +11:00
83d1e011fc
Changes.
2015-10-10 23:33:54 -04:00
72d943f51b
Restored skills to pre-eula ultra
2015-10-10 16:20:28 -04:00
cdb9741438
Changed the SG icon in hub, fixed EULA breaking thing in Class Shop
2015-10-08 20:36:16 -04:00
7c04e5608d
- Added new achievement 'Clutch'
...
- Made new achievements needed for achievement skills
2015-09-25 04:17:20 -04:00
d9142ac33f
smash balance
2015-09-14 12:34:55 +10:00
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
16a8164030
Fixing last bugs and disabling coin bombs while diguised.
2015-08-06 08:42:09 +02:00
2f571aed25
fixed bugs from my vel fixes, WHOOPS. normalisation :(
2015-08-03 18:19:31 +02:00
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
c9c3db70f3
Merge branch 'SSM2PlayerTeams'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-07-29 14:08:17 +02:00
d3fede790a
Merge pull request #17 in MIN/mineplex from MinorTweaks to master
...
* commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a':
Fixed report link
http://pastebin.com/BRhT7pZP
Reverted things
Reverted Trainee to Helper due to popular demand.
LOTS of tweaks :D
Cleaned up somethings (lib's request)
I'm a dumbass
Fixed a few achievements
Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-25 03:37:28 -05:00
e4ecc9e858
http://pastebin.com/BRhT7pZP
2015-07-22 23:31:07 -04:00
eff71c3e17
Champions: Add Morten G's changes to fix BlockToss
2015-07-22 08:10:57 +12:00
d38fc1a603
Reverted things
2015-07-20 16:40:37 -04:00
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
558b71f866
fixed thigny
2015-07-17 11:48:14 +10:00
478a3c8591
some champs fixes/balance
...
duplicate message improvement
2015-06-20 15:00:16 +10:00
40d56c3500
Converted all code to updated UtilParticle methods
...
/suicide
2015-05-03 16:37:00 -05:00
45b801ba81
hitbox changes
2015-04-27 19:21:33 -05:00
c73a6ae62f
champs balance
2015-04-19 13:49:46 +10:00
f4a91455f6
Champions Balance
2015-04-19 12:22:51 +10:00
f7ef44b007
More hitbox nerfs
2015-04-14 16:43:02 +10:00
Cheese
AlexTheCoder
libraryaddict
Mysticate
Jonathan Williams
Sarah
Mini-Chiss