JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,570 Commits 1 Branch 0 Tags 481 MiB
b42f3eb5fd
Commit Graph

904 Commits

Author SHA1 Message Date
Shaun Bennett
cf87469400 Fix a possible NPE, use proper IP and port for api 2016-06-10 20:24:22 -05:00
Shaun Bennett
8bf26dbc11 Use a better podium for NPC, reenable boosters 2016-06-09 18:57:48 -05:00
Keir Nellyer
22dbcbf90d Move util method to sequence CompletableFuture's to new class 'UtilFuture' 2016-06-09 23:41:17 +01:00
Keir Nellyer
8e48b00264 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-09 15:16:38 +01:00
Shaun Bennett
d4ac309daa Merge remote-tracking branch 'remotes/origin/master' into feature/gems 2016-06-09 00:29:27 -05:00
Shaun Bennett
09d2c00f66 Proper display of extra gem fountain rewards 2016-06-09 00:14:01 -05:00
LCastr0
cb71bf4ba5 Removes morphs from gadget persistence (PC-429) 2016-06-05 17:44:34 -03:00
Shaun Bennett
4e9a48ab4f Finish off the tip system 2016-05-30 12:02:12 -05:00
Shaun Bennett
e380354bad Refactor CurrencyType 2016-05-29 16:34:21 -05:00
Shaun Bennett
aebcfc2727 Booster tip system 2016-05-28 09:21:10 -07:00
xGamingDudex
4fc3c491f8 Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders 2016-05-28 02:04:27 +02:00
xGamingDudex
1d20e84107 Fixed support for Entities and TileEntities for schematics 
Fixed some NBT tools
Added and tested schematic support for entities and tile entities

All conversion and creations for schematics should now also be fixed. So
creating schematics from two points inside a world. Converting
schematics to bytes and converting bytes to schematics.
 2016-05-28 01:21:11 +02:00
Keir Nellyer
ad486a7e22 Merge remote-tracking branch 'origin/develop' into feature/report-v2 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportCategory.java
 2016-05-26 13:24:24 +01:00
xGamingDudex
806fa7fca4 Added MavericksRepository (+ forgot schematic data in last commit) 
+Tweaked some MasterBuilders code
 2016-05-26 01:19:05 +02:00
xGamingDudex
7a0eea7aa0 Added better saving and loading methods to Schematics 
Added some extra NBT utils
Added support for TileEntities and Entities to schematics
 2016-05-26 01:17:19 +02:00
cnr
5331e2bec9 Allow PlayerKeyValueRepository Exceptions to propagate 2016-05-25 17:59:20 -05:00
cnr
857cf6ad30 Add PlayerKeyValueRepository and BukkitFuture 
PlayerKeyValueRepository<V> is a key/value store whose keys are Strings
and whose value type is parameterized by V. Each repository is backed by
a MySQL table in the Accounts database.

Access to PlayerKeyValueRepository's values is restricted via
CompletableFuture to enforce async database access.

BukkitFuture contains helpful utilities for producing, transforming, and
terminating CompletableFutures with actions on the main thread. A
typical PlayerKeyValueRepository action may look similar to the
following, where we retrieve all key/value pairs for a player and
perform an action with the result on the main thread:

    PlayerKeyValueRepository<String> repo = [...]; // init repo
    UUID uuid = [...]; // a player's UUID

    repo.getAll(uuid).thenCompose(BukkitFuture.accept(values -> {
        // this will be run on the main thread!
        // `values` is of type `Map<String,String>`
    }));
 2016-05-25 08:35:05 -05:00
samczsun
f32e648691 QA Pass #1 
Remove potential main thread IO in ItemMapManager
Don't construct search string if limit is reached
Also cleaned up WorldManager to be more efficient
 2016-05-24 13:15:29 -04:00
