8bf26dbc11
Use a better podium for NPC, reenable boosters
2016-06-09 18:57:48 -05:00
22dbcbf90d
Move util method to sequence CompletableFuture's to new class 'UtilFuture'
2016-06-09 23:41:17 +01:00
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
d4ac309daa
Merge remote-tracking branch 'remotes/origin/master' into feature/gems
2016-06-09 00:29:27 -05:00
09d2c00f66
Proper display of extra gem fountain rewards
2016-06-09 00:14:01 -05:00
cb71bf4ba5
Removes morphs from gadget persistence (PC-429)
2016-06-05 17:44:34 -03:00
4e9a48ab4f
Finish off the tip system
2016-05-30 12:02:12 -05:00
e380354bad
Refactor CurrencyType
2016-05-29 16:34:21 -05:00
aebcfc2727
Booster tip system
2016-05-28 09:21:10 -07:00
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
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
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
806fa7fca4
Added MavericksRepository (+ forgot schematic data in last commit)
...
+Tweaked some MasterBuilders code
2016-05-26 01:19:05 +02:00
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
5331e2bec9
Allow PlayerKeyValueRepository Exceptions to propagate
2016-05-25 17:59:20 -05:00
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
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
d29d5dd5e4
Actually fix PC-279
2016-05-24 13:15:29 -04:00
434ada2e86
Fix merge issues
2016-05-24 19:14:52 +10:00
1377e6724f
Merge with develop
2016-05-24 19:10:55 +10:00
b6376cae2f
Remove googles http api (no longer needed) and add apache http to core.common
2016-05-24 17:23:17 +10:00
12c5ba80b7
API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation
2016-05-24 17:13:33 +10:00
5448c42e45
[Assassin/Recall] Don't allow use when in water [PC-360]
2016-05-23 23:46:33 +01:00
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
efb264dd75
Hook into Booster API
2016-05-20 16:58:58 +10:00
7f44281441
Merge branch 'develop' into project-cosmetics
2016-05-19 10:04:19 -05:00
012edfed45
Use loaded schematics to display fountain progress
2016-05-18 18:04:21 +10:00
8d7ef7cc9a
Fix UtilBlock setting ghost blocks
2016-05-18 18:03:54 +10:00
6042be2d2f
Refactor clans ban functionality and remove UtilStreams
2016-05-17 05:57:27 -05:00
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
14f7e64a77
Fixed Animator and removed duplicate test call in Game.java
2016-05-15 21:05:37 +02:00
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
29a0ba565b
Added better hollow calculations to ShapeBox and UtilBlock
2016-05-15 17:05:11 +02:00
296f304d29
Changed the way UtilItem.dropItem handles despawning
2016-05-15 17:04:50 +02:00
a8db293bcf
Moved JavaDocs from ICosmeticShape (now removed) to CosmeticShape
2016-05-15 17:04:25 +02:00
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
aa36097729
Made Animator abstract and added final modifiers
2016-05-15 15:58:05 +02:00
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
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
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
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
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
60dce9ef1b
Change LT, Owner, Developer, Admin to DARK_RED
2016-05-06 13:43:30 +10:00
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
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
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
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
a663cb3e01
Revert "Revert "Report system (version 1)""
...
This reverts commit d0d2de1e21
2016-05-04 15:24:29 +01:00
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
1e18707fd7
Include the missing PlayerMessageEvent, as I had also forgotten to add documentation about the class.
2016-05-01 23:06:30 +01:00
e139bea465
Fix kill messages inserting a space below them in chat.
2016-05-01 23:03:18 +01:00
189f9ad524
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 01:42:32 +01:00
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
bce218a65e
Merge branch 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-04-30 23:11:35 +01:00
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -04:00
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
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
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
28de514d1a
Adds some utils for UtilColor
...
Small changes in Wind Up suit
2016-04-24 21:39:35 -03:00
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
c60beec68c
Implement Fountain GUI
2016-04-24 12:40:38 +10:00
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
ccd630e2ae
Leftovers from merge
2016-04-23 00:56:19 +02:00
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
70541fd6f2
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 05:41:24 -04:00
477acf044e
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-22 04:34:21 -05:00
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
d623d0982b
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge
2016-04-17 12:02:08 -04:00
4c35e35fc0
- More polish and bugfixes
2016-04-16 23:59:44 -04:00
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
33b557eb10
- Huuuuuuuge amount of changes for chiss
2016-04-14 22:45:21 -04:00
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
b313bc5308
Make undead chests not show the 'you are not permitted to use ender chest' messages.
2016-04-10 16:52:54 +01:00
37bb64bffd
Fix Undead Camps from spawning outside of the World Border.
2016-04-10 12:47:56 +01:00
51b5e50c20
Use pre-existing util method for item building
...
Removes util method added in previous commit.
2016-04-09 00:44:00 +01:00
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
56b0a886bf
Add helper method for setting common item meta values
2016-04-09 00:36:04 +01:00
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
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
a1f284670a
make zombie npcs actually look at the player
2016-04-03 23:49:22 +01:00
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
c1b659e738
npcs on enemy base
2016-04-03 13:50:11 +01:00
d4e9f638da
Fixed a crash bug with title message being too long + other fixes
2016-04-02 22:26:21 +11:00
673dd327ff
Push for shaun Fireworks
2016-04-02 20:29:56 +11:00
9969b7d783
support for resource packs for different MC versions
2016-04-02 11:39:40 +11:00
0fd39e1300
missing event
2016-03-31 00:47:06 +01:00
36caf16c9a
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 00:03:12 +01:00
0f22c4359d
PC-19 - Remove World Event messages for players in Tutorial
2016-03-31 00:02:51 +01:00
2fcd809447
PC-34 - Effects/Particles when you blow up enemy
2016-03-29 18:03:28 +01:00
a175ead44a
finished tutorial!
2016-03-27 05:43:31 +01:00
caf8170a32
Tutorial Changes
2016-03-27 08:47:34 +11:00
195c990e29
further tutorial progress
2016-03-25 04:01:57 +00:00
051539dbf6
Add cleanup and setup
2016-03-25 08:43:37 +11:00
85511b4c26
Fixes for ben
2016-03-25 08:13:30 +11:00
2ef604aeaf
attack enemy goal
2016-03-24 19:11:05 +00:00
2a89896084
Tutorial
2016-03-24 17:32:44 +11:00
dbd9567abb
Tutorial work
2016-03-24 15:22:07 +11:00
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
995d454f87
tutorial additions.
2016-03-18 02:47:51 +00:00
93767b7a90
tutorial changes, chat filter system, commented out all web stuff for analytics.
2016-03-16 22:46:18 +00:00
0d237370e1
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-15 23:33:09 +00:00
4638ba909d
siege weapon finalizations & analytics (wip)
2016-03-15 22:52:13 +00:00
4e85a315f9
Objectives!
2016-03-15 11:50:35 -05:00
e53b8616d1
A ton of tutorial work
2016-03-15 10:29:43 -05:00
3ae89e12a8
improve cannon UI
2016-03-15 00:21:37 +00:00
e08ba29ac1
Final fixing of cannon saving/loading
2016-03-14 22:48:31 +00:00
bcfe4a42c0
changerooonis
2016-03-11 00:41:28 +00:00
20ade492a8
tnt generator changes
2016-03-10 22:09:45 +00:00
cf6645cec7
Legendaries and other preparation for beta
2016-03-09 11:55:40 +00:00
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
19375e5720
callEvent now has a return type
2016-03-08 16:20:53 -05:00
ac91ba690c
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 16:08:14 -05:00
b8f06374cd
Made changes to accommodate for Clan ELO's
2016-03-08 16:07:52 -05:00
97f5b60404
Merge github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 13:56:05 -05:00
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
3283b873e7
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-08 12:19:28 -06:00
26b7ea2d59
fixes
2016-03-08 18:19:12 +00:00
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
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
890a3f4bc9
Merge develop into clans/beta
2016-03-08 12:09:04 -06:00
f24e196efd
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-08 18:07:57 +00:00
0ff434cf91
progress
2016-03-08 16:49:32 +00:00
d86ef81056
weaps oops
2016-03-08 01:11:16 +00:00
263e3e7768
forgot to push
2016-03-08 01:07:35 +00:00
48cfe4d91c
fixed & inv see?
2016-03-08 00:27:06 +00:00
496983ee04
Untested bugfixes
2016-03-07 22:29:14 +13:00
ae42aaaab1
Sammy changes + cleanup
2016-03-07 03:25:22 +00:00
7e2086df1c
flash fix, rares update, and outpost fixes
2016-03-06 19:55:58 +00:00
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
e88736c1aa
changes to scepter, NPE fix
2016-03-05 20:46:24 +00:00
d79107eaaa
new legendary weapons and nether finzlizations
2016-03-05 03:07:25 +00:00
7b9ff288f3
nether progresssisiannsnsssss
2016-03-03 23:23:20 +00:00
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
0ffa67dfb8
Ring game
2016-03-03 13:48:22 +13:00
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
73d8870daf
nether work (forgot to commit days ago oops)
2016-03-02 19:42:53 +00:00
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
a3b7a3269c
Merge branch 'develop' into Dual_1.9
2016-03-01 15:14:59 -06:00
e4ba5d9723
Fix colour targeting FINALLY!
2016-02-25 19:48:15 +00:00
dead7a0850
Use a different method for targeting blocks.
2016-02-25 16:09:00 +00:00
a97409b64a
Adjust max distance for targeting.
2016-02-25 15:04:19 +00:00
2a9d49ccd9
Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:11:12 +13:00
2956b18821
some hologram work
2016-02-23 18:45:04 +00:00
41e140d5ca
stop players from placing water in outposts
2016-02-23 16:07:12 +00:00
f0fc2fd519
progress [testing github]
2016-02-22 20:44:00 +00:00
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
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
3b7a7e457c
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-20 03:20:27 -05:00
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
67c355bf65
remove more eclipse files
2016-02-19 07:22:54 +00:00
441cf702c7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-19 07:22:09 +00:00
c811906a7e
REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a)
2016-02-19 18:21:01 +11:00
d5583b93f2
remove eclipse files
2016-02-19 07:14:13 +00:00
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
8507bb1bd8
all progress over this week
2016-02-18 21:29:42 +00:00
8b1b63c8b3
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9
...
Conflicts:
Patches/craftbukkit.jar
2016-02-18 16:45:37 +13:00
7d8ffa1311
Small stuff
2016-02-15 16:38:18 +01:00
f6c38903f2
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-13 14:34:11 -05:00
197bcc9dbf
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
2016-02-12 21:23:58 -05:00
9595a0ffae
- Lot of stuff
2016-02-12 21:22:00 -05:00
e6eb43ada8
PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK
2016-02-12 19:58:40 +00:00
90570c1185
progress on saving outposts/wepaons so far. not finished. probably going to change it to a different format
2016-02-12 07:00:21 +00:00
d8965179f7
More valentines adjustments/fix gladiators tutorial being enabled
2016-02-11 23:01:59 -06:00
2eeddb828b
Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop
...
* commit '51d152d48473f820ab6d03586fb41f890750f645':
Perfect build all fix
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
Stop mid game joiners from getting participation gems.
Mob egg baby fix. Also fixed non build entities from being "broken"
spec command add guardian
The infamous look direction bounce bug
Chiss' double jump mechanic
Moar fixes
Hopper item pickup fix.
2016-02-11 22:59:35 -06:00
67b12f3ae2
loads of progress
2016-02-10 19:24:57 +00:00
2be917e623
give enemy info about time before siege and after outpost is built, the health of the outpost
2016-02-10 13:01:31 +00:00
35f0162882
make catapults rideableeeeeee
2016-02-10 11:09:17 +00:00
99ece6eaea
add chest with arrwos to outpost. test for clans in area
2016-02-09 05:53:37 +00:00
052d3c3380
siege system updates
2016-02-08 21:33:12 +00:00
2c13824f9b
possesive method in UtilText
2016-02-08 20:46:45 +00:00
c4da8ef636
Cosmetic Update
...
+ Set Storm
+ Set Shadow
+ Set Music
+ Set Emerald
+ Set Blood
+ Set Enchant
+ Particle Ying and Yang
+ Particle Wings Angel
+ Particle Wings Infernal
+ Particle Wings Pixie
+ Shape Utils
* Particle Party Time
* Particle Heart
* Double Jump Firecracker
2016-02-08 00:21:47 +01:00
008fc587b0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-07 15:33:37 -05:00
a76e570b8a
Moar fixes
2016-02-04 21:43:17 -05:00
fa460dbd45
catapult rotatyyyy
2016-02-04 21:50:47 +00:00
b13494f399
more modifications to siege weapons.
2016-02-04 16:00:41 +00:00
5c22c841fe
val1
2016-02-04 10:55:29 +11:00
9086188280
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-02-02 22:02:06 +00:00
6fea76a8e4
finalized alpha patches
2016-02-02 21:38:38 +00:00
23883148dd
alpha fixes
2016-02-02 20:55:23 +00:00
9fa5927240
siege weapon base progress
2016-02-02 19:41:25 +00:00
eb329ec845
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-02-01 22:38:51 +00:00
610522bdd9
mac fix
2016-02-02 09:25:46 +11:00
b4ed912f7d
siege weapon modular system beginnings
2016-02-01 19:52:53 +00:00
9601eabfeb
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-01-31 17:38:08 +00:00
cc857da88e
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
2016-01-31 16:27:14 +00:00
002be01ef1
MAVEN TEST COMMIT
2016-01-31 16:21:04 +00:00
c23855bd65
Merge with develop
2016-01-30 02:44:24 -05:00
8cf32ef8bf
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-30 00:46:43 +00:00
7d28bc69c9
collision boxes on siege weapons and other stuff
2016-01-29 20:55:56 +00:00
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
c1f91cbfb0
Final changes
2016-01-29 03:56:49 -05:00
50fc1f5a10
merge with develop
2016-01-29 03:44:04 -05:00
d30fb8d8ef
Merge remote-tracking branch 'origin/clans/alpha' into clans/alpha
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-01-29 03:40:28 -05:00
0177cf91bb
Merge with develop
2016-01-28 22:23:17 -05:00
f72ee95759
Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop
...
* commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits)
Remove debug message.
Fix flickering judge laser.
Borders for spec are fixed.
Leaves fix.
Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
Make dependable require 50 perfect builds instead of 10.
Multiply by less
negative!
Trying different hologram location
Fix messages, fix /stats
Center hologram
Make achievement category classics
hologram changes
Holograms maybe?
Chiss' checklist.
Remove unnecessary tabs. Make the judge guardian use it's own laser again.
Fixed builds with only mobs not loading.
Fixed mobs.
TICK TICK TICK TICK.
all players equal, no one loses
...
2016-01-28 21:02:23 -06:00
f86262dc0e
catapult and cannon progress
2016-01-28 23:32:23 +00:00
63cea58f05
Waiting for a testing session.
2016-01-28 17:18:24 +00:00
eed55b48ac
Descriptions changed
2016-01-28 09:55:48 +00:00
682a243c31
fixed catapult state being mapped to incorrect blocks
2016-01-28 09:18:58 +00:00
ac37417fca
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/.idea/modules.xml
2016-01-27 21:44:04 +00:00
7f7e73a101
more catapults!
2016-01-26 21:10:58 +00:00
9215d0d3ff
NegativeArraySizeException fix
2016-01-26 18:40:55 +00:00
fde5a5af28
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-25 08:47:08 +00:00
0b7cec60ae
put cmod above support so that support can't bypass clans home block
2016-01-25 08:44:17 +00:00
219b86ae55
Chiss' checklist.
2016-01-25 03:01:54 -05:00
0252436990
cannons updates
2016-01-24 20:56:47 +00:00
24011c4af4
cannons work
2016-01-23 12:46:52 +00:00
311d42db30
Use Garbo's description changes
2016-01-22 19:48:06 -05:00
cc48d98208
pushing to beta to change to alpha
2016-01-22 11:06:19 +00:00
4bbd956e14
Don't use the same build twice (untested!)
2016-01-22 01:37:47 -05:00
6ab6307f74
Pushing all my stuff for Shaunpai.
2016-01-21 19:08:38 -05:00
1e72ebcbe6
Merge branch 'master' into rankdescriptions
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-01-21 12:54:12 +00:00
447583624e
Fix ascii.png duplication.
2016-01-21 17:47:21 +11:00
037a2f8353
Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command
2016-01-20 13:04:31 -05:00
bb4091c7a6
Use Maven for Compilation
2016-01-20 11:20:58 +11:00
9884742552
Fix OrderedObjectives, Starting CombatTutorial work
2016-01-19 16:34:51 -05:00
80d55b2c9c
It works!
2016-01-19 13:34:17 -05:00
0f83263871
Merge remote-tracking branch 'remotes/origin/clans/beta' into clans/tutorial
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-01-19 11:01:11 -05:00
947ce254da
Tutorial Gui, Fixes
2016-01-19 10:59:56 -05:00
976779b9f2
Tutorial Work
2016-01-17 22:45:38 -05:00
6e6f46671b
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilColor.java
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
2016-01-16 14:46:47 +01:00
1042edb134
CANNONZ!
2016-01-16 08:18:06 +00:00
70444ff508
cannon + siege work with outposts, also moved outposts to the clans.siege package
2016-01-15 06:53:58 +00:00
53133d51ee
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex 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-01-13 11:47:13 +00:00
6c055c31a0
Fix flashing through doors, Update to 0.18c
2016-01-10 20:39:56 -05:00
f8e8669b5c
Added Party and Cupid set (arrow, jump, death, particle + full set
...
effect)
2016-01-09 14:07:40 +01:00
d361ce948e
Merge branch 'develop' into william-gladiators
...
# Conflicts:
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
2016-01-08 02:21:32 -05:00
b6b455c1c0
Merge pull request #117 in MIN/mineplex from clans/alpha to develop
...
* commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits)
Added C.Mod rank, and started on rank info.
changed outpost forcefields to be a bit larger to surround the outpost more.
made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
fixed outpost being built instantly on output block place.
holograms above outpost block should be centered in the block and made them despawn on outpost death
legendary pickkup message fix (FINALLY FIXED NOW )
quick modification to outposts, and fixed the legendary announcements being weird
updated clans version
quikc change
outpost changes, and some other things
lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".
fixes (?)
lots of changes that i can't remember at this point
Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players.
player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
a couple more prettificatons to pvp timer messages.
one more quick message change/fix
qa changes to pvp safety
...
2016-01-08 00:35:15 -06:00
15d2118bc1
Added C.Mod rank, and started on rank info.
2016-01-07 23:32:51 +00:00
e1e8c2bb97
changed outpost forcefields to be a bit larger to surround the outpost more.
2016-01-07 21:02:55 +00:00
43f075014a
made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
2016-01-07 20:05:33 +00:00
fff6d8e03f
added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
2016-01-07 19:36:52 +00:00
d88b14d9d6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-07 09:35:07 +00:00
b685a207bc
quick modification to outposts, and fixed the legendary announcements being weird
2016-01-07 09:34:16 +00:00
52c4a55180
outpost changes, and some other things
2016-01-06 22:32:36 +00:00
c920d4efa1
Modify MapText to actually work, modify UtilText to save the images of characters
2016-01-07 04:48:44 +13:00
05ef4d30c7
Store a set of active members for objective goals
2016-01-04 15:56:33 -05:00
ce8586e5c5
More work and refactoring on the tutorial
2016-01-04 14:18:58 -05:00
b47665e115
lots of work on outposts,
...
fixed gold dupe glitch,
fixed clans ban gui title being "Customize New Gear".
2016-01-02 14:02:50 +00:00
92c4450eea
Update the dual version
2015-12-30 21:12:11 +13:00
5841ab1101
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-12-29 23:47:00 +00:00
d08cfa0c4c
Holiday Gifts
2015-12-25 01:51:36 -06:00
2d974a781f
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-12-24 14:06:59 +13:00
369687b5dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
...
Conflicts:
Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
2015-12-23 18:31:51 +00:00
ff24ebc9f4
lots of changes that i can't remember at this point
2015-12-23 18:22:20 +00:00
f57304764c
Added a hotbar layout editor
2015-12-18 15:16:00 +00:00
6f82f8349d
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/.idea/modules.xml
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
2015-12-16 14:07:56 +00:00
52394c89dd
fixed skins beign wrong way around
2015-12-14 21:34:27 +11:00
e4fd97467f
More treasure changes
2015-12-14 03:14:52 -05:00
5be91de006
Merge master
2015-12-13 23:40:18 -05:00
Shaun Bennett
Keir Nellyer
LCastr0
xGamingDudex
cnr
samczsun
Ben
Conrad
AlexTheCoder
Jonathan Williams
Keir Nellyer
Shaun Bennett
phobia
Cheese
William Burns
Joseph Prezioso Jr
git
md_5
Virizion
teddy