6a29d2a2d6
adding some getters.
2015-11-21 17:01:17 +01:00
91e40d0e61
hide testing server MOTD
2015-11-21 13:37:19 +11:00
5b8191e57c
fixed kick history stack direction
2015-11-21 11:42:59 +11:00
02d09f2843
fixed slime dying bug
...
removed morphs
2015-11-21 11:37:17 +11:00
9ef99cee20
fixed merge issues
2015-11-21 11:21:54 +11:00
6eb1bef1c6
Merge branch 'master' into minestrike-update
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
2015-11-21 11:09:28 +11:00
87a30513de
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-21 11:08:23 +11:00
4a0cc79abf
fixed silence not working in non-champs servers
2015-11-21 11:08:09 +11:00
8b480cc32b
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-20 18:40:42 -05:00
1274dc860d
- Stuff for chiss
2015-11-20 18:40:20 -05:00
2f91ca5a8a
fixed errors
2015-11-21 10:35:17 +11:00
4a70e4da90
more fixies
2015-11-21 10:34:08 +11:00
4d128d9c7a
fixed some skills and wierd hitbox error
2015-11-21 10:29:48 +11:00
e0885feea6
Merge branch 'master' into alex-ctf
2015-11-21 09:40:07 +11:00
97471b0d9c
Finalizing Game Tutorials.
2015-11-20 23:38:02 +01:00
0bc64fec16
Proxy limit fixes
2015-11-21 09:28:15 +11:00
cfc0aa7d05
reverted to size 2 ball
2015-11-21 08:20:02 +11:00
386032a4f5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-20 06:03:30 -05:00
f51358552a
-B
2015-11-20 05:57:29 -05:00
3067d9f281
final push for the day
2015-11-20 15:22:43 +11:00
ed2f3a064c
MORE ML!
2015-11-20 14:31:01 +11:00
3a5ab3f17c
Merge branch 'master' into monster-league
2015-11-20 11:51:07 +11:00
1cc92cea1b
and the files
2015-11-20 11:50:33 +11:00
c4745c18b6
ML update
2015-11-20 11:50:20 +11:00
e14f5a36bd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-20 08:34:19 +11:00
f33eedf36d
text fix
2015-11-20 08:33:51 +11:00
1eff698a34
Merge pull request #75 in MIN/mineplex from william-global to master
...
* commit 'a11ca138e764417c23a0060dd134ef7c49741295':
ranks
woops easy fix
rawr and fixes
Added the ability to give out game loot.
Reformatting titles
Added GlobalGiveCoins. Changes Gems a little and the manager.
More global stuff! Added GlobalGiveGems.
Global Packet work. Added giveitem sub-command.
2015-11-18 10:15:33 -06:00
e16ee9036a
Added the ability to give out game loot.
2015-11-18 14:35:40 +00:00
a28adc9673
More global stuff! Added GlobalGiveGems.
2015-11-17 18:26:19 +00:00
0f7c52391f
Global Packet work. Added giveitem sub-command.
2015-11-17 08:19:36 +00:00
adfc2f19eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-17 09:20:15 +11:00
46505a8e8e
converted to new res pack locations
2015-11-17 09:19:33 +11:00
208d90c4bc
Fixed getTargetBlock being 0 when its infinite
2015-11-17 10:18:42 +13:00
259397b6ae
READY 2 GO
2015-11-14 12:52:14 +11:00
016e54977d
- Finish game [FINALLY]
2015-11-12 21:16:58 -05:00
9de3981dec
ms update
2015-11-13 11:24:11 +11:00
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
6c17b2926c
Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"
...
This reverts commit ce1c09b88f1aef7fe0b9
2015-11-12 16:35:31 -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
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
3ed680e1c2
ms update
2015-11-11 15:55:48 +11:00
d971e3c8a3
ms update
2015-11-11 12:46:58 +11:00
520eb55b88
Merge branch 'master' into minestrike-update
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-11-11 07:43:50 +11:00
b3125e40ff
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-11 07:43:01 +11:00
394d680470
Merge remote-tracking branch 'origin/master' into monster-league
2015-11-10 07:09:19 -08:00
ca1177685f
totally WIP commit
2015-11-10 07:08:08 -08:00
d654f1f4b1
- Fixed class edit in lobbies
...
- Fixed conflict between rave suit and assassin
2015-11-10 06:17:25 -05:00
1a2c163ce2
Fix scoreboard out of bounds error
2015-11-11 00:03:08 +13:00
e165cad50f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-10 04:53:32 -05:00
0a9c97c32a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-10 18:05:01 +11:00
2707173a8b
Merge with 1.8 Branch
2015-11-10 01:48:33 -05:00
83248a8fec
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-10 09:11:27 +11:00
0ae5330634
squid changes
2015-11-10 09:11:10 +11:00
c6ff845efa
arcade weird thingy
2015-11-09 20:28:41 +00:00
ba7d5bbcdc
Fixed Arcade!
2015-11-09 03:24:20 -06:00
7a8a5918c0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/.idea/dataSources.xml
Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
** CONFLICTS ALL FIXED **
2015-11-09 08:59:37 +00:00
9e24a5005f
- Completed CTF
2015-11-08 03:04:17 -05:00
211298327f
- Fixed banners, begun work on patterns
2015-11-08 02:42:31 -05:00
dfbf19c66a
Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-08 01:02:06 -05:00
fb7fcccf24
- Reverting back to banners
2015-11-08 01:01:18 -05:00
cc2e5bc6e4
minestrike update!
2015-11-08 11:30:19 +11:00
79d0466355
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/Arcade.java
2015-11-07 21:36:36 +13:00
f4bf685e96
removed halloween hub
...
removed titan giveaway and pumpkins
2015-11-07 13:20:29 +11:00
4add7449eb
Merge remote-tracking branch 'origin/master'
2015-11-06 21:15:45 -05:00
3893617d58
Logitech Giveaway (still needs testing)
2015-11-06 21:15:37 -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
d3d448ccfe
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-11-07 04:47:37 +13:00
cc0f12f6c8
Fix player interactions packets not working properly on armorstand and when clicking block behind entity
2015-11-07 04:45:02 +13: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
77125b3a24
Don't re-set scoreboard lines
2015-11-05 01:10:08 +13:00
31b4fbec15
Fix a null
2015-11-05 00:49:26 +13:00
0352e52a68
Tentative beginnings of wider scoreboards
2015-11-05 00:42:45 +13:00
a0676b7bcf
Fix tnt in SG being usable during DM invul
2015-11-04 21:44:10 +13:00
21d10e4bec
Fix typo
2015-11-04 19:15:06 +13:00
b3f86ba638
Fixing bugs
2015-11-04 18:34:22 +13:00
7f03ca0936
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
2015-11-03 21:19:17 +00:00
c25b1969de
More progress
2015-11-04 04:00:53 +13:00
c41d01e213
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-bugfixes
...
Conflicts:
Plugins/Mineplex.StaffServer/.classpath
2015-11-02 22:09:18 -05:00
89c9f19c69
- Fixed MPS Whitelist
2015-11-02 22:08:02 -05:00
975ad9e6ea
Update to master
2015-11-03 15:05:56 +13: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
7496ed763a
Fix wither and dead bodies bug
2015-11-03 14:41:34 +13:00
18bdcbec62
Fixed some NPEs with TrickDialogue
...
Added debug messages for Tricks.
Cleanup of monster targets in HubManager.
2015-11-01 22:09:36 -06:00
92a2c2ebaa
fixed npe in kit npc creation
2015-10-31 19:55:58 +11:00
5d58c56c27
fixed kit bug
2015-10-31 18:31:13 +11:00
225f067ab3
fixed some projectile stuff
2015-10-31 18:22:53 +11:00
b9d7c80f80
cow kit
2015-10-31 13:25:57 +11:00
ea1e4b79f7
Changes from SnD branch
2015-10-30 19:25:02 +13:00
ed18588a6a
Fix missing code and stuff
2015-10-30 19:12:04 +13:00
da0a99d662
Spawn facing fixes
2015-10-30 16:06:47 +13:00
50edf557ab
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-10-30 15:57:36 +13:00
388aa1611c
Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate
2015-10-30 15:44:37 +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
7fca42b0e0
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/turfforts/TurfForts.java
2015-10-29 21:41:59 +13:00
14df456b3d
Progres
2015-10-29 21:39:38 +13:00
acc915c34e
Re-added my TurfForts patch, as well as fixed the "Game Changes to build time while spectating so you don't get your blocks" glitch.
2015-10-29 01:12:12 -04:00
8dd80094b4
Fixed a little boolean derp that stopped people from breaking blocks.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 1f0accd
2015-10-28 23:26:18 -04:00
9df297fc11
Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 76e4dc6
2015-10-28 23:25:56 -04:00
cf26541461
- More Bugfixes
2015-10-28 18:16:52 -04:00
0486404c4b
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/Arcade.java
2015-10-28 14:38:34 +13:00
5ec932d1ca
Fixing bugs
2015-10-28 14:36:48 +13:00
0ab3213b7b
- Fixed permanent dwarf toss bug
...
- Fixed skills being active while player is editing class
2015-10-27 01:38:41 -04:00
9d6a361602
- Fixed emerald jump for Relyh
2015-10-26 23:42:52 -04:00
f5b4f28848
- Fixed achievements
...
- Various balance patches/audio changes
2015-10-26 00:25:33 -04:00
08fd1b5790
- Fixed MPS Whitelist for usernames with non-lowercase characters
2015-10-24 20:49:09 -04:00
1e4b3442fa
Conflicts:
...
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
2015-10-24 20:45:39 +01:00
e3c824c512
Fix minor skywars error
2015-10-24 13:32:55 +13:00
4d2b359aad
Fix wolf cub strike
2015-10-24 08:41:10 +13:00
43cd0f86a9
Fix players unable to break blocks at spawn
2015-10-24 08:40:57 +13:00
40afcaf26b
Global Packet Commands
2015-10-23 15:07:53 -04:00
d51b23849a
- Fixed bugs and added features
2015-10-23 03:24:01 -04:00
f7dab72e8c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-10-23 03:23:35 -04:00
af208da953
Merge branch 'alex-testrank'
2015-10-23 18:10:59 +11:00
d9d0254e46
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-23 17:30:59 +11:00
e3e7dd4694
Titan rewards from mythical chests
2015-10-23 02:08:31 -04:00
9ceb4eee94
- Take will and QA's suggestion about making the gameplay modifier a proper feature
2015-10-23 00:48:31 -04:00
1512d87f9e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-23 00:28:32 -04:00
91ddcdb149
- Testing setup
2015-10-23 00:25:38 -04:00
5a94e33d5e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-10-23 00:24:52 -04:00
53aa1b655b
Remove custom formatter because it trims too short, don't need to commit it. Cleaned up CustomTagFix
2015-10-23 09:20:24 +13:00
8cde506a2c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-10-23 05:25:36 +13:00
ddb8d592f8
Remove all is1_8 checks
2015-10-22 18:37:14 +13:00
e6bec41ca8
Fix "code too large" error.
2015-10-21 20:29:44 +01:00
07f032a5d2
Fix wither pet making sounds, fixed worldtime.
2015-10-21 04:22:31 +13:00
5d671d3300
Fix borders
2015-10-20 04:37:42 +13:00
55f97ef984
More fixes, along with a fix for Block Hunt
2015-10-19 06:21:16 +13:00
547c8ca726
- Bugfixes
2015-10-18 06:14:54 -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
d901cfa12c
buildies can join full
2015-10-18 10:54:34 +11:00
6f91827d57
Vector to Vector3f, updated Maze to 1.8
2015-10-18 12:40:01 +13:00
3a0781b3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
2015-10-17 00:10:32 +13:00
14a524cf54
Stuff
2015-10-17 00:08:30 +13:00
41b6fdc74e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-16 21:47:35 +11:00
32489388c6
removed bug fix that caused SG break
2015-10-16 21:47:22 +11:00
f71cb80bd0
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/minestrike/MineStrike.java
2015-10-16 22:26:07 +13:00
70c76d976f
More changes
2015-10-16 22:10:13 +13:00
62b209fede
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-16 01:57:30 -05:00
d00fa856f3
Fixed Pets so they work correctly.
...
Also fixed legend benefits.
Fixed chest pet rewards.
2015-10-16 01:57:19 -05:00
016cea15f3
Merge branch 'Myst_HALLOWEEN'
2015-10-16 15:01:59 +11:00
b8eb924ffa
Fixed timing out. Yay. I'm done. G'night
2015-10-16 00:00:08 -04:00
577c67cacd
Merge branch 'Myst_HALLOWEEN'
2015-10-16 14:18:35 +11:00
f0a22d5c36
Fixed hammer throw
2015-10-15 23:02:51 -04:00
f0e0d41c42
Fixed two things.
2015-10-15 22:23:49 -04:00
6cc33fd6c6
Merge branch 'thanos-bug-fixes'
2015-10-16 12:53:43 +11: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
f683e932ae
Clans merge fixes
2015-10-13 22:24:15 -04:00
Sarah
Cheese
AlexTheCoder
Shaun Bennett
William Burns
libraryaddict
Shaun Bennett
NewGarbo
fooify
Jonathan Williams
Aaron Brock
Mysticate