samczsun
d29d5dd5e4 Actually fix PC-279 2016-05-24 13:15:29 -04:00
Shaun Bennett
434ada2e86 Fix merge issues 2016-05-24 19:14:52 +10:00
Shaun Bennett
1377e6724f Merge with develop 2016-05-24 19:10:55 +10:00
Shaun Bennett
b6376cae2f Remove googles http api (no longer needed) and add apache http to core.common 2016-05-24 17:23:17 +10:00
Shaun Bennett
12c5ba80b7 API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation 2016-05-24 17:13:33 +10:00
Ben
5448c42e45 [Assassin/Recall] Don't allow use when in water [PC-360] 2016-05-23 23:46:33 +01:00
LCastr0
ed68ef332b Fixes for Win Room (Players were able to see other players) 
Added command to allow other players to run ranked commands
Fixes code styles
 2016-05-22 21:05:48 -03:00
Shaun Bennett
efb264dd75 Hook into Booster API 2016-05-20 16:58:58 +10:00
cnr
7f44281441 Merge branch 'develop' into project-cosmetics 2016-05-19 10:04:19 -05:00
Shaun Bennett
012edfed45 Use loaded schematics to display fountain progress 2016-05-18 18:04:21 +10:00
Shaun Bennett
8d7ef7cc9a Fix UtilBlock setting ghost blocks 2016-05-18 18:03:54 +10:00
cnr
6042be2d2f Refactor clans ban functionality and remove UtilStreams 2016-05-17 05:57:27 -05:00
xGamingDudex
f8d5bd3c11 Fixed treasure chests 
Items would sometimes pop out of chest blocks
You could open illuminated chests before they were converted to real
chests
 2016-05-16 00:51:33 +02:00
xGamingDudex
14f7e64a77 Fixed Animator and removed duplicate test call in Game.java 2016-05-15 21:05:37 +02:00
xGamingDudex
d850bed725 Minor code tweaking 
* Made reward manager ammo multiplier private final field
* Removed old commented code from WinEffectPodium, WinEffectLavaTrap,
ParticleMusic, ParticleEmerald, ParticleBlood
* Cleaned up the GameModifierMineStrikeSkin filter
* Removed unused Math#isBetween(double, double, double) method
* Changed Animator to use PriorityQueue
 2016-05-15 19:43:07 +02:00
xGamingDudex
29a0ba565b Added better hollow calculations to ShapeBox and UtilBlock 2016-05-15 17:05:11 +02:00
xGamingDudex
296f304d29 Changed the way UtilItem.dropItem handles despawning 2016-05-15 17:04:50 +02:00
xGamingDudex
a8db293bcf Moved JavaDocs from ICosmeticShape (now removed) to CosmeticShape 2016-05-15 17:04:25 +02:00
xGamingDudex
97f82e422d Merge branch 'project-cosmetics' of 
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java
 2016-05-15 16:03:36 +02:00
xGamingDudex
aa36097729 Made Animator abstract and added final modifiers 2016-05-15 15:58:05 +02:00
xGamingDudex
abddc446fd Added java docs and tweaked code 
* Fixed possible duplication bug in MulitBlockUpdaterAgent
* Tweaked some of the factor methods for Shape.java
* Cleaned some code in ShapeWings.java
 2016-05-15 15:32:44 +02:00
LCastr0
1cc44d1b3e Fixes for the following classes: 
KitGameModifier
KitModifierType
MultiBlockUpdaterAgent
Shape
GadgetManager
KitModifierType
HatLovestruck
HatSecretPackage
SetLove
Animator
AnimatorEntity
AnimationPoint
ICosmeticShape
UtilText
KitGameModifier
KitModifierType
Removed build.xml and org.eclipse.jdt.ui.prefs
 2016-05-15 00:20:07 -03:00
LCastr0
20b9f428b4 Fixes Illuminated Chest's Lore 
Fixes Pinata Burst not being saved
Fixes AWP Asiimov and XM1014 Tranquility materials
Removes Fireworks WinRoom
Changes prices of things from 1 shard to Treasure Chest
More unused imports removed
Fixed ANGLE_WING_PATTERN -> ANGEL_WING_PATTERN
Adds javadoc to UtilColor.applyColor()
Adds javadoc to UtilColor.getNextColor()
defaultLeatherColor -> DEFAULT_LEATHER_COLOR
Adds suggestions for UtilColor
Adds final modifier to _worldBorders (UtilPlayer)
Changed _worldBorders key from String to UUID
Adds suggestion for UtilPlayer
Adds final modifier to _type (GameModifierSubPage)
Adds final modifier to _type and _kitType (KitGameModifierPage)
DefaultDencity -> DefaultDensity (Shape)
Changed <Vector> to <> (Shape)
dencity -> density (ShapeBox, ShapeGrid, ShapeSphere)
Using speed and count in constructor (ShapeWings)
Removed empty constructor (WorldGenCleanRoom, MultiBlockUpdaterAgent)
Adds final modifier to all fields (AnimationPoint)
 2016-05-14 01:18:37 -03:00
xGamingDudex
2db98613ab Cosmetic Update 
* Redid the Reward manager
	Added new rewards to the chest and changed some values
* Fixed some MineStrike skin bugs
* Removed particles/death effects from Minestrike
* Removed old test minestrike skins
* Moved minestrike skins to correct package
* Changed the illuminated chest animation a bit
* Fixed other minor bugs
 2016-05-12 23:42:37 +02:00
Keir Nellyer
b68127b111 Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-05-08 00:37:59 +01:00
Shaun Bennett
60dce9ef1b Change LT, Owner, Developer, Admin to DARK_RED 2016-05-06 13:43:30 +10:00
xGamingDudex
17a4517e71 Merge remote-tracking branch 'origin/develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
 2016-05-05 21:03:15 +02:00
xGamingDudex
1a96ea3c18 Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics 2016-05-05 20:29:28 +02:00
xGamingDudex
db21c7dd22 EGit FTW! 
Git, you are the greates, randomly deciding not to include everything
when I spesify you to do so....

This should have been part of prev commit.
 2016-05-05 20:26:00 +02:00
xGamingDudex
875fb4eccd The big bug fix batch 
+ Added some text utils
+ Added angel wing shape

* Tweaked the wing particle effects.
* Fixed item tool not despawning items in arcade servers
* Removed strange gadget disable
* Updated some death/win effects and particles
* Added Illuminated chest
* Added MS skin name to death message
 2016-05-05 20:07:29 +02:00
Keir Nellyer
a663cb3e01 Revert "Revert "Report system (version 1)"" 
This reverts commit d0d2de1e21.

# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-05-04 15:24:29 +01:00
LCastr0
055b8684c2 - Added action bar message when booster is ready (Wind Up Suit) 
- Moved each suit to an individual package, to make it easier to work with
- Removed some unused imports
- Added util to get entity egg data
- Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges)
- Added specific kit pages to game modifier menu
 2016-05-02 00:13:06 -03:00
Ben
1e18707fd7 Include the missing PlayerMessageEvent, as I had also forgotten to add documentation about the class. 2016-05-01 23:06:30 +01:00
Ben
e139bea465 Fix kill messages inserting a space below them in chat. 2016-05-01 23:03:18 +01:00
Ben
189f9ad524 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-05-01 01:42:32 +01:00
Ben
2337e89a93 Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well. 2016-05-01 01:42:11 +01:00
Keir Nellyer
bce218a65e Merge branch 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-04-30 23:11:35 +01:00
Conrad
d0d2de1e21 Revert "Report system (version 1)" 2016-04-30 14:53:59 -04:00
Keir Nellyer
6a00f26d5f Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-04-29 23:42:27 +01:00
xGamingDudex
38d03b8468 Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics 2016-04-27 00:03:29 +02:00
xGamingDudex
79f210e242 Schematic and WinEffect update 
+Added better schematic support
+Fixed schematics not sending block updates to nearby players
+Added win room schematics
*Tweaked some of the win rooms
+Added sounds to the Lava Trap win effect.
 2016-04-27 00:01:30 +02:00
LCastr0
28de514d1a Adds some utils for UtilColor 
Small changes in Wind Up suit
 2016-04-24 21:39:35 -03:00
Shaun Bennett
b21dfad12e Merge remote-tracking branch 'remotes/origin/develop' into feature/gems 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
 2016-04-24 13:37:45 +10:00
Shaun Bennett
c60beec68c Implement Fountain GUI 2016-04-24 12:40:38 +10:00
LCastr0
491c509317 Added UnlockCosmetics command (/unlockCosmetics <type>) 
Added Ammo command (/ammo <gadget> <ammo> [player])
Added util for red world border screen (UtilPlayer.sendRedScreen)
Added new costume -> Wind Up
Removed test gadget (ItemBouncyBall)
 2016-04-23 22:16:02 -03:00
xGamingDudex
ccd630e2ae Leftovers from merge 2016-04-23 00:56:19 +02:00
xGamingDudex
b7099088a9 Merge remote-tracking branch 'origin/develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
 2016-04-23 00:55:48 +02:00
AlexTheCoder
70541fd6f2 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla 2016-04-22 05:41:24 -04:00
Jonathan Williams
477acf044e Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-04-22 04:34:21 -05:00
cnr
2d02d79cec Fix survival games' Beastmaster wolf spawning 
Beastmaster wolf spawning suffered from the same issue as the Wizards
"Summon Wolves" spell: spigot has an issue when setting an owner to a
wolf or ocelot without a previous owner. See SpigotUtil for details.
 2016-04-20 18:45:54 -05:00
AlexTheCoder
d623d0982b Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge 2016-04-17 12:02:08 -04:00
AlexTheCoder
4c35e35fc0 - More polish and bugfixes 2016-04-16 23:59:44 -04:00
xGamingDudex
ffc0459e5a Cosmetic Update 
+ Support for relative copy position from with //copy from worledit in
schematics
+ Better block selection in bounding box in UtilBlock
+ Goal selector utils for entities
+ Global hide and show methods for players
+ Win effects and game modifiers
+ Tweaked player disguises
+ Added clean room generator to arcade games, previously normal flat
world
+ Animation utils

* Edited some particles, hats and death animations
 2016-04-16 02:24:41 +02:00
AlexTheCoder
33b557eb10 - Huuuuuuuge amount of changes for chiss 2016-04-14 22:45:21 -04:00
Ben
0a32eed15d Fix Cannon TNT firing in the wrong direction and clean up the projectile code, making it more modular. 2016-04-15 00:43:55 +01:00
Ben
b313bc5308 Make undead chests not show the 'you are not permitted to use ender chest' messages. 2016-04-10 16:52:54 +01:00
Ben
37bb64bffd Fix Undead Camps from spawning outside of the World Border. 2016-04-10 12:47:56 +01:00
Keir Nellyer
51b5e50c20
Use pre-existing util method for item building 
Removes util method added in previous commit.
 2016-04-09 00:44:00 +01:00
Ben
92195a12d2 Completely rework Cannon explosions to use the vanilla Minecraft explosions, as those seem to look much more visually appealing, and have less issues. 
Fixed a loading and saving bug with Cannons, they seem to be a lot more stable now than before.
 2016-04-09 00:37:20 +01:00
Keir Nellyer
56b0a886bf
Add helper method for setting common item meta values 2016-04-09 00:36:04 +01:00
Keir Nellyer
390b2878dc Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-04-07 14:28:30 +01:00
Shaun Bennett
ff929a8515 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
 2016-04-05 00:57:28 +10:00
Ben
a1f284670a make zombie npcs actually look at the player 2016-04-03 23:49:22 +01:00
Ben
66a18dcc87 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
 2016-04-03 13:55:17 +01:00
Ben
c1b659e738 npcs on enemy base 2016-04-03 13:50:11 +01:00
phobia
d4e9f638da Fixed a crash bug with title message being too long + other fixes 2016-04-02 22:26:21 +11:00
phobia
673dd327ff Push for shaun Fireworks 2016-04-02 20:29:56 +11:00
Cheese
9969b7d783 support for resource packs for different MC versions 2016-04-02 11:39:40 +11:00
Ben
0fd39e1300 missing event 2016-03-31 00:47:06 +01:00
Ben
36caf16c9a Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-31 00:03:12 +01:00
Ben
0f22c4359d PC-19 - Remove World Event messages for players in Tutorial 2016-03-31 00:02:51 +01:00
William Burns
2fcd809447 PC-34 - Effects/Particles when you blow up enemy 2016-03-29 18:03:28 +01:00
Ben
a175ead44a finished tutorial! 2016-03-27 05:43:31 +01:00
Shaun Bennett
caf8170a32 Tutorial Changes 2016-03-27 08:47:34 +11:00
Ben
195c990e29 further tutorial progress 2016-03-25 04:01:57 +00:00
Shaun Bennett
051539dbf6 Add cleanup and setup 2016-03-25 08:43:37 +11:00
Shaun Bennett
85511b4c26 Fixes for ben 2016-03-25 08:13:30 +11:00
Ben
2ef604aeaf attack enemy goal 2016-03-24 19:11:05 +00:00
Shaun Bennett
2a89896084 Tutorial 2016-03-24 17:32:44 +11:00
Shaun Bennett
dbd9567abb Tutorial work 2016-03-24 15:22:07 +11:00
Shaun Bennett
e8dcc4a3e2 Merge branch 'develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2016-03-23 11:02:20 +11:00
Ben
995d454f87 tutorial additions. 2016-03-18 02:47:51 +00:00
Ben
93767b7a90 tutorial changes, chat filter system, commented out all web stuff for analytics. 2016-03-16 22:46:18 +00:00
Ben
0d237370e1 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-15 23:33:09 +00:00
Ben
4638ba909d siege weapon finalizations & analytics (wip) 2016-03-15 22:52:13 +00:00
Shaun Bennett
4e85a315f9 Objectives! 2016-03-15 11:50:35 -05:00
Shaun Bennett
e53b8616d1 A ton of tutorial work 2016-03-15 10:29:43 -05:00
Ben
3ae89e12a8 improve cannon UI 2016-03-15 00:21:37 +00:00
Ben
e08ba29ac1 Final fixing of cannon saving/loading 2016-03-14 22:48:31 +00:00
Ben
bcfe4a42c0 changerooonis 2016-03-11 00:41:28 +00:00
Ben
20ade492a8 tnt generator changes 2016-03-10 22:09:45 +00:00
Ben
cf6645cec7 Legendaries and other preparation for beta 2016-03-09 11:55:40 +00:00
Ben
5b3da3d06f Consistency. (Changed Vanish to Incognito) 2016-03-09 01:53:01 +00:00
Joseph Prezioso Jr
19375e5720 callEvent now has a return type 2016-03-08 16:20:53 -05:00
Joseph Prezioso Jr
ac91ba690c Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-08 16:08:14 -05:00
Joseph Prezioso Jr
b8f06374cd Made changes to accommodate for Clan ELO's 2016-03-08 16:07:52 -05:00
Joseph Prezioso Jr
97f5b60404 Merge github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-08 13:56:05 -05:00
Shaun Bennett
99c2fefed2 Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-08 12:27:45 -06:00
Shaun Bennett
3283b873e7 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-03-08 12:19:28 -06:00
Ben
26b7ea2d59 fixes 2016-03-08 18:19:12 +00:00
Shaun Bennett
876a568bd0 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/OutpostRepository.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
 2016-03-08 12:17:07 -06:00
Shaun Bennett
ffd9d98d2e Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-08 12:15:47 -06:00
Shaun Bennett
890a3f4bc9 Merge develop into clans/beta 2016-03-08 12:09:04 -06:00
Ben
f24e196efd Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 2016-03-08 18:07:57 +00:00
Ben
0ff434cf91 progress 2016-03-08 16:49:32 +00:00
Ben
d86ef81056 weaps oops 2016-03-08 01:11:16 +00:00
Ben
263e3e7768 forgot to push 2016-03-08 01:07:35 +00:00
Ben
48cfe4d91c fixed & inv see? 2016-03-08 00:27:06 +00:00
git
496983ee04 Untested bugfixes 2016-03-07 22:29:14 +13:00
NewGarbo
ae42aaaab1 Sammy changes + cleanup 2016-03-07 03:25:22 +00:00
NewGarbo
7e2086df1c flash fix, rares update, and outpost fixes 2016-03-06 19:55:58 +00:00
NewGarbo
ae2da31544 Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-05 23:14:32 +00:00
NewGarbo
e88736c1aa changes to scepter, NPE fix 2016-03-05 20:46:24 +00:00
NewGarbo
d79107eaaa new legendary weapons and nether finzlizations 2016-03-05 03:07:25 +00:00
NewGarbo
7b9ff288f3 nether progresssisiannsnsssss 2016-03-03 23:23:20 +00:00
git
6d0ca4f813 Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
 2016-03-03 13:49:31 +13:00
git
0ffa67dfb8 Ring game 2016-03-03 13:48:22 +13:00
Keir Nellyer
b18f2d8682 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-03-02 20:02:09 +00:00
NewGarbo
73d8870daf nether work (forgot to commit days ago oops) 2016-03-02 19:42:53 +00:00
Shaun Bennett
3447354814 Dual 1.9 Fixes 2016-03-02 12:58:30 -06:00
Shaun Bennett
a3b7a3269c Merge branch 'develop' into Dual_1.9 2016-03-01 15:14:59 -06:00
William Burns
e4ba5d9723 Fix colour targeting FINALLY! 2016-02-25 19:48:15 +00:00
William Burns
dead7a0850 Use a different method for targeting blocks. 2016-02-25 16:09:00 +00:00
William Burns
a97409b64a Adjust max distance for targeting. 2016-02-25 15:04:19 +00:00
git
2a9d49ccd9 Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 2016-02-25 18:11:12 +13:00
NewGarbo
2956b18821 some hologram work 2016-02-23 18:45:04 +00:00
NewGarbo
41e140d5ca stop players from placing water in outposts 2016-02-23 16:07:12 +00:00
NewGarbo
f0fc2fd519 progress [testing github] 2016-02-22 20:44:00 +00:00
Keir Nellyer
99150db2d7 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
 2016-02-22 19:02:54 +00:00
xGamingDudex
33b3d121b3 Merge branch 'develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatLovestruck.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSecretPackage.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHeart.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java
 2016-02-20 15:30:26 +01:00
AlexTheCoder
3b7a7e457c Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-20 03:20:27 -05:00
Shaun Bennett
d3d22bbec9 Merge pull request #168 in MIN/mineplex from clans/alpha to develop 
* commit '67c355bf652e9c802dc1e8e56b088c44cdaaac3b': (21 commits)
  remove more eclipse files
  remove eclipse files
  moar undead fixes
  Fixes to observer settings
  Clans Alpha 1.0 changes
  WP Evade
  More alphs bug fixes
  Fixes to flame and broadsword
  Clans alpha bug fixes
  Fixed /c stuck timer taking 7 seconds instead of 2 minutes
  Fixes to TntProtection
  Added safe zone protection for flame
  finalized alpha patches
  alpha fixes
  raised war points for invasion to 25
  Fixes to war point evasion
  Added fix to WarPoint evasion bug + 1 dmg bug
  that's not needed
  MAVEN TEST COMMIT
  Fixed issues with Broadsword Added max building height of 100
  ...
 2016-02-19 01:30:09 -06:00