cnr
91c97e38b8
Prevent players from naming their pets "ULTRA"
...
This was being used to fool support into thinking the player had won
Ultra from a chest
2016-04-13 16:37:13 -05:00
William Burns
b54da22dd8
Create a basic site design for potential job applicants.
2016-04-13 21:06:47 +01:00
Ben
7cc0583d8e
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-13 19:52:49 +01:00
Ben
355ab06e6c
Fix the Conquering attribute working for player attacks as well
2016-04-13 13:08:04 +01:00
Ben
a26403f006
Fix Recall & Smokebomb not working regularly
2016-04-13 13:04:43 +01:00
cnr
6428dfd723
Run clan-load callbacks on the main thread
...
This prevents potential CMEs from occurring when a player transfers
his/her clan to another server
2016-04-12 22:54:20 -05:00
Ben
e9d05474f8
Prevent cannons from changing bedrock into charred blocks
2016-04-12 17:14:48 +01:00
Ben
c0ebae4175
Ender chest blocker not actually canceling the opening event.
2016-04-12 17:13:03 +01:00
phobia
11d92c49ec
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-12 09:48:59 +10:00
Ben
eefed175ec
Add the random world event command.
2016-04-11 18:07:11 +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
313b59d1d6
Fix the terrain finder miscalculating the size of undead camps
2016-04-10 16:51:42 +01:00
Ben
e014f4fff9
Fix null pointer in the tutorial when using /tutorial finish
2016-04-10 16:51:12 +01:00
Ben
159a5403ac
Fix rare item duplication bug with Smoke Bomb (was told that it's just like the Recall duplication bug)
2016-04-10 16:47:46 +01:00
Ben
db8ca31567
Fix Meridian Scepter not being perfectly accurate.
2016-04-10 16:16:53 +01:00
Ben
0ac9747df1
Modifying how the Meridian Scepter picks a target, as the previous logic was a bit flawed.
2016-04-10 15:27:20 +01:00
Ben
9a2f4a8936
Fix Meridian Scepter not damaging the victim (would just give the wither effect)
2016-04-10 15:23:43 +01:00
Ben
fe89a5b68e
Fix the Recall rare item duplication bug
2016-04-10 14:50:00 +01:00
Ben
67a36dc7e4
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-10 12:56:30 +01:00
Ben
66274188c8
Add a /we random command to spawn a random world event
2016-04-10 12:56:00 +01:00
Ben
37bb64bffd
Fix Undead Camps from spawning outside of the World Border.
2016-04-10 12:47:56 +01:00
Ben
3ee1f86841
Fix Null Pointers in the ender chest blocker and regular chest blocker for incognito staff.
2016-04-10 12:36:31 +01:00
Ben
8ee2c02dd9
Disable the use of Ender Chests
2016-04-10 11:20:51 +01:00
Ben
e8e73306be
Change the Giant's Broadswords regeneration effect level from 41 to 3
2016-04-10 11:15:43 +01:00
Ben
dd3e009413
Remove silent chest opening mechanism (which was completely broken), and instead don't allow incognito staff to open chests
2016-04-10 10:53:07 +01:00
Conrad S
ccf9d4a4c2
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
2016-04-09 13:01:04 -04:00
Thanos paravantis
ea6219984a
Add missing Spleef challenge to removed package
2016-04-09 11:06:46 +03:00
Thanos paravantis
0b780c8e99
Fix teleport delay and incorrect win placement.
...
Players that die during a challenge have the ability to fly
around as spectators. Although, once the challenge was ended
their fly mode was removed and they would fall for a very short
amount of time, which was noticeable. With that fix, players
now get reset once they are teleported to the spawn locations
of the next challenge. That happened because during the player
reset and spawn teleportation, the map would be generated, as a
result, causing a very small notable delay.
Moreover, win placement was fixed. In the previous version, the
third player would appear as second and the second player would
appear as the third one. The cause of this issue was that, after
the second and the third player is added to the winner list, the
last player that is remaining alive is added as first. To fix that,
I've implemented a swap method that changes the location of the
second with the third player.
2016-04-09 11:04:23 +03:00
Keir Nellyer
eb01cd41f1
Move display item responsibility over to ReportResultButton
...
Previously ReportResultPage handled this.
2016-04-09 00:51:05 +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
4bf19eebad
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-09 00:37:40 +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
Ben
6e9ae04118
Cut Gem to Gold conversion rate down to 16 Gems per Gold, instead of 32
2016-04-09 00:27:24 +01:00
Keir Nellyer
8b6b3db412
Remove old pre-mavenisation files
2016-04-09 00:17:58 +01:00
Keir Nellyer
6efb8d806d
Re-enable category threshold check
...
This was disabled for testing reasons.
2016-04-09 00:02:59 +01:00
Keir Nellyer
cb434b7518
We no longer need to store IDs or notify thresholds (new system will work differently)
2016-04-09 00:00:11 +01:00
Keir Nellyer
bd7e26ef08
Fix error causing enum readable names to fail to generate correctly
2016-04-08 23:49:07 +01:00
Conrad S
05b31725a8
Fix initialization NPE.
2016-04-08 18:48:16 -04:00
Ben
a04f7c23c6
Disable incognito for staff in hub invisibility, and vice-versa
2016-04-08 20:18:56 +01:00
Conrad S
8a2efa2f0b
Make sure a user has enough gold to make a purchase.
2016-04-08 10:48:55 -04:00
Keir Nellyer
95507a740c
Move button specific values from ReportCategory to ReportCategoryButton
...
This is done to separate the code out so that we can add a GLOBAL
value to the enum for handling of ABUSIVE reports (these types of
reports do not have a specific category). In its current state
it's is very closely inter-twined.
2016-04-08 00:33:29 +01:00
Keir Nellyer
c1354081ea
Implement ReportProfile
...
This class is used to hold report-specific data about a user, such as the amount of successful or failed reports the user has filed.
It also contains the total amount of abusive reports a user has filed, all this data will be used to calculate the user's reputation.
2016-04-07 22:45:15 +01:00
Ben
79a2ef3608
Fix staff members getting unhidden when in incognito whenever players are shown to the player (can happen when a regular player toggles player vision, and the staff member gets shown to all other players.)
2016-04-07 22:24:47 +01:00
Joseph Prezioso Jr.
59001bdef6
Fix merge-related errors
...
Fix, polish, and re-implement Elo code.
2016-04-07 16:40:30 -04:00
Ben
2c05743f62
Stop using static with Siege Manager
2016-04-07 21:01:25 +01:00
Keir Nellyer
36e79a1504
Add header to every class as per new coding standards.
2016-04-07 14:44:27 +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
Ben
c484a80a14
Remove incorrect import
2016-04-07 08:12:05 +01:00
Ben
b70ff03185
Fix siege weapon crater being spawned at the lowest block at the current collision location.
...
This was causing issues when Cannons were fired at a vertical wall, and would not do any damage to the wall as it would just do damage to the blocks at the nearest ground block.
2016-04-07 08:11:37 +01:00
Ben
f2ac2d87bf
Remove debug command, that could be very abused
2016-04-07 08:07:18 +01:00
Ben
9ccec50fd0
Remove unnecessary database calls that checked for siege weapons remaining in the database, which is not possible, as siege weapons clean themselves up.
2016-04-07 08:06:16 +01:00
Ben
eed3df720a
Disable incognito mode for staff members that have been demoted whilst using it.
...
Also fixes a bug that caused IncognitoHidePlayerEvent fire even if the player logging in does not have incognito mode enabled.
2016-04-07 07:00:46 +01:00
Ben
3a8ab581dd
Add JavaDoc to new classes to comply with the new standards
2016-04-07 06:52:52 +01:00
Joseph Prezioso Jr
91e550bdcc
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/FinishCommand.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/TutorialCommand.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java
2016-04-06 19:40:01 -04:00
Joseph Prezioso Jr
a07e71ba08
GameOption takes a generic value to eliminate the need for more than the one GameOption class.
...
Remove the--now unnecessary--classes that inherited from GameOption.
Consequently, the creation and implementation of GameOptions should be much more efficient.
Note: it may be necessary to add decimal points to doubles and to cast 'long' data types as 'long'.
The above note generally applies to numerical values, but may apply to other values, as well.
2016-04-06 18:10:31 -04:00
Joseph Prezioso Jr
f030f78f08
Add headers to new classes, so as to comply with coding standards.
...
To that end, change methods to camel case and refactor them, so that the newly-renamed methods do not result in errors.
2016-04-06 16:20:26 -04:00
Ben
d75d63a81a
some missing files and blacklist barrier block from block toss
2016-04-06 18:26:56 +01:00
Jonathan Williams
8b42de03cb
Debug messages for PoisonShock
2016-04-06 10:39:00 -05:00
Ben
d25f1abfbf
stop iron door from being opened by players not in clan (outpost)
2016-04-05 23:49:16 +01:00
Ben
738825ea9d
perms for tutoirial command
2016-04-05 23:37:08 +01:00
Ben
4bdd33c87b
blowing holes in the ground and interacting with cannon sometimes not working
2016-04-05 23:15:38 +01:00
Ben
744d8891b4
import
2016-04-05 22:58:03 +01:00
Joseph Prezioso Jr
09db5a8131
I'm committing this so I can checkout to a different branch
2016-04-05 16:41:50 -04:00
Joseph Prezioso Jr
c6c52885a9
Fixed commit
2016-04-05 15:16:40 -04:00
Ben
be63012d18
make trainees+ not count to kicked player count
2016-04-05 12:43:19 +01:00
Ben
876a7a8eb6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-05 12:37:23 +01:00
Ben
cfac41f216
full server trainee+ fix
2016-04-05 12:37:04 +01:00
Jonathan Williams
dd5b2d5e3f
Fixed NPE with poison condition effect.
2016-04-05 00:36:18 -05:00
Jonathan Williams
e23362bd6f
Fixed NPE in OrderedObjective
2016-04-05 00:36:00 -05:00
Jonathan Williams
b34a175a2b
Fixed error in Outpost throwing NPE.
2016-04-05 00:35:44 -05:00
Shaun Bennett
ae87db1742
Fix TNT generator timings
2016-04-05 13:04:52 +10:00
Shaun Bennett
23232efd63
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 13:04:39 +10:00
phobia
b0dd51843b
Ride horse delay
2016-04-05 10:58:31 +10:00
Ben
7f92a3c048
incognito changes
2016-04-05 00:38:27 +01:00
Jonathan Williams
cd5ad89f51
Made clans sort by server number.
2016-04-04 17:46:51 -05:00
Jonathan Williams
53b25e6ee0
Fixed diamonds not selling in shops.
2016-04-04 17:46:35 -05:00
Jonathan Williams
6558b16004
Fixed endless loop crash bug with Gear attributes.
2016-04-04 17:46:22 -05:00
Jonathan Williams
8ea0051181
Fixed customer support menu not showing if monthly bonus hasn't been claimed.
2016-04-04 17:46:03 -05:00
Jonathan Williams
2d296d9226
Removed debug ResourcePack Message
2016-04-04 17:45:34 -05:00
Jonathan Williams
efa18d394b
Fixed Incognito not saving status.
2016-04-04 17:45:10 -05:00
Jonathan Williams
2fa0787792
Clans now load, added connection property to null zero date timestamps.
2016-04-04 16:31:37 -05:00
Jonathan Williams
2b3e466469
Removed pesky '?' causing login query to stall.
2016-04-04 16:30:57 -05:00
Ben
7de23216f6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 20:41:10 +01:00
Ben
b3b72f1ca0
commenting out clans bans
2016-04-04 20:40:58 +01:00
Jonathan Williams
02459c6a10
Fixed bad implementation of IncognitoManager that was locking up threads.
...
Temporarily disabled MessageManager's handling of Incognito.
2016-04-04 13:48:26 -05:00
Jonathan Williams
60010f90b4
Load simple clan token on player login to reduce overhead.
...
Increased dbpool connections to 4
2016-04-04 13:47:45 -05:00
Jonathan Williams
a91ef68978
Fixed CCM in WarPointEvasion.
...
Removed debug message; NOT RIDER
2016-04-04 13:46:39 -05:00
Jonathan Williams
e2baf2b56c
Updated Clans to use the new ResourcePackManager.setResourcePack method.
2016-04-04 13:46:00 -05:00
Jonathan Williams
1b1e6f6ef5
Moved the redis operation before asking for a mysql connection
2016-04-04 13:45:20 -05:00
Jonathan Williams
781c4bfdbd
Removed db call off main thread for ClanServerPage
2016-04-04 10:31:13 -05:00
Jonathan Williams
91ddac9643
Added world checking for boundary stuff.
2016-04-04 10:30:59 -05:00
Jonathan Williams
e8da5ca0f2
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 10:02:01 -05:00
Jonathan Williams
228a001696
Added Shift Left clicking to the ban list for Cannon :D
2016-04-04 10:01:50 -05: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
14207c2073
clansbans
2016-04-04 14:56:20 +01:00
Ben
8330ef560d
not rider spam
2016-04-04 14:55:47 +01:00
Shaun Bennett
fecd3c1eaa
Final changes
2016-04-04 23:28:38 +10:00
Ben
02cb0e1f7e
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/objective/AttackEnemyObjective.java
2016-04-04 13:52:44 +01:00
Ben
1dde17b9cc
shooters still shotting fix
2016-04-04 13:51:05 +01:00
phobia
e85a1e6a3b
fixes to breakingand placing in claim
2016-04-04 22:22:07 +10:00
phobia
4262a4d4b7
Increase radius + delete iron doors after done
2016-04-04 22:07:58 +10:00
phobia
963bba06f7
fix for displaying territorial movements
2016-04-04 17:47:58 +10:00
phobia
2e0c9d3965
Remove potatoe message
2016-04-04 17:34:39 +10:00
phobia
aaccb6fd48
Join/leave/death messages
2016-04-04 17:20:21 +10:00
Shaun Bennett
15c4b2dd58
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 17:11:15 +10:00
Shaun Bennett
23e116f9b5
Region fixes
2016-04-04 17:10:52 +10:00
phobia
56a087612b
Changes to explain energy goal
2016-04-04 16:58:16 +10:00
Shaun Bennett
be8ed78caa
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 16:46:17 +10:00
Shaun Bennett
02f774ce94
A lot of bug fixes
2016-04-04 16:45:20 +10:00
Jonathan Williams
85fabd525a
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 00:59:25 -05:00
Jonathan Williams
400d2f0cca
Added bonus log view for customer support.
2016-04-04 00:59:13 -05:00
Shaun Bennett
543719b95d
More tutorial fixes
2016-04-04 14:47:33 +10:00
Cheese
040026724b
renamed tutorials
2016-04-04 14:10:26 +10:00
Cheese
29bcd6aeea
more text cahnges
2016-04-04 13:30:15 +10:00
Cheese
88e56f2ffb
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java
2016-04-04 13:03:24 +10:00
Cheese
6c92b42335
text changes
2016-04-04 13:01:54 +10:00
Shaun Bennett
29f2442be8
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 12:53:07 +10:00
Shaun Bennett
8dee8eab0a
Bug fixes
2016-04-04 12:52:52 +10:00
phobia
3173adca53
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 12:49:00 +10:00
phobia
5ad877f864
So many fixes <3
2016-04-04 12:47:23 +10:00
Shaun Bennett
0a39b7b756
Fix objective ordering
2016-04-04 12:36:47 +10:00
Shaun Bennett
e11a9379b9
More tutorial tweaking
2016-04-04 12:32:22 +10:00
phobia
5195e4a13d
Message fixes
2016-04-04 10:15:15 +10:00
phobia
c3a119cfe4
Display completion only to player who completes
2016-04-04 10:11:26 +10:00
Ben
a1f284670a
make zombie npcs actually look at the player
2016-04-03 23:49:22 +01:00
Ben
3ff5e6d337
npc fixes
2016-04-03 18:47:31 +01:00
Ben
7558bd01b7
ensure zombies don't burn to death, by losing equipment
2016-04-03 18:29:13 +01:00
Ben
40361acc9b
fixed cannon becoming off-center
2016-04-03 17:51:56 +01:00
Ben
ccdd1f901f
cannon 1.9 fixes
2016-04-03 17:23:55 +01:00
Thanos paravantis
cc68b7087a
Change wool color on Wave Crush challenge
...
During map generation, the wool color is now predetermined and not
random.
2016-04-03 17:15:20 +03:00
Thanos paravantis
18ff9c23f7
Modify block removal from Wave Crush challenge
...
The removeExtraBlocks() method was changed, in order to include all
arena blocks. The previous version did not remove all extra blocks,
as it was using the getArenaSize() method inside the for-loop, which
returns a different integer depending on the challengers.
To fix that, I've implemented the '_arenaStartSize' field to store the
starting arena size value that is used in the map generation method.
2016-04-03 16:53:14 +03:00
Thanos paravantis
114fac2655
Refactor Red Light Green Light challenge
...
Separated functionality into different methods in order to improve
readability and maintainability. All four abstract methods were
updated, in order to make sure they work as intended without any
second thoughts.
Moreover, a PlayerQuitEvent listener was added to remove players from
the '_cooldown' array list and a null check in the onEnd method, to
prevent any null pointer exceptions.
Also, there were some minor display changes, regarding titles and chat
messages on the moveTextAndSound() and cannotMoveTextAndSound() methods.
Lastly, the bedrock layer was removed from map generation.
2016-04-03 16:49:31 +03:00
Ben
f4d4b5c5df
siege weapon interaction fix
2016-04-03 14:08:40 +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
Ben
f5623f00f9
blacklist npe fix
2016-04-03 13:47:57 +01:00
phobia
3ae347653a
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-03 21:33:13 +10:00
phobia
c92d291e96
Shift clicking TNT into the cannon + iron doors fixed
2016-04-03 21:32:56 +10:00
Jonathan Williams
8f58a456b1
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-03 01:37:40 -05:00
Jonathan Williams
401127caa9
Reworked Monthly bonuses so they always succeed and it logs them.
2016-04-03 01:36:30 -05:00
phobia
759911396a
More clans bug fixes + message tweaks
2016-04-03 16:11:47 +10:00
phobia
5e41c22fc7
- The "WARNING: Clan energy is running very low" message should appear after I get the Buy Energy objective
...
- Need a congrats message/title when tutorial is completed
- Force user to claim via gui
2016-04-03 13:39:32 +10:00
phobia
45cbeef83d
- /c sethome shows the wrong message when the bed can't be placed
2016-04-03 13:32:49 +10:00
phobia
9f4a2ff7ce
- Shift clicking TNT into the cannon does not work
...
- /c map doesn't work in tutorial (could just remove /c map completely)
2016-04-03 13:31:13 +10:00
phobia
664d8b1a4e
Fixes for clans tutorial
2016-04-03 11:04:57 +10:00
Thanos paravantis
f454a6de81
Comment game classes and remove unnecessary checks
...
Added comments on game classes, except challenges
and statistics trackers.
Removed challenge validity checks from onCollide method in Anvil Dance
and Falling Blocks, since that is now handled on the Collide method
located in the main game class.
2016-04-02 22:49:56 +03:00
Thanos paravantis
12b90501e2
Refactor Wave Crush challenge
...
Separated functionality into different methods in order to improve
readability and maintainability. All four abstract methods were
updated, in order to make sure they work as intended without any
second thoughts.
Also, a new PlayerQuitEvent listener is added, in order to remove
players from the '_survivedWaves' hash map, which keeps track of
the waves every player survived.
Lastly, onCollide if-statement logic was reversed to reduce and
simplify the lines of code inside the method.
2016-04-02 22:10:43 +03:00
phobia
b4cfbebf3f
Fix issue with seeling potatoes
2016-04-02 22:53:41 +11:00
phobia
d4e9f638da
Fixed a crash bug with title message being too long + other fixes
2016-04-02 22:26:21 +11:00
phobia
cc09bf6b51
Fixes to Bull Charge + Adding more instructins to purchasing
2016-04-02 21:43:33 +11:00
William Burns
15cf7f574d
Fix join/quit messages.
2016-04-02 11:08:40 +01:00
William Burns
6072753624
Fix shop objective description.
2016-04-02 10:50:46 +01:00
Shaun Bennett
b960925522
Fixes
2016-04-02 20:42:41 +11:00
phobia
5a31be1138
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-02 20:33:09 +11:00
phobia
673dd327ff
Push for shaun Fireworks
2016-04-02 20:29:56 +11:00
Jonathan Williams
e4b2492b35
Fixed ObjectiveGoal's finish from creating CCMs.
2016-04-02 03:03:17 -05:00
Jonathan Williams
ff41ad248a
Removed PvpTimer
...
Fixed issue where StatManager and FriendManager were created twice.
2016-04-02 02:47:17 -05:00
Jonathan Williams
a6710280fb
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-02 00:45:10 -05:00
Jonathan Williams
01d9c1cd09
Finished the <?> for Objective and ObjectiveGoal.
2016-04-02 00:45:01 -05:00
Shaun Bennett
d161d83d12
Maps and other various fixes
2016-04-02 15:43:03 +11:00
Shaun Bennett
5739b1b87b
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-02 15:13:16 +11:00
Jonathan Williams
3bc1908b57
Fix player quit staying in _active list for Objectives.
2016-04-01 23:10:15 -05:00
Shaun Bennett
758004f207
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-02 14:55:14 +11:00
Jonathan Williams
fa6d18b0fa
Fix sync db call inside sendMessage
2016-04-01 22:43:09 -05:00
Cheese
8f959a73eb
debug
2016-04-02 12:46:25 +11:00
Cheese
9969b7d783
support for resource packs for different MC versions
2016-04-02 11:39:40 +11:00
Shaun Bennett
0abcd0044b
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-02 10:53:28 +11:00
Joseph Prezioso Jr
6e23a17acb
Removed unnecessary code.
2016-04-01 16:01:57 -04:00
phobia
90e336b18e
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-01 21:51:51 +11:00
phobia
42fd210b20
PC-56
2016-04-01 21:51:31 +11:00
Jonathan Williams
fe41e79e8a
Fixes:
...
10 minute timer for creating clan after tutorial.
CCM with LeaveSpawnGoal
Synchronous database calls.
2016-04-01 01:55:08 -05:00
phobia
9a1e5099a4
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-01 14:04:12 +11:00
phobia
d0bc40b991
PC-56 and PC-65
2016-04-01 14:01:38 +11:00
Shaun Bennett
49441cfaf4
PC-63 and PC-64
2016-04-01 10:47:21 +11:00
Ben
3412082f37
PC-61 - Remove all diamonds from inventory after sell diamonds objective
2016-04-01 00:33:42 +01:00
Ben
da99a12b23
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 20:03:50 +01:00
Ben
d353c53524
remove hard-coded access to certain commands for my uuid/name
2016-03-31 20:03:25 +01:00
Joseph Prezioso Jr
5e1003cccb
Missed a minus sign in my previous commit.
2016-03-31 14:06:45 -04:00
Joseph Prezioso Jr
6ccc6df6aa
Elo calculations now account for player's Elo, relative to the average Elo among players
2016-03-31 13:57:21 -04:00
William Burns
4ec833727f
PC-20 - Detailed Objective Text
2016-03-31 18:45:17 +01:00
Joseph Prezioso Jr
cbb9798c35
Added AdjustPlayertElo method to increment/decrement the Elo's of individual players at the end of a game. Currently calling the new method in AnnounceEnd.
2016-03-31 12:49:22 -04:00
phobia
19b2b00a13
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 20:35:40 +11:00
phobia
86bdbbb8bc
PC-46 + adding in events for buttons
2016-03-31 20:35:21 +11:00
Shaun Bennett
682c365bc6
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-31 20:09:16 +11:00
Shaun Bennett
b3392e78f5
PC-28 - Improve Flow of Tutorials
2016-03-31 20:08:45 +11:00
AlexTheCoder
4ae4f056ea
- Map Polish
2016-03-31 03:46:43 -04:00
AlexTheCoder
40175db217
- Lots of polish
2016-03-31 03:41:07 -04:00
Shaun Bennett
30a098c645
PC-49 - Kick players out of their clan when they start the tutorial if they have one (from previously playing the tutorial).
2016-03-31 18:24:47 +11:00
Shaun Bennett
7c70092f3b
PC-48 - Create a hologram saying "Jump Off" at the edge of spawn island
2016-03-31 18:19:06 +11:00
Shaun Bennett
e7b9d866ae
PC-57 - Rename Identify Fields to Identify Fields on Map
2016-03-31 17:10:56 +11:00
Shaun Bennett
c51830145e
PC-58 - Close gate to the fields after you sell diamonds
2016-03-31 17:09:51 +11:00
Shaun Bennett
f229da1327
PC-55 - Remove all potatoes from inventory when player completes "Sell Potatoes"
2016-03-31 17:08:26 +11:00
Shaun Bennett
25975e47b8
PC-54 - Rename Identify Shops to Identify Shops on Map
2016-03-31 17:07:08 +11:00
Shaun Bennett
7867da277d
PC-52 - Rename Identify Enemy Clan to Identify Enemy on Map
2016-03-31 17:05:59 +11:00
Shaun Bennett
50518250de
PC-51 - Rename randomClan to EnemyClan
2016-03-31 17:02:38 +11:00
Shaun Bennett
44abf8f1e2
Naming fixes
2016-03-31 16:47:16 +11:00
Ben
62280a8fa5
Fix diamond from flying far away when breaking diamond blocks in the fields
2016-03-31 01:11:30 +01:00
Ben
622843ca8e
PC-47 - Remove item drops from tutorial cannon hit
2016-03-31 01:08:01 +01: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
Joseph Prezioso Jr
b1c29a4fa6
Setup proper Elo brackets with the top 1% being placed in diamond. Also changed starting Elo to 1400 (middle of Iron 1), leaving Coal as a purely regressive division.
2016-03-30 16:06:30 -04:00
Thanos paravantis
51820faceb
General bug fixes and minor changes.
2016-03-30 19:30:22 +03:00
phobia
978f978023
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-30 23:01:55 +11:00
phobia
d6560fcf5c
Fixes to Clan info goal
2016-03-30 23:01:39 +11:00
Shaun Bennett
5652eb75cf
Fix NPE in MountCannonGoal
2016-03-30 22:33:23 +11:00
William Burns
5149043d14
PC-38 - Don't open gate until player is 12 blocks away
2016-03-30 01:09:29 +01:00
William Burns
ed65f19417
PC-42 - Fireworks and Effects at end of tutorial
2016-03-29 23:41:31 +01:00
Joseph Prezioso Jr
00ee594f28
Missed one file last time
2016-03-29 17:50:45 -04:00
Joseph Prezioso Jr
6048c97b52
Tweaks to clean/clarify things
2016-03-29 17:50:06 -04:00
Joseph Prezioso Jr
51cd770d38
Changes to help smooth the transition into using EloSettings.
2016-03-29 16:00:57 -04:00
Joseph Prezioso Jr
35fc5223b1
reverted previous changes back to lastIndexOf (and altered comments accordingly) on the advice of SJSampson (with whom Sigils agreed)
2016-03-29 14:03:21 -04:00
Joseph Prezioso Jr
0c479e1562
Made change to Elo calculation under Sigils' advisement. Now using indexOf, rather than lastIndexOf to find Elo
2016-03-29 14:00:59 -04:00
William Burns
1d4472255f
PC-40 - Add cooldown to Tutorial /c home
2016-03-29 18:50:28 +01:00
Joseph Prezioso Jr
f496392c5a
EloDivision class created.
...
EloManager can now calculate division ranking (EloDivision can also do this once we are ready for it to)
2016-03-29 13:49:59 -04:00
William Burns
0bbfbff0b8
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-29 18:03:49 +01:00
William Burns
2fcd809447
PC-34 - Effects/Particles when you blow up enemy
2016-03-29 18:03:28 +01:00
phobia
cd2d4c0f37
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-29 22:47:39 +11:00
phobia
e75c7a3c91
PC-29 + fixes
2016-03-29 22:47:03 +11:00
phobia
eab7cbe385
PC-35
2016-03-29 16:29:03 +11:00
William Burns
f2d450d26b
PC-30 - Claim land objective should use clan GUI
2016-03-29 00:07:50 +01:00
William Burns
fc473275b0
PC-37 - Move Identify shops objective before go to shops
2016-03-29 00:02:07 +01:00
Joseph Prezioso Jr
38a079846d
Some basic ideas for Elo I will be experimenting with
2016-03-28 18:14:52 -04:00
Joseph Prezioso Jr
d8d952691b
cleaning up my code a bit
2016-03-28 13:40:34 -04:00
Joseph Prezioso Jr
abcdadc8d0
Corrected a small error in GameOption.
2016-03-28 12:40:41 -04:00
William Burns
f8211f26cc
PC-18 - Remove PVP Safety Message in Tutorial
2016-03-28 13:36:43 +01:00
William Burns
3d0d7f9d71
PC-43 - Remove join/quit messages while in tutorial
2016-03-28 12:38:57 +01:00
phobia
fd3a04e794
Fixes for tutorial
...
PC-39 "about energy"
PC-32 Tutorial set home bed
PC-27 Change /c GUI for creating clan
PC-41 Disband via gui not command in tutorial
2016-03-28 22:13:28 +11:00
Shaun Bennett
fa0594b5db
PC-24 - Update Spawn Island Hologram
2016-03-28 13:55:37 +11:00
Shaun Bennett
9ff7e2da82
PC-21 - Combine Tutorial 1 and 2
2016-03-28 11:52:18 +11:00
Shaun Bennett
f7c57a7699
PC-22 - Update Scoreboard Text
2016-03-28 11:47:16 +11:00
Shaun Bennett
8c1b91cbf5
PC-23 - Hotbar Flashing Text
2016-03-28 11:37:35 +11:00
Shaun Bennett
2d30983711
Adjust visuals
2016-03-28 11:29:15 +11:00
Thanos paravantis
cd08e5581a
Fix volley pig challenge, apply minor changes and bug fixes on Infestation, Reverse Tag.
2016-03-27 17:45:58 +03:00
Ben
1aa4b4a47d
remove player from tutorial on kick
2016-03-27 15:36:54 +01:00
Ben
e4e40baf52
final stuff
2016-03-27 06:48:23 +01:00
Ben
b4d340a655
cb fixed
2016-03-27 06:21:32 +01:00
Ben
a175ead44a
finished tutorial!
2016-03-27 05:43:31 +01:00
Ben
a30a591b58
disable certain clans commands whilst in tutorial
2016-03-27 02:04:33 +01:00
Ben
a8bd0e4406
add current Clan Outpost to travel shop
2016-03-26 23:20:03 +00:00
Ben
2070f0925d
teleport to spawn after tutorial ends
2016-03-26 22:49:06 +00:00
Ben
0559ad9567
remove "you have not set a home" message and added a set home message
2016-03-26 22:45:20 +00:00
Ben
23cfa8ec25
mine diamonds fix (have to mine 11 instead of 10)
2016-03-26 22:36:27 +00:00
Ben
f201898420
mine diamond fix
2016-03-26 22:35:06 +00:00
Shaun Bennett
970d5a307c
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-27 09:17:39 +11:00
Shaun Bennett
bace0b2557
Add Mining shop Location
2016-03-27 09:14:12 +11:00
Ben
9e0ba029b4
uhhh what
2016-03-26 22:10:19 +00:00
Shaun Bennett
caf8170a32
Tutorial Changes
2016-03-27 08:47:34 +11:00
AlexTheCoder
2530bc512e
- Fixed some more buggies
2016-03-26 14:02:18 -04:00
William Burns
c1adb7e1bc
Remove Slack attachment functionality (for now).
2016-03-26 13:12:59 -04:00
William Burns
29966195ee
Create an API for sending Slack message to multiple teams and channels.
2016-03-26 13:07:41 -04:00
AlexTheCoder
bb28b7ad89
- Forgot to comment out 2 lines
2016-03-25 20:27:17 -04:00
AlexTheCoder
6678dffb61
- Updated everything for Sigils and chiss
2016-03-25 20:25:43 -04:00
Joseph Prezioso Jr
57a1e06406
no message
2016-03-25 20:11:35 -04:00
Joseph Prezioso Jr
f7575360db
Setting up a class to handle Materials as GameOptions
2016-03-25 16:42:39 -04:00
Joseph Prezioso Jr
05ede7910e
All errors have been fixed.
2016-03-25 15:27:11 -04:00
Joseph Prezioso Jr
262c6c2fa6
Quick Lunch-time bug-squashing update. Still have tons of errors to go through, but I want to make sure everything is backed up, should the weather turn foul(er) and a power outage should occur
2016-03-25 13:53:20 -04:00
Joseph Prezioso Jr
c1ef185e82
Flags have been changed and I have started to get rid of the errors that have started cropping up.
2016-03-25 12:48:39 -04:00
Ben
a35bbeefdd
attack enemy goals
2016-03-25 12:38:01 +00:00
Ben
dade54e5fe
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-25 04:02:16 +00:00
Ben
195c990e29
further tutorial progress
2016-03-25 04:01:57 +00:00
Shaun Bennett
8c7d653cca
Store location for teleport home
2016-03-25 13:13:15 +11:00
Shaun Bennett
8afed30c5a
basic classes objectives
2016-03-25 13:07:53 +11:00
Ben
d23804be70
fixes for shaun
2016-03-25 01:33:55 +00:00
Ben
87b1bf7dd0
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
2016-03-25 01:30:46 +00:00
Ben
3cd7a5f12a
NPE fix for cannons and more
2016-03-25 01:29:55 +00:00
Shaun Bennett
c221e0e24f
Fix potatoes
2016-03-25 12:26:13 +11:00
Ben
17c214c282
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/objective/ClanObjective.java
2016-03-25 00:08:28 +00:00
Ben
88b0ea1b72
tutorial progressss es
2016-03-25 00:06:51 +00:00
Shaun Bennett
d5a89dc7fe
Push for ben again
2016-03-25 11:05:05 +11:00
Joseph Prezioso Jr
667ec03f06
Still a few more flags to go. I'll get to them tomorrow. Hopefully, I'll also figure out where/if I need to change things elsewhere in the code.
2016-03-24 18:43:02 -04:00
Shaun Bennett
7c06186a4f
Fix cleanup and setup
2016-03-25 09:42:41 +11:00
Joseph Prezioso Jr
eb6c385936
More flags changed
2016-03-24 17:52:02 -04:00
Joseph Prezioso Jr
0246ec275e
More flags have been changed to use the new Game Options. WHY IS NOTHING BREAKING!? Not that I'm complaining. Just really confused...
2016-03-24 17:47:07 -04:00
Shaun Bennett
628604c353
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-25 08:44:08 +11:00
Shaun Bennett
051539dbf6
Add cleanup and setup
2016-03-25 08:43:37 +11:00
Ben
af87dc9384
unsynchronized siege weapon support
2016-03-24 21:26:40 +00:00
Ben
c381cc8fd7
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-24 21:14:34 +00:00
Ben
cfb84dd545
fixes for shaun
2016-03-24 21:14:13 +00:00
Shaun Bennett
85511b4c26
Fixes for ben
2016-03-25 08:13:30 +11:00
Joseph Prezioso Jr
b5d3a6b8c3
Small fix to last commit so that everything works while I continue working on getting GameOptions working
2016-03-24 16:34:16 -04:00
Joseph Prezioso Jr
4e02258124
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-03-24 16:32:33 -04:00
Ben
f000360565
missing a few files
2016-03-24 19:29:45 +00:00
Ben
2ef604aeaf
attack enemy goal
2016-03-24 19:11:05 +00:00
Ben
7920f2729b
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-24 08:59:09 +00:00
Ben
2eb4d89875
i think clans ban is broken in this commit, and i removed some unnecessary spammy debug messages.
2016-03-24 08:58:48 +00:00
Shaun Bennett
4e26d2c7f1
Push code for ben
2016-03-24 19:37:56 +11: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
Jonathan Williams
105f62e563
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-03-23 16:02:30 -05:00
Jonathan Williams
ee22274ef5
Removed Stacker debug messages.
2016-03-23 16:02:06 -05:00
Shaun Bennett
3d473ad00a
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-23 20:39:21 +11:00
git
4dd756286e
Fix small resource pack bug
2016-03-23 20:32:13 +13: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
Shaun Bennett
1e73adf2af
Increase ram and cpu for event server
2016-03-23 10:23:04 +11:00
Shaun Bennett
656780d027
Change runAsync in MiniPlugin to use our own thread pool
...
This allows the tasks to run immediately. Using Bukkit's scheduler the async task wont start until the next server tick
2016-03-23 10:22:40 +11:00
Shaun Bennett
da9a642a6d
Process item for treasure before opening
2016-03-23 10:21:36 +11:00
Shaun Bennett
309b5464f2
Clean up Account Repository, attempt to load account ID from cache
2016-03-23 10:21:02 +11:00
Shaun Bennett
a107c38f28
Comment out missing ring game kit so we can compile
2016-03-23 10:18:22 +11:00
Shaun Bennett
85cb065d5c
Merge pull request #14 from Mineplex-LLC/Dual_1.9
...
1.9 Bugfixes + Ring game
2016-03-22 19:25:37 +11:00
Jonathan Williams
c9fdd83e17
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-03-21 20:31:04 -05:00
Jonathan Williams
2cff7003e6
Added more debug to Stacker interaction.
2016-03-21 20:30:54 -05:00
Ben
2e41f906d0
moved completely to database managed clan blacklist, instead of the old hard-coded way
2016-03-21 22:37:35 +00:00
Thanos paravantis
72994656dd
Improve dragon egg handling. Implement chat silence during challenge description.
2016-03-21 22:06:49 +02:00
Shaun Bennett
61b79fab9d
Merge pull request #13 from Mineplex-LLC/PC-15
...
Fix PC-13, PC-15, PC-16, PC-17
2016-03-21 20:31:58 +11:00
md_5
55e64a09b9
Test Gem Booster Item
2016-03-21 20:08:40 +11:00
md_5
0f83e302dd
Maintain game type boost queue across network.
2016-03-21 19:22:47 +11:00
Jonathan Williams
b4dfeb224b
Reduced NCP exempt time by .5s.
2016-03-21 02:06:11 -05:00
Ben
264e5d34b2
missing some files
2016-03-21 05:52:02 +00:00
Jonathan Williams
faf6834e23
Added some protection for stacker and offline players.
2016-03-20 16:27:59 -05:00
Thanos paravantis
644e7a08bb
Bug fixes (detailed description below) and hit box improvements.
...
- Cancel teleport event to prevent the game from breaking.
- Block Lobbers: Fix falling block spawning and item drops.
- Color Change: Fix platform not spawning after first stage.
2016-03-20 23:26:55 +02:00
Jonathan Williams
750b960b46
Fixed references to snake events.
2016-03-20 16:24:11 -05:00
Jonathan Williams
109190ee58
Moved snake events to their own classes.
...
Memory cleanup for Snake.
2016-03-20 15:54:04 -05:00
Jonathan Williams
262f659ffa
Fix with TurfForts infinite while loop.
2016-03-20 15:46:57 -05:00
Thanos paravantis
f57bd37116
Rush push, cloud fall and treasure digger updates/refactoring. Added /mark command to reveal and correct misplaced spawn locations.
2016-03-20 17:20:40 +02:00
Thanos paravantis
8084897782
Rush Push: Update custom damage event listener.
2016-03-20 12:14:09 +02:00
Thanos paravantis
c080bc31ab
Refactor rush push challenge, update win placement.
2016-03-20 11:10:16 +02:00
Jonathan Williams
3bc8dd0098
Fixed bug with infinite loop in Bridges MushroomSpawn.
2016-03-20 00:32:33 -05:00
Ben
723f62b8f9
incognito fixes and loads of other fixes
2016-03-20 01:06:46 +00:00
Jonathan Williams
8427ead097
Changed how currency types is initialized to avoid possible NPE
2016-03-19 15:33:16 -05:00
Thanos paravantis
1a51f51f60
Refactor color change, reverse tag and treasure digger challenge.
2016-03-19 17:36:27 +02:00
Thanos paravantis
115508cf72
Refactor onChallengeUpdate method.
2016-03-19 16:14:56 +02:00
Thanos paravantis
4c8292e7c9
Update color change and reverse tag challenge, changes and improvements and spawnpoints update.
2016-03-19 16:01:42 +02:00
Ben
ef1d6ede24
many fixes
2016-03-19 06:31:37 +00:00
Ben
a21d43e58f
fix NPE
2016-03-19 06:13:39 +00:00
Ben
c4fbae4bd1
added clan name blacklist and changed clans ban GUI
2016-03-19 06:11:32 +00:00
Ben
6172be5d76
few changes
2016-03-19 00:13:31 +00:00
Ben
2e9562fc50
fixed NPE with one of the tutorial goals. fixed silent chest. fixed invsee, updated regions for new map
2016-03-18 22:31:36 +00:00
Thanos paravantis
dd6d128b44
Rename files to match challenge name, change kit description, refactor color change challenge.
2016-03-18 18:36:32 +02:00
Ben
8c7da5e98a
some goals didn't commit
2016-03-18 03:01:42 +00:00
Ben
3ba138a8d7
some more objectives.
2016-03-18 03:01:11 +00:00
Ben
995d454f87
tutorial additions.
2016-03-18 02:47:51 +00:00
Ben
3b764920e1
duplicate messages
2016-03-18 01:22:15 +00:00
Ben
a4cbe54c78
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-18 01:21:25 +00:00
Ben
2cf59ced8b
new pvp timer management, fixed build house task, fixed incognito
2016-03-18 01:18:35 +00:00
Ben
a3db70ad9c
clear player inventory on tutorial start (and give map)
2016-03-17 09:44:03 +00:00
md_5
4899d56c09
Implement local gem boosters that can be activated on a joined arcade server.
2016-03-17 19:49:05 +11:00
Ben
e6f4375041
build house goal [still broken]
2016-03-17 02:23:05 +00:00
Ben
929981419e
disable item dropping & block breaking
2016-03-17 01:52:36 +00:00
Ben
add651780b
priority chat filters, fixed siege weapon clicking listeners being incorrect
2016-03-17 01:06:07 +00:00
Ben
b164ff0729
Update res pack
2016-03-16 23:56:39 +00:00
Ben
1c1ed1613a
allow kill command while in void/after other damage methods
2016-03-16 23:56:30 +00:00
Ben
d625b20ea8
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-03-16 22:48:04 +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
2c9021fb81
some chat formatting
2016-03-16 22:31:35 +00:00
Joseph Prezioso Jr
7cf49dbe3b
Refactored code to correct errors from previous commit
2016-03-15 20:46:30 -04:00
Joseph Prezioso Jr
5fdd3e0872
Updated North, South, East, and West Spawns and Centers
2016-03-15 20:12:09 -04: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
7589c63904
analytics progress
2016-03-15 23:32:56 +00:00
Ben
8897f2e86e
fixed NPE
2016-03-15 23:11:08 +00:00
Ben
4638ba909d
siege weapon finalizations & analytics (wip)
2016-03-15 22:52:13 +00:00
Keir Nellyer
25075597f2
Only allow Ultra+ players to use /report whilst it's in beta testing.
2016-03-15 17:43:16 +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
d7de4381a3
add 200ms damage delay to cannon damages. and add temporary damage holograms
2016-03-15 00:49:37 +00:00
Ben
813a3833ae
implement temporary holograms
2016-03-15 00:48:50 +00:00
Ben
13bbcc51dc
remove cannon pickup feature
2016-03-15 00:23:59 +00:00
Ben
3ae89e12a8
improve cannon UI
2016-03-15 00:21:37 +00:00
Ben
c556d7b3c3
fix ConcurrentModificationException
2016-03-15 00:21:15 +00:00
Ben
864b12adbf
make cannons explode chest items
2016-03-15 00:20:40 +00:00
Ben
e08ba29ac1
Final fixing of cannon saving/loading
2016-03-14 22:48:31 +00:00
AlexTheCoder
3212b75e4e
- Finally finished all of chiss' changes
2016-03-12 09:35:44 -05:00
Thanos paravantis
2f96325f0c
Challenge refactoring.
2016-03-12 11:16:37 +02:00
Ben
422df69335
incognito async stuff and updated alpha holograms
2016-03-11 21:50:48 +00:00
Ben
bdfb55d4e1
nevermind [revert leap change]
2016-03-11 21:22:01 +00:00
Ben
bfdb7add2e
run siege weapon queries async
2016-03-11 21:04:22 +00:00
Ben
1008c58e91
removed catapult code as it's very out of date at this point (and it's not being used hehe)
2016-03-11 19:33:02 +00:00
Ben
eb0da6552c
add C.cBlue to name of Outposts & Cannons.
2016-03-11 19:31:24 +00:00
Ben
523c194c56
Fix data values not being correct in shop page.
2016-03-11 19:31:05 +00:00
Ben
d1c7879224
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-11 19:08:40 +00:00
Ben
45a0853564
remove test classes
2016-03-11 19:07:11 +00:00
Ben
86c50cc3cd
updates
2016-03-11 19:03:32 +00:00
Shaun Bennett
1228ca227e
Add support for 1.9 resource packs, Text Tutorials
2016-03-11 11:50:08 -06:00
Ben
2aa68d3e16
final stuff and map
2016-03-11 04:14:16 +00:00
Ben
a27fb90c2a
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-11 02:21:03 +00:00
Ben
0e276474c5
fixerroooniissssss
2016-03-11 02:20:18 +00:00
Ben
01ba099d74
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-11 01:52:38 +00:00
Ben
c9eb2c9559
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-11 01:52:31 +00:00
Ben
57c65cf5ff
some changes and vanish fixes maybe?
2016-03-11 01:47:14 +00:00
Ben
8ce32fcdfa
little tweakers
2016-03-11 00:58:47 +00:00
Ben
a568db6d90
remove eclipse file
2016-03-11 00:43:30 +00:00
Ben
bcfe4a42c0
changerooonis
2016-03-11 00:41:28 +00:00
Ben
33d978c6d6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-10 22:12:41 +00:00
Ben
20ade492a8
tnt generator changes
2016-03-10 22:09:45 +00:00
Shaun Bennett
76782fd420
Fix issues
2016-03-10 15:07:22 -06:00
Ben
c2f6217d9f
allowed sr. mods to use /we (TEMP)
2016-03-10 17:38:16 +00:00
Ben
0fd0a7fb44
mak esupply drop beacons more specific
2016-03-10 17:38:03 +00:00
git
557b0bf978
Fix Wither disguise
2016-03-11 01:55:49 +13:00
Ben
2d2e88e069
some fixes and updates
2016-03-10 02:47:48 +00:00
Ben
9b40496a1e
siege weapon picking up
2016-03-09 23:56:25 +00:00
Joseph Prezioso Jr
4955abb519
Hopefully, ELO Rating will be grabbed from the correct column now...
2016-03-09 17:12:04 -05:00
Ben
1532abcc62
disable nether and legendary fixes
2016-03-09 21:12:02 +00:00
Ben
70aa5d63fd
touched up on some messages
2016-03-09 13:10:39 +00:00
Ben
51e5552e2d
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-09 11:56:25 +00:00
Ben
cf6645cec7
Legendaries and other preparation for beta
2016-03-09 11:55:40 +00:00
phobia
e3fb40805c
all siege items shouldn't be able to be placed or used while on PvP timer.
...
Fixes to Jagged prefix
2016-03-09 22:46:45 +11:00
Virizion
67e844db29
Added /e bridge <seconds> PC-17
2016-03-08 21:21:53 -05:00
Ben
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
Virizion
6c0d18662f
Added /e clear <player or @a> PC-16
2016-03-08 20:45:23 -05:00
Ben
befb27d3db
Finalized Vanish system
2016-03-09 01:45:17 +00:00
Virizion
c89669aec9
Add /e announce <text> PC-15
2016-03-08 20:23:33 -05:00
Virizion
b1c8158e2f
Added @a argument to /shard, /gem and /giveitem PC-13
2016-03-08 19:52:31 -05:00
Joseph Prezioso Jr
059b964f22
eloRating now after warLosses so that it matches better with the SQL table
2016-03-08 17:06:13 -05: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
Ben
abdf61de0a
*more fixes*
2016-03-08 21:02:25 +00:00
Ben
af8f0fff16
vanish error fixes
2016-03-08 21:00:19 +00:00
Ben
69091c079f
Merge branch 'feature/incognito' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 20:58:11 +00:00
Shaun Bennett
9b65926d42
Fix rank monthly rewards description
2016-03-08 13:26:26 -06:00
Joseph Prezioso Jr
97f5b60404
Merge github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 13:56:05 -05:00
Ben
1f09616784
chat packet listener
2016-03-08 18:28:54 +00: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
e39b3de237
Fix errors
2016-03-08 12:12:44 -06:00
Ben
86ef10456c
packet hnadler beginning, switching to clans to fix errors
2016-03-08 18:10:57 +00: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
6b61d4aecd
Disable Alpha Manager.
2016-03-08 18:03:07 +00:00
Ben
036565abb7
more
2016-03-08 17:44:15 +00:00
Ben
0ff434cf91
progress
2016-03-08 16:49:32 +00:00
git
0f752fb7e3
Fix custom names in 1.9
2016-03-08 16:11:12 +13: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
9953388b92
iunvseeeeeeeeeeee
2016-03-08 00:32:36 +00:00
Ben
48cfe4d91c
fixed & inv see?
2016-03-08 00:27:06 +00:00
git
280d03daa7
Fix names
2016-03-08 09:52:30 +13:00
Thanos paravantis
1ee7a42b9c
Challenge refactoring, modify challenge ending and chat messages, add generateGrass helper method.
2016-03-07 18:32:33 +02: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
Thanos paravantis
4e6ba4ebd1
Challenge refactoring.
2016-03-06 16:45:25 +02: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
8cfbe20a08
re-added delay to /spawn
2016-03-05 23:09:57 +00:00
Thanos paravantis
c2d5699aa8
Challenge refactoring, bug fixes, add additional helper methods.
2016-03-06 00:59:13 +02:00
NewGarbo
d92f817efc
fixed some teleportation bugs and a bit of cleanup
2016-03-05 22:50:06 +00:00
NewGarbo
e88736c1aa
changes to scepter, NPE fix
2016-03-05 20:46:24 +00:00
Thanos paravantis
0f58c1378c
Challenge refactoring.
2016-03-05 17:51:30 +02:00
Thanos paravantis
c30f6b0f96
Main class and challenge refactoring.
2016-03-05 17:06:07 +02:00
NewGarbo
d79107eaaa
new legendary weapons and nether finzlizations
2016-03-05 03:07:25 +00:00
Shaun Bennett
d108679d43
Fix compile error
2016-03-04 14:09:20 -06:00
Thanos paravantis
51d4db5e46
Implement game settings and challenge list. Add isChallengeValid and isPlayerValid for event checks.
2016-03-04 20:01:08 +02: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
Thanos paravantis
9e09d8c477
Challenge refactoring.
2016-03-02 22:54:47 +02: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
Thanos paravantis
9a4f4dbd7c
Merge branch 'master' into thanos-mineware
2016-03-02 18:47:30 +02:00
Thanos paravantis
60dfce4612
Challenge refactoring, move challenges to new package.
2016-03-02 18:45:27 +02:00
Shaun Bennett
a3b7a3269c
Merge branch 'develop' into Dual_1.9
2016-03-01 15:14:59 -06:00
Thanos paravantis
cb8b180c2f
Start challenge refactoring, implement helper methods.
2016-03-01 18:50:41 +02:00
Thanos paravantis
77871e3195
Implement challenge settings and data.
2016-03-01 17:09:43 +02:00
Thanos paravantis
6570adc4af
Improve zombie on infestation challenge.
2016-02-29 22:40:09 +02:00
Thanos paravantis
dd538dedd5
Fix Lava Run challenge map generation.
2016-02-29 20:19:26 +02:00
Thanos paravantis
6a2f66f722
Challenge bug fixes and refactoring.
2016-02-29 15:07:33 +02:00
Thanos paravantis
2bc396dc17
General bug fixes and improvements, add map height preference.
2016-02-28 18:15:37 +02:00
git
0284fed2a9
Update patch
2016-02-28 13:12:59 +13:00
Keir Nellyer
ffc678cc3d
Small tidy-up of code.
2016-02-27 00:25:48 +00:00
Keir Nellyer
bafd34f9ac
Add "Show All" link.
2016-02-27 00:08:48 +00:00
Keir Nellyer
c9b343a1fb
Pro-tip: Always make sure you read Trello before adding a feature (un-doing pagination).
2016-02-26 22:55:33 +00:00
Thanos paravantis
bcb489f13d
Map support and parse locations. Minor changes and bug fixes.
2016-02-27 00:13:02 +02:00
Thanos paravantis
1e08e1a5db
Update player death handling, add aggressive chicken behavior, minor changes and refactoring.
2016-02-26 18:17:03 +02:00
Shaun Bennett
775b6eeffa
Merge pull request #7 from Mineplex-LLC/feature/dmt-update
...
Draw My Thing Update
2016-02-26 04:38:10 -06:00
Shaun Bennett
923e51483c
Remove fill line
2016-02-26 04:29:27 -06:00
Shaun Bennett
4472c52432
Fix bucket
2016-02-26 04:21:26 -06:00
William Burns
268536ce68
push 4 shaun
2016-02-26 08:13:28 +00:00
Thanos paravantis
0e697e279b
Player death handling and chicken attack changes.
2016-02-25 23:35:38 +02:00
William Burns
e4ba5d9723
Fix colour targeting FINALLY!
2016-02-25 19:48:15 +00:00
Keir Nellyer
af8ad218be
Separate previous, pages and next buttons.
2016-02-25 18:29:38 +00:00
Keir Nellyer
1c7d48575f
Initial pagination draft.
2016-02-25 18:18:35 +00:00
William Burns
dead7a0850
Use a different method for targeting blocks.
2016-02-25 16:09:00 +00:00
William Burns
9a8c410448
Fix lore being null.
2016-02-25 15:39:18 +00:00
William Burns
009d48659b
Add commands for naming items.
2016-02-25 15:29:47 +00:00
William Burns
a97409b64a
Adjust max distance for targeting.
2016-02-25 15:04:19 +00:00
William Burns
7f6517a823
Ignore barrier blocks when drawing.
2016-02-25 14:23:16 +00:00
git
fcc3e8e024
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:15:12 +13: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
William Burns
19b6c3d95f
Make sure the blocks are in the canvas.
2016-02-24 21:37:22 +00:00
William Burns
a5060e014b
Replace old paint bucket recursive filling.
2016-02-24 21:34:41 +00:00
Thanos paravantis
1dbf7581d2
Add missing game class.
2016-02-24 21:45:38 +02:00
Thanos paravantis
27daace524
Rename game type to Bawk Bawk Battles, change item display to Egg.
2016-02-24 21:43:10 +02:00
Thanos paravantis
f2d58bd55c
Player death handling and chicken attack update, working version.
2016-02-24 20:13:23 +02:00
Thanos paravantis
a7fb1df539
Experimenting with player death and chicken attack.
2016-02-24 18:10:57 +02:00
William Burns
35a853a198
Remove redo/undo system as per request of @mightysigils.
2016-02-24 08:17:13 +00:00
William Burns
33bf3e2e6e
Merge branches 'develop' and 'feature/dmt-update' of github.com:Mineplex-LLC/Minecraft-PC into feature/dmt-update
2016-02-24 08:03:42 +00:00
William Burns
700f5ec44a
Add Redo/Undo system (WIP).
2016-02-24 07:58:50 +00:00
NewGarbo
d524645ddd
placed the clan name hologram thingy correctly because it's inside the outpost!!!
2016-02-23 19:11:29 +00:00
NewGarbo
d65bf965c4
fix only some blocks of outpost being reset and explosion particles not showing up
2016-02-23 18:51:34 +00:00
NewGarbo
2956b18821
some hologram work
2016-02-23 18:45:04 +00:00
NewGarbo
879a211a41
change siege weapon damage indicator display length
2016-02-23 17:00:14 +00:00
Thanos paravantis
6a234aa50f
Chicken attack and death handling progress.
2016-02-23 18:56:49 +02:00
NewGarbo
deb22fd4e7
add 'time till despawn' hologram on outposts and the owner clan of the outpopsts above doors
2016-02-23 16:54:07 +00:00
NewGarbo
205e3885b8
disallow players on pvp timer to use bows
2016-02-23 16:14:56 +00:00
NewGarbo
41e140d5ca
stop players from placing water in outposts
2016-02-23 16:07:12 +00:00
NewGarbo
bcd4480f23
stop recruits from opening trapped chests
2016-02-23 15:57:12 +00:00
NewGarbo
306e56980c
remove weapon teleport fix
2016-02-23 14:44:07 +00:00
NewGarbo
de4568d448
accurate-ish weapon damage tracking
2016-02-23 13:03:50 +00:00
Thanos paravantis
f1cb8378ac
Test commit
2016-02-23 14:54:12 +02:00
Keir Nellyer
70260754ff
Reset these files to their previous state (IDE added tabs).
2016-02-23 00:26:10 +00:00
Keir Nellyer
c923745f5f
Add required import.
2016-02-23 00:25:37 +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
NewGarbo
76cf65c267
siege system changes
2016-02-22 09:34:04 +00:00
NewGarbo
db7382d01e
testing github?
2016-02-21 01:34:13 +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
65be5fcd99
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-02-20 03:30:57 -05: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
AlexTheCoder
0a6cdfa779
- chiss' requested changes
2016-02-20 03:18:59 -05:00
Shaun Bennett
3a73b05895
Fix for ServerMonitor not loading database config
2016-02-20 00:48:30 -06:00
Shaun Bennett
82d51a896f
Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS
2016-02-19 19:54:06 -06:00
Shaun Bennett
8d7453b78e
Merge remote-tracking branch 'origin/develop' into develop
2016-02-19 19:33:52 -06:00
Shaun Bennett
7032568a92
Add PLAYER_STATS DBPool
2016-02-19 19:33:39 -06:00
md_5
a84f8dd2d0
Fix dbcp, tone down sentry
2016-02-19 20:28:22 +11:00
md_5
81f9ca0bc2
Fix mysql
2016-02-19 20:10:01 +11:00
Shaun Bennett
6e2eea50bb
Merge remote-tracking branch 'origin/develop' into develop
2016-02-19 02:46:25 -06:00
md_5
d575266522
Fix sentry
2016-02-19 19:44:36 +11:00
Shaun Bennett
3b10207503
Class.forName!
2016-02-19 02:40:14 -06: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
NewGarbo
67c355bf65
remove more eclipse files
2016-02-19 07:22:54 +00:00
NewGarbo
441cf702c7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-19 07:22:09 +00:00
md_5
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
NewGarbo
d5583b93f2
remove eclipse files
2016-02-19 07:14:13 +00:00
Shaun Bennett
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
Shaun Bennett
eab992e621
Delete SimpleStats
2016-02-18 23:01:23 -06:00
md_5
6d81e43b30
Don't print db config to System.out
2016-02-19 15:30:30 +11:00
md_5
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
NewGarbo
dc5fe21f3d
more npe checking
2016-02-18 21:53:55 +00:00
NewGarbo
24b834370b
null pointers with siege weaponl oading
2016-02-18 21:37:13 +00:00
NewGarbo
8507bb1bd8
all progress over this week
2016-02-18 21:29:42 +00:00
Thanos paravantis
6d05c54a7a
Commit before pulling from master.
2016-02-18 21:30:12 +02:00
libraryaddict
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
AlexTheCoder
d3884bd090
- Spawn regen
2016-02-17 22:12:23 -05:00
AlexTheCoder
fe849576f7
- Spawn protection
2016-02-17 22:04:20 -05:00
AlexTheCoder
4158c12227
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-17 21:44:51 -05:00
md_5
1a1c64dc51
Fix PerkMadScientist on non game zombies.
2016-02-17 18:44:49 +11:00
md_5
b5f4055269
Fix command stack trace on unitialized arcade games.
2016-02-17 18:40:24 +11:00
md_5
3fad9c639a
Fix stack trace in master builders when clicking on a watch.
2016-02-17 18:39:26 +11:00
md_5
50f58ba3a5
Don't stack entities when a game isn't running.
2016-02-17 18:33:40 +11:00
md_5
628e77a701
Don't process empty chat messages.
2016-02-17 18:32:43 +11:00
md_5
e6c00b06ee
Fix exception in GameChatManager if an Arcade game has not been initialized.
2016-02-17 18:29:47 +11:00
md_5
e3861d3bc0
Fix NPE in TnTGenerator
2016-02-17 18:22:37 +11:00
AlexTheCoder
9e2840b3b5
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-16 21:28:07 -05:00
AlexTheCoder
efb63ee824
- fixes
2016-02-16 21:27:50 -05:00
Shaun Bennett
c20e32d2c0
Merge remote-tracking branch 'origin/develop' into develop
2016-02-16 16:55:11 -06:00
Shaun Bennett
684a40db41
Fix giving TITAN in Staff Server
2016-02-16 16:55:00 -06:00
Shaun Bennett
1c5ae77329
Fix Valentines quick server menu button
2016-02-16 16:54:05 -06:00
xGamingDudex
35b9e01aff
Added FlySpeed Cap to WitherAssault game
2016-02-16 19:26:00 +01:00
xGamingDudex
d10dc3d7be
Fixed NPE in KillsWhileEvolvingTracker for game Evolution
2016-02-16 19:22:18 +01:00
xGamingDudex
9c1e574f6a
Fixed ConcurrentModificationException in PerkDeadlyBones:99
2016-02-16 19:09:06 +01:00
xGamingDudex
2f302f4892
Fixed NPE for Gladiators death event
2016-02-16 18:54:13 +01:00
xGamingDudex
2436b7084a
Fixed some chat issues, especial one at GameChatManager:125
2016-02-16 18:52:18 +01:00
xGamingDudex
10e89a228e
Added some extra checks to Blood
...
Should resolve possible NPE and Material.AIR issues along
2016-02-16 18:48:27 +01:00
xGamingDudex
2d5868657a
Fixed NPE in PerkVanish
2016-02-16 18:35:42 +01:00
xGamingDudex
2d3956175b
Should have fixed PerkFishFlurry Block NPE on update (132)
2016-02-16 18:32:17 +01:00
xGamingDudex
ad6c506361
Concurrency Exception in PerkDeathsGrasp fix
2016-02-16 18:18:47 +01:00
xGamingDudex
d33905e174
Fixed NPE in MiscManager regarding hub clock tp fix for Master Builders
2016-02-16 18:09:07 +01:00
xGamingDudex
f551703d9c
SkyWars TNTGenerator NPE fix
2016-02-16 17:57:00 +01:00
xGamingDudex
7645af8933
Should have fixed falling block explosions sometimes throwing exceptions
2016-02-16 17:41:16 +01:00
AlexTheCoder
16c03ebb48
- Silly skeletons! Swimming is for players!
2016-02-15 21:54:18 -05:00
md_5
8893db60d7
Fix highly annoying exception in Reindeer mount.
2016-02-16 12:46:39 +11:00
Shaun Bennett
37757ad7de
Add TypeWars to MPS
2016-02-15 18:55:13 -06:00
AlexTheCoder
53ac1827bc
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-15 19:13:20 -05:00
AlexTheCoder
8d1b270089
- Balancing and bugs
2016-02-15 19:12:25 -05:00
Shaun Bennett
904798ec22
Delete libraries directory/old craftbukkit jar (now in Patches folder)
2016-02-15 18:10:44 -06:00
Shaun Bennett
95c22a59fd
Use DNS for chat filter
2016-02-15 16:30:57 -06:00
Shaun Bennett
d1e098ca13
Merge remote-tracking branch 'origin/develop' into develop
2016-02-15 20:44:52 -06:00
Shaun Bennett
15ed2570e2
Valentines final changes, Change Gift Giver achievement
2016-02-15 20:43:46 -06:00
xGamingDudex
85b8937801
Hats, supposed to go in the previous one
2016-02-15 16:39:04 +01:00
xGamingDudex
7d8ffa1311
Small stuff
2016-02-15 16:38:18 +01:00
NewGarbo
a5de88e6ee
accidentally added those ifles
2016-02-15 11:25:33 +00:00
NewGarbo
e25accfba4
outpost saving and loadi9ng
2016-02-15 11:24:29 +00:00
md_5
305973198c
Merge remote-tracking branch 'origin/md_5/sentry' into develop
2016-02-15 09:20:34 +11:00
AlexTheCoder
f0d59755d2
- Update
2016-02-14 03:31:36 -05:00
phobia
d7ad2cdc58
moar undead fixes
2016-02-14 12:37:37 +11:00
NewGarbo
93a5ca6777
weapons need to be centered
2016-02-14 00:45:54 +00:00
phobia
24254635a8
Fixes to observer settings
2016-02-14 09:51:59 +11:00
AlexTheCoder
f6c38903f2
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-13 14:34:11 -05:00
AlexTheCoder
6385aacbac
- Updates
2016-02-13 14:28:39 -05:00
AlexTheCoder
138c900484
- Fixed up for more universal damage switching
2016-02-13 12:46:57 -05:00
AlexTheCoder
8b39d7ba43
- Void damage fix
2016-02-12 23:16:56 -05:00
AlexTheCoder
ea893bfa48
- Fixed update
2016-02-12 23:03:38 -05:00
AlexTheCoder
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
AlexTheCoder
9595a0ffae
- Lot of stuff
2016-02-12 21:22:00 -05:00
NewGarbo
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
Shaun Bennett
0d19a8017f
Update Featured arcade game, various bug fixes
2016-02-12 06:51:30 -06:00
Shaun Bennett
e8559d423a
Add Valentines Vendetta to quick server menu
2016-02-12 05:27:50 -06:00
Shaun Bennett
960a0cdabb
Fix constructor error, add ValentinesGiftManager to Arcade
2016-02-12 05:06:13 -06:00
Shaun Bennett
eca400278c
Support server update
2016-02-12 05:00:09 -06:00
Shaun Bennett
1e596a6969
Valentines rewards
2016-02-12 04:54:09 -06:00
Shaun Bennett
66aa89b5e0
Fix sheep look bug, valentines gift effects, valentines achievements
2016-02-12 04:32:26 -06:00
Shaun Bennett
dfd61833b7
Valentines changes
2016-02-12 03:03:47 -06:00
Shaun Bennett
4f0f81c8df
Update Courtship messages
2016-02-12 01:47:20 -06:00
Shaun Bennett
d51e26a5a4
Valentines game adjustments
2016-02-12 01:34:29 -06:00
NewGarbo
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
Shaun Bennett
d8965179f7
More valentines adjustments/fix gladiators tutorial being enabled
2016-02-11 23:01:59 -06:00
Shaun Bennett
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
William Burns
790ed4f993
Fix tools for block type/colour selections.
2016-02-11 08:11:40 +00:00
NewGarbo
67b12f3ae2
loads of progress
2016-02-10 19:24:57 +00:00
William Burns
b3045d38e7
Add colour selection for multiple block types.
2016-02-10 16:34:00 +00:00
NewGarbo
b308d1759f
renamed stuff to more sensible stuff. :}
2016-02-10 13:02:55 +00:00
NewGarbo
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
NewGarbo
69bdbdde70
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.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-02-10 11:54:36 +00:00
NewGarbo
35f0162882
make catapults rideableeeeeee
2016-02-10 11:09:17 +00:00
Cheese
eebe25040e
cleaned the particle effects a bit
2016-02-10 16:31:25 +11:00
Shaun Bennett
00f7880dd2
Fix compile error
2016-02-09 21:15:15 -06:00
Shaun Bennett
e3ff25526b
Merge pull request #164 in MIN/mineplex from valentines/game to develop
...
* commit '6800e4ef478e2d1eea5c19ec52a8368ec0bd520a':
valentines final push
bug fixes
more valentines :)
many valentine, such wow
val1
2016-02-09 20:28:58 -06:00
Shaun Bennett
f6e091f029
Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop
...
* commit '57638ff68496b6f10012f8782633066b52a8a715':
More work on valentines
Valentines gifts
Added love potion and hub sheep thing.
Started on Love Potion system. Switching branches.
Varius tweaks and changes.
Added sheep mount to index.
Added various cosmetic items for Valentines day.
2016-02-09 20:28:37 -06:00
Shaun Bennett
57638ff684
More work on valentines
2016-02-09 16:26:17 -06:00
NewGarbo
43cf4d38ef
give player arrow back after failed territory siege declaration arrow thingy fire thingy ehh grammar is not needed at night :}
2016-02-09 21:36:58 +00:00
NewGarbo
e74cefeee8
increased siege weapon placement area, and made outposts handle siege weapons that are placed within them
2016-02-09 19:59:01 +00:00
NewGarbo
e782097563
shouldn't be able to fire weapons whilst in siege wait time
2016-02-09 19:49:25 +00:00
NewGarbo
2b44b88ea2
not being able to fire bow without the correct class and changed arrow to actually be an arrow
2016-02-09 19:48:48 +00:00
NewGarbo
67d1bffe82
npe and clan minimum players set for siege
2016-02-09 19:47:42 +00:00
NewGarbo
9342bee371
das ist gut
2016-02-09 17:05:59 +00:00
Cheese
6800e4ef47
valentines final push
2016-02-09 20:43:24 +11:00
NewGarbo
99ece6eaea
add chest with arrwos to outpost. test for clans in area
2016-02-09 05:53:37 +00:00
Shaun Bennett
a868b8b2b8
Valentines gifts
2016-02-08 22:26:33 -06:00
NewGarbo
dd2fe36a3d
added "Borderlands" to Clan name blacklist
2016-02-08 22:23:26 +00:00
NewGarbo
052d3c3380
siege system updates
2016-02-08 21:33:12 +00:00
NewGarbo
2c13824f9b
possesive method in UtilText
2016-02-08 20:46:45 +00:00
NewGarbo
b8471d7a8e
getter for crater size
2016-02-08 20:46:15 +00:00
NewGarbo
3ee3059bc7
against clan needs to have a getter
2016-02-08 18:38:30 +00:00
NewGarbo
9379c4190a
add against clan to outpsots and also renamed "clan" to "owner" to make it more obvious
2016-02-08 18:31:03 +00:00
Virizion
51d152d484
Perfect build all fix
2016-02-07 19:05:53 -05:00
xGamingDudex
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
Virizion
aaf1fd42f3
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
2016-02-07 18:16:36 -05:00
Virizion
b40f018ee2
Stop mid game joiners from getting participation gems.
2016-02-07 17:20:58 -05:00
Virizion
e96b4c4a7f
Mob egg baby fix. Also fixed non build entities from being "broken"
2016-02-07 15:59:59 -05:00
Virizion
008fc587b0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-07 15:33:37 -05:00
Virizion
7e9ff95ae3
spec command add guardian
2016-02-07 15:27:39 -05:00
Shaun Bennett
a5c5a7c536
Merge pull request #157 in MIN/mineplex from bugfix/bridges-ore-mining to develop
...
* commit '465f12e210120e316e9252dc4e5b7207b4ae0279':
Fixed NPE
Made sure that a valid tool is used before dropping any items.
2016-02-07 14:00:46 -06:00
Shaun Bennett
c059425e9d
Remove GiveawayManager (not used anymore)
2016-02-07 13:18:29 -06:00
Mysticate
465f12e210
Fixed NPE
2016-02-07 13:27:38 -05:00
Shaun Bennett
f502c2a693
Fix filtermessage sync calls
2016-02-07 12:15:08 -06:00
Mysticate
a8ff714ee4
Added love potion and hub sheep thing.
2016-02-07 10:19:40 -05:00
md_5
f7b8dada6d
Add Sentry to BungeeCord too.
2016-02-07 21:40:51 +11:00
Cheese
2ab1b51401
bug fixes
2016-02-07 14:09:02 +11:00
Cheese
a35a9ea31f
more valentines :)
2016-02-07 13:27:53 +11:00
Mysticate
c1393697f8
Started on Love Potion system. Switching branches.
2016-02-06 14:08:17 -05:00
Shaun Bennett
4f5625d63e
Clans Alpha 1.0 changes
2016-02-05 18:42:22 -05:00
phobia
27e4ef784c
WP Evade
2016-02-06 08:44:37 +11:00
NewGarbo
9dc34b5a60
better damage calculation and fixed messages for siege weapon damaging
2016-02-05 19:12:12 +00:00
phobia
b0888208d1
More alphs bug fixes
2016-02-05 23:55:38 +11:00
NewGarbo
e448046e4f
made inv get cleared on fire
2016-02-05 10:40:53 +00:00
Virizion
2ac7840d71
The infamous look direction bounce bug
2016-02-04 23:54:54 -05:00
Virizion
b0b43524da
Chiss' double jump mechanic
2016-02-04 22:05:46 -05:00
Mysticate
b414642990
Varius tweaks and changes.
2016-02-04 21:58:55 -05:00
Virizion
a76e570b8a
Moar fixes
2016-02-04 21:43:17 -05:00
Cheese
690c2acce8
many valentine, such wow
2016-02-05 13:25:57 +11:00
NewGarbo
bef898afc1
final fixes (? (still broken))
2016-02-05 01:01:10 +00:00
phobia
6291decf87
Fixes to flame and broadsword
2016-02-05 11:42:39 +11:00
NewGarbo
1b92871b93
remove annoying debug messages
2016-02-04 23:50:44 +00:00
NewGarbo
62d45d5419
fix flip starngesness
2016-02-04 23:49:02 +00:00
NewGarbo
f5d826a2cb
two parentheses. all it took to fix it. GRRR
2016-02-04 23:42:27 +00:00
NewGarbo
8c1ae12d19
beta stuff
2016-02-04 23:29:48 +00:00
phobia
73d4ff2639
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-05 10:12:31 +11:00
phobia
6fd9cffb01
Clans alpha bug fixes
2016-02-05 10:12:18 +11:00
NewGarbo
16012285e0
rotation fix
2016-02-04 23:11:51 +00:00
NewGarbo
6c7d08a8f9
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-04 22:55:53 +00:00
NewGarbo
e61b36f55c
Fixed /c stuck timer taking 7 seconds instead of 2 minutes
2016-02-04 22:55:37 +00:00
NewGarbo
03da4485b3
pushing to switch to clans/alpha
2016-02-04 22:54:43 +00:00
NewGarbo
bc19cf01f7
hopefully that fixes the location offset =/
2016-02-04 22:48:11 +00:00
NewGarbo
fa460dbd45
catapult rotatyyyy
2016-02-04 21:50:47 +00:00
Mysticate
e94222a68e
Added sheep mount to index.
2016-02-04 13:13:22 -05:00
Mysticate
c0d6cbbb85
Added various cosmetic items for Valentines day.
...
- Heart arrow trail
- Heart death animation
- Heart double jump animation
- Heart set
- Cupid's bow gadget
- Pink Sheep mount
2016-02-04 13:12:53 -05:00
NewGarbo
50c2da2a95
forgot to include this; version getter thingy in Clans
2016-02-04 16:10:14 +00:00
NewGarbo
5a8fae4974
stop catapult projectile from getting stuck on bounding box
2016-02-04 16:09:32 +00:00
NewGarbo
ecdd21a800
version or plugin command now shows version of clans
2016-02-04 16:09:13 +00:00
NewGarbo
b13494f399
more modifications to siege weapons.
2016-02-04 16:00:41 +00:00
Cheese
5c22c841fe
val1
2016-02-04 10:55:29 +11:00
Shaun Bennett
699a26f630
Merge pull request #159 in MIN/mineplex from master to feature/dmt-update
...
* commit '70d41b074f9256b4ac0b6fb51b68fb24dcf10e24': (328 commits)
Fix treasure stair orientation
add a shard queue to DonationManager, use that for TreasureShardReward
mac fix
Commons codec is not included in BungeeCord.
Pooling with later jedis versions doesn't work on Bungee.
Gitignore redundant Eclipse files.
Add Eclipse magic.
Fixed various ways of players going invisible through Spec mode.
Speed up LobbyBalancer to 500ms
Add example maven settings.xml
Remove setTestOnBorrow
Tone down lobby balancer too.
Emergency patch to slow down redis player count updates.
Fixed explosions dropping right items.
sapling fix
Update fixes - @Teddy!
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
Final changes
...
2016-02-03 16:06:59 -06:00
Mysticate
af5cf309ca
Made sure that a valid tool is used before dropping any items.
2016-02-03 14:43:14 -05:00
NewGarbo
c17849b751
fixed some autoboxing stuff
2016-02-03 17:30:07 +00:00
Keir Nellyer
27fc81dd8b
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-02-03 17:23:40 +00:00
NewGarbo
4e2da061bb
added protection around siege weapon
2016-02-03 17:07:06 +00:00
NewGarbo
4488b73e93
change catapult bounding box to 3
2016-02-03 17:02:31 +00:00
NewGarbo
0cb557d922
moved some stuff around and slight changes
2016-02-03 17:02:06 +00:00
NewGarbo
38cae1e3a2
catapult implemented using new siege weapon system, cannons polished up. not tested completely. don't expect this code to work fully haaha
2016-02-03 15:28:53 +00:00
NewGarbo
6bba486385
Added message if cannon is not loaded correctly
2016-02-03 11:20:11 +00:00
NewGarbo
d4388870c1
fixed inventory opening on mount
2016-02-03 11:19:33 +00:00
NewGarbo
8004d0dc3c
fixed npes
2016-02-03 11:06:58 +00:00
NewGarbo
95741e3029
fixed siege weapon base
2016-02-03 10:53:53 +00:00
phobia
5fd089c768
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-03 17:43:43 +11:00
phobia
f011fdad5f
Fixes to TntProtection
2016-02-03 15:10:56 +11:00
phobia
0e0582a1a7
Added safe zone protection for flame
2016-02-03 10:39:21 +11:00
Keir Nellyer
a8f9c91534
ReportServer: update package name and configure Maven to generate a META-INF file with the main class name included.
2016-02-02 22:28:18 +00:00
NewGarbo
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
NewGarbo
6fea76a8e4
finalized alpha patches
2016-02-02 21:38:38 +00:00
NewGarbo
23883148dd
alpha fixes
2016-02-02 20:55:23 +00:00
NewGarbo
cfbfb1fa3b
raised war points for invasion to 25
2016-02-02 20:42:20 +00:00
NewGarbo
9fa5927240
siege weapon base progress
2016-02-02 19:41:25 +00:00
Thanos paravantis
854ebf70c4
Merge branch 'master' into thanos-mineware
...
Conflicts:
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs
Plugins/Nautilus.Game.Arcade/.classpath
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
2016-02-02 17:11:22 +02:00
Thanos paravantis
96cc73fcb7
Change challenge death handling, refatoring.
2016-02-02 17:07:04 +02:00
phobia
59e564cdc6
Fixes to war point evasion
2016-02-02 23:18:05 +11:00
phobia
f1c49fa5ee
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-02 22:13:38 +11:00
phobia
8a0f585432
Added fix to WarPoint evasion bug + 1 dmg bug
2016-02-02 22:11:52 +11:00
Shaun Bennett
86917fb146
Fix treasure stair orientation
2016-02-02 05:50:03 -05:00
Shaun Bennett
a34ae8cf49
Merge remote-tracking branch 'remotes/origin/master' into develop
2016-02-02 05:37:30 -05:00
Shaun Bennett
0d02f526b6
Merge pull request #116 in MIN/mineplex from bugfix/duplicates to develop
...
* commit 'af27944a39129454b2963707c27799643d2440f1':
add a shard queue to DonationManager, use that for TreasureShardReward
Import clean up
Changed TreasureShard rewarding, removed Queue
Unused import removed
Queue speed up
Debugs removed
Treasure not giving Shards when dupes occur, fixed.
Queue implemented for duplicate shard reward
2016-02-02 04:35:44 -06:00
Shaun Bennett
af27944a39
add a shard queue to DonationManager, use that for TreasureShardReward
2016-02-02 05:34:33 -05:00
Keir Nellyer
a51c579f74
Fix Maven configuration for ReportServer project.
2016-02-01 22:52:24 +00:00
Keir Nellyer
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
Cheese
610522bdd9
mac fix
2016-02-02 09:25:46 +11:00
Shaun Bennett
ee9e26e8ca
Merge pull request #149 in MIN/mineplex from bugfix/spectator-infest to develop
...
* commit 'ace7d1764c68f6ea679ae60b3104d1af96e1869c':
Fixed various ways of players going invisible through Spec mode.
2016-02-01 16:18:23 -06:00
Shaun Bennett
1a9c36d0a1
Merge pull request #153 in MIN/mineplex from master to bugfix/duplicates
...
* commit '3a945f190dca9f558cbcb6052b3eaa2816d112b3': (308 commits)
Commons codec is not included in BungeeCord.
Pooling with later jedis versions doesn't work on Bungee.
Gitignore redundant Eclipse files.
Add Eclipse magic.
Speed up LobbyBalancer to 500ms
Add example maven settings.xml
Remove setTestOnBorrow
Tone down lobby balancer too.
Emergency patch to slow down redis player count updates.
Fixed explosions dropping right items.
sapling fix
Update fixes - @Teddy!
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
Final changes
Prep for update
Update CB.jar
Prevent hearts changing colors in UHC tab.
Fixed ForTheKing achievement.
...
2016-02-01 15:49:34 -06:00
Virizion
41ea96d505
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-01 16:42:55 -05:00
Virizion
989c324a37
Hopper item pickup fix.
2016-02-01 16:18:40 -05:00
NewGarbo
04ec8a6a26
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
...
Conflicts:
Plugins/pom.xml
2016-02-01 20:10:51 +00:00
NewGarbo
84b887fe89
that's not needed
2016-02-01 19:53:59 +00:00
NewGarbo
b4ed912f7d
siege weapon modular system beginnings
2016-02-01 19:52:53 +00:00
md_5
1e57f19bd6
Commons codec is not included in BungeeCord.
2016-02-01 18:18:23 +11:00
md_5
e887bbf543
Pooling with later jedis versions doesn't work on Bungee.
2016-02-01 18:13:50 +11:00
Keir Nellyer
b547ad5f89
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-31 23:38:58 +00:00
md_5
cc1ecbe0b8
Add Eclipse magic.
2016-02-01 10:24:49 +11:00
Thanos paravantis
de1ee4f6cb
Spectator and chicken attack changes.
2016-01-31 23:50:23 +02:00
NewGarbo
45aacd626e
this isn't used anymore
2016-01-31 19:20:15 +00:00
Keir Nellyer
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
NewGarbo
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
NewGarbo
002be01ef1
MAVEN TEST COMMIT
2016-01-31 16:21:04 +00:00
NewGarbo
a5439943d6
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-31 15:47:52 +00:00
Mysticate
ace7d1764c
Fixed various ways of players going invisible through Spec mode.
2016-01-31 10:22:59 -05:00
Thanos paravantis
1f22883c13
Refactoring challenge selection and updating.
2016-01-31 16:57:54 +02:00
md_5
852f96a314
Speed up LobbyBalancer to 500ms
2016-01-31 09:45:34 +11:00
md_5
478b92db44
Add example maven settings.xml
2016-01-31 09:44:46 +11:00
Shaun Bennett
b9354b7972
Remove setTestOnBorrow
2016-01-30 16:10:30 -05:00
Thanos paravantis
0e1a14a0c3
Countdown modifications, refactoring, dogs vs cats challenge changes.
2016-01-30 21:52:18 +02:00
Thanos paravantis
69dc888657
Refactoring.
2016-01-30 21:07:00 +02:00
Thanos paravantis
215fe68575
Start code refactoring.
2016-01-30 17:19:33 +02:00
Thanos paravantis
e3a9f4f2f7
Chicken attack changes, refactoring, update map crumble variable access.
2016-01-30 14:14:55 +02:00
phobia
9c83c64d01
Fixed issues with Broadsword
...
Added max building height of 100
2016-01-30 21:34:06 +11:00
phobia
4612550ba5
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-01-30 19:24:42 +11:00
phobia
aa0cfc7710
Fixes to TnTGeneration
...
Fixes to Broadsword giving Generation and slowness 42 instead of 4
2016-01-30 19:23:59 +11:00
Shaun Bennett
52b6779a4f
Merge pull request #146 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
...
* commit 'b45e00796d66cf8aeb39510e0bd23bc5bd59327b':
Fixed explosions dropping right items.
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
2016-01-30 01:45:00 -06:00
Shaun Bennett
c23855bd65
Merge with develop
2016-01-30 02:44:24 -05:00
md_5
1f2fc65f99
Tone down lobby balancer too.
2016-01-30 13:55:58 +11:00
md_5
7ed0ab442f
Emergency patch to slow down redis player count updates.
2016-01-30 12:36:20 +11:00
Keir Nellyer
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
Keir Nellyer
253f5cc664
Improve our English slightly.
2016-01-29 23:12:50 +00:00
Thanos paravantis
c5a9f0c42c
Chicken attack bug fixes, death effect improvements.
2016-01-30 00:13:41 +02:00
Mysticate
b45e00796d
Fixed explosions dropping right items.
2016-01-29 15:58:49 -05:00
NewGarbo
fe01c9b8d5
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-29 20:57:10 +00:00
NewGarbo
d10266c4d1
sapling fix
2016-01-29 20:56:38 +00:00
NewGarbo
7d28bc69c9
collision boxes on siege weapons and other stuff
2016-01-29 20:55:56 +00:00
NewGarbo
76dba421b4
sapling fix [THIS NEEDS TO GET PUT ONTO CLANS/ALPHA]
2016-01-29 20:54:31 +00:00
Shaun Bennett
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
Thanos paravantis
0530ea28e7
Improve chicken attack, fix mini oitq arrow damage.
2016-01-29 19:15:37 +02:00
Mysticate
1e29bd6936
Made block define its own drops.
2016-01-29 11:44:40 -05:00
Mysticate
447583aa2a
Removed an nunnecesarry method
2016-01-29 09:41:45 -05:00
Mysticate
075a1141f1
Fixed items not dropping their regular counterpart.
2016-01-29 09:36:09 -05:00
Shaun Bennett
c1f91cbfb0
Final changes
2016-01-29 03:56:49 -05:00
Shaun Bennett
50fc1f5a10
merge with develop
2016-01-29 03:44:04 -05:00
Shaun Bennett
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
Shaun Bennett
a1f9f41910
Merge remote-tracking branch 'origin/develop' into develop
2016-01-29 03:37:03 -05:00
Shaun Bennett
863be023d9
Prep for update
2016-01-29 03:36:52 -05:00
Shaun Bennett
2e2a08bea8
Merge pull request #142 in MIN/mineplex from bugfix/coal-particles to develop
...
* commit 'd1d3382ec065bb7c508044d53124266fda142c00':
Prevented Coal particles from showing during the game
2016-01-29 02:33:57 -06:00
Shaun Bennett
ba0dd3da44
Merge pull request #141 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
...
* commit 'b92ddc75759bc848b409b5626f0fbeb9d71154b5':
Added proper ore pickup delay.
2016-01-29 02:33:23 -06:00
Shaun Bennett
a0e9a82327
Merge pull request #143 in MIN/mineplex from bugfix/achievements-misc to develop
...
* commit '7d33e76055eb160e58d63443a72117e654df9468':
Fixed ForTheKing achievement.
Made sure Sniper achievement in Bridges is always fulfilled.
Fixed + Tidied Gladiators Precision achievement.
2016-01-29 02:32:50 -06:00
Shaun Bennett
63fa942789
Merge pull request #144 in MIN/mineplex from bugfix/uhc-hearts to develop
...
* commit 'caa5d922b520da30223230b58754a77dd3b72186':
Prevent hearts changing colors in UHC tab.
2016-01-29 02:27:20 -06:00
libraryaddict
dc469b9562
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2016-01-29 17:02:07 +13:00
libraryaddict
8aac172c4a
Update CB.jar
2016-01-29 17:01:48 +13:00
Mysticate
caa5d922b5
Prevent hearts changing colors in UHC tab.
2016-01-28 22:54:20 -05:00
Mysticate
7d33e76055
Fixed ForTheKing achievement.
2016-01-28 22:51:19 -05:00
Mysticate
733ba067fe
Made sure Sniper achievement in Bridges is always fulfilled.
2016-01-28 22:49:51 -05:00
Mysticate
fffa1d5926
Fixed + Tidied Gladiators Precision achievement.
2016-01-28 22:48:52 -05:00
Mysticate
d1d3382ec0
Prevented Coal particles from showing during the game
2016-01-28 22:44:33 -05:00
Mysticate
b92ddc7575
Added proper ore pickup delay.
2016-01-28 22:39:48 -05:00
Shaun Bennett
60ee5d1da0
Move disable custom inside of IsActive check
2016-01-28 22:33:48 -05:00
Shaun Bennett
eb29c6b367
Fix constructor
2016-01-28 22:28:18 -05:00
Shaun Bennett
0177cf91bb
Merge with develop
2016-01-28 22:23:17 -05:00
Shaun Bennett
40f6969413
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-01-28 22:16:15 -05:00
Shaun Bennett
051d70771b
Facebook Command
2016-01-28 22:15:35 -05:00
Shaun Bennett
251fb53f29
Merge pull request #124 in MIN/mineplex from bugfix/morph to develop
...
* commit '2e433d8b0654507a9a41d9bbae313ab90e92471f':
Made sure that the active morph gets disabled on clear
2016-01-28 21:08:32 -06:00
Shaun Bennett
bf273708f9
Merge pull request #136 in MIN/mineplex from feature/entity-spectating to develop
...
* commit '53132a248f9d899e2b4b275a31cfd69376533688':
the L
Updateting spectator Menu layout.
fixing spec item in menu
Removing right clicking.
removing switching players until spigot patch is on.
adding spectator rotation.
adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-28 21:08:13 -06:00
Shaun Bennett
015cca57b6
Merge pull request #138 in MIN/mineplex from bugfix/gladiators-hotbar-editor to develop
...
* commit '75629055d851265e91eb7d0679a40a1357552e17':
Un-register HotbarEditor MiniPlugin and fix /spec bug.
Un-register the hotbar page listener on disable.
2016-01-28 21:03:48 -06:00
Shaun Bennett
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
NewGarbo
7860ca24c8
disallow all staff from using /we
2016-01-28 23:33:06 +00:00
NewGarbo
f86262dc0e
catapult and cannon progress
2016-01-28 23:32:23 +00:00
Virizion
b6db99806a
Remove debug message.
2016-01-28 18:28:43 -05:00
teddy
96ea001291
Clean up
2016-01-28 23:05:27 +00:00
teddy
da8a55f99c
Final edits
2016-01-28 22:57:54 +00:00
William Burns
75629055d8
Un-register HotbarEditor MiniPlugin and fix /spec bug.
2016-01-28 20:43:58 +00:00
Virizion
04544c2b8d
Fix flickering judge laser.
2016-01-28 14:28:47 -05:00
William Burns
d44d4c2278
Un-register the hotbar page listener on disable.
2016-01-28 19:21:42 +00:00
teddy
63cea58f05
Waiting for a testing session.
2016-01-28 17:18:24 +00:00
NewGarbo
37fb656279
dispenser
2016-01-28 13:31:45 +00:00
NewGarbo
f645c4d6f8
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-28 13:30:50 +00:00
NewGarbo
88c1391ba2
disallow sapling in dispensers (grrr working in two different branches is really strange)
2016-01-28 13:30:16 +00:00
NewGarbo
8cb5591218
merge conflicts
2016-01-28 13:28:39 +00:00
NewGarbo
a0cc0b7ec9
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/gameplay/Gameplay.java
2016-01-28 13:28:00 +00:00
NewGarbo
b5f04011e5
fixed chatslow not working + filter not working for players not in clan
2016-01-28 13:24:30 +00:00
Keir Nellyer
5f14670bc2
Remove old redundant iml file.
2016-01-28 11:20:40 +00:00
NewGarbo
ceeeb3bc45
no tnt from dispensers
2016-01-28 10:58:46 +00:00
teddy
eed55b48ac
Descriptions changed
2016-01-28 09:55:48 +00:00
NewGarbo
682a243c31
fixed catapult state being mapped to incorrect blocks
2016-01-28 09:18:58 +00:00
Keir Nellyer
3fc11e5c8a
For some reason this didn't get committed with the previous stuff.
2016-01-27 21:54:34 +00:00
Keir Nellyer
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
Teddy
70be135a40
Merge branch 'feature/hoverable-chat' of http://dev.mineplex.com:7990/scm/min/mineplex into rankdescriptions
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
2016-01-27 19:42:11 +00:00
AlexTheCoder
b84ec01597
- Huge amount of stuff
2016-01-26 22:52:45 -05:00
Shaun Bennett
3d4cd9ee27
Fix tutorial command, add tutorial info to scoreboard, message manager, transitioning to a visual manager
2016-01-26 17:47:01 -06:00
Virizion
40113f99d3
Borders for spec are fixed.
2016-01-26 17:14:21 -05:00
NewGarbo
7f7e73a101
more catapults!
2016-01-26 21:10:58 +00:00
NewGarbo
3d7a371d1d
catapults
2016-01-26 20:18:53 +00:00
Shaun Bennett
155d8bff1b
Fix cannon angles
2016-01-26 13:36:30 -06:00
NewGarbo
9215d0d3ff
NegativeArraySizeException fix
2016-01-26 18:40:55 +00:00
NewGarbo
63f9622876
cannon correctly loadded title + fixed rotation being all wrong
2016-01-26 17:51:29 +00:00
NewGarbo
7c85fe62ca
charred blocks updates
2016-01-26 17:36:12 +00:00
NewGarbo
2445e73623
better cannon crater particles
2016-01-26 13:06:47 +00:00
NewGarbo
3b18b93286
fixed top right slot in cannon not counting as an empty slot.
2016-01-26 09:26:51 +00:00
NewGarbo
467af4b835
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-26 09:24:53 +00:00
Virizion
2f4146c243
Leaves fix.
2016-01-25 21:12:28 -05:00
Virizion
c5dfddd710
Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
2016-01-25 20:54:01 -05:00
Virizion
a1eec79b3b
Make dependable require 50 perfect builds instead of 10.
2016-01-25 16:43:43 -05:00
NewGarbo
e68dea65e1
stop dispensers being used for flint-andsteal, bonemeal etc etc
2016-01-25 17:46:39 +00:00
NewGarbo
18e892c4ec
finally fixed that windblade dupe
2016-01-25 17:41:07 +00:00
NewGarbo
71bb1ed3d6
this is just really slowing down startup time by A LOT
2016-01-25 17:22:56 +00:00
NewGarbo
9d77632fcc
allow clans moderators to use /cb
2016-01-25 17:18:00 +00:00
NewGarbo
2bf2050844
increased sapling cooldown to 20 minutes from one second.
2016-01-25 17:13:53 +00:00
NewGarbo
7f1c74ced5
bumped version up to 0.19
2016-01-25 17:11:08 +00:00
NewGarbo
2b70daf8df
allowed clans mods to use /cban
2016-01-25 17:02:49 +00:00
NewGarbo
5a5dc9925e
set spawning rate of charred blocks a 10% lower
2016-01-25 17:02:26 +00:00
NewGarbo
208df93739
fixed fire particles not showing up in craters
2016-01-25 17:02:02 +00:00
NewGarbo
ce36cf79bf
added a tnt limit, set to 1 as it makes gameplay better
2016-01-25 17:01:46 +00:00
NewGarbo
9b88683fdc
fix cannon tnt exploding prematurely, added cooldown rather than using Recharge.
2016-01-25 17:00:38 +00:00
Sarah
53132a248f
the L
2016-01-25 12:28:21 +01:00
Sarah
c7733bb068
Updateting spectator Menu layout.
2016-01-25 12:27:19 +01:00
Sarah
91b6ae8b09
fixing spec item in menu
2016-01-25 12:14:56 +01:00
Shaun Bennett
4314f35f80
Multiply by less
2016-01-25 04:46:47 -06:00
Shaun Bennett
b143ec7c19
negative!
2016-01-25 04:42:09 -06:00
Shaun Bennett
6ff7c83d3e
Trying different hologram location
2016-01-25 04:17:58 -06:00
Shaun Bennett
616be8aea7
Fix messages, fix /stats
2016-01-25 03:59:37 -06:00
Shaun Bennett
d511ca5bad
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-25 03:51:44 -06:00
Shaun Bennett
bc8f6e511c
Center hologram
2016-01-25 03:44:22 -06:00
Virizion
2dcc356aab
Make achievement category classics
2016-01-25 04:33:25 -05:00
Shaun Bennett
61f1a58b1c
hologram changes
2016-01-25 03:29:53 -06:00
Shaun Bennett
181cce4774
Holograms maybe?
2016-01-25 03:08:56 -06:00
NewGarbo
33845cbc72
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-25 08:48:13 +00:00
NewGarbo
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
NewGarbo
5b32911a42
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-25 08:46:26 +00:00
NewGarbo
0b7cec60ae
put cmod above support so that support can't bypass clans home block
2016-01-25 08:44:17 +00:00
NewGarbo
d82a7b353f
allow C.Mods to join all server regardless of home servers
2016-01-25 08:42:38 +00:00
NewGarbo
54fa1449f6
cannon crater changes
2016-01-25 08:40:59 +00:00
Virizion
219b86ae55
Chiss' checklist.
2016-01-25 03:01:54 -05:00
Sarah
31ef7ffe19
Removing right clicking.
2016-01-25 07:45:38 +01:00
Sarah
f722831e6a
removing switching players until spigot patch is on.
2016-01-25 05:44:06 +01:00
Sarah
9e63c9000a
adding spectator rotation.
2016-01-25 04:30:42 +01:00
Virizion
bfe9aa7a59
Remove unnecessary tabs. Make the judge guardian use it's own laser again.
2016-01-24 21:55:57 -05:00
Virizion
0eda813d41
Fixed builds with only mobs not loading.
2016-01-24 19:14:34 -05:00
NewGarbo
c43c09fd3c
the cannons shouldn't explode instantly! also added fire effects to craters + clan tips when hopping on a cannon
2016-01-24 21:45:46 +00:00
NewGarbo
0252436990
cannons updates
2016-01-24 20:56:47 +00:00
Sarah
00f01e09af
adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-24 20:00:05 +01:00
NewGarbo
a41521d6a9
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/gameplay/safelog/SafeLog.java
2016-01-23 13:42:25 +00:00
NewGarbo
1f7e1fb6cf
fix dupe bug and safelog
2016-01-23 13:40:49 +00:00
Thanos paravantis
70588d81a8
Update /stats menu to display mineware achievements item.
2016-01-23 14:51:47 +02:00
NewGarbo
24011c4af4
cannons work
2016-01-23 12:46:52 +00:00
Thanos paravantis
72fb2317b9
Update team creation and winner placement, fix NPE on Veteran Tracker.
2016-01-23 14:31:36 +02:00
Virizion
a747426fa0
Fixed mobs.
2016-01-23 05:00:14 -05:00
Virizion
a359c4f8b6
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-23 03:42:50 -05:00
Virizion
1e732b08e7
TICK TICK TICK TICK.
2016-01-23 03:42:36 -05:00
Cheese
790e2e8f73
Merge branch 'virizion_speed_builder' of ssh://184.154.0.242:7999/min/Mineplex into virizion_speed_builder
2016-01-23 19:32:37 +11:00
Cheese
c1ff7f4fc2
all players equal, no one loses
2016-01-23 19:32:23 +11:00
Virizion
a75770b0a6
Change build to load from top instead of bottom.
2016-01-23 03:15:41 -05:00
Shaun Bennett
650d586e0f
Add perfect build count to stats
2016-01-23 02:49:08 -05:00
Shaun Bennett
f82a408f30
Build time modifiers
2016-01-23 02:43:41 -05:00
Virizion
5dc773032b
Add joining players to guardians team instead of spectator.
2016-01-23 02:10:11 -05:00
Virizion
245cc1ed93
Limit Perfectionist achievement to 1.
2016-01-22 22:18:29 -05:00
Shaun Bennett
311d42db30
Use Garbo's description changes
2016-01-22 19:48:06 -05:00
Shaun Bennett
231b8cb19a
Merge pull request #133 in MIN/mineplex from bugfix/foo to develop
...
* commit '376f719c261bd2152a6646a152472a2485e1b689':
fixes important bug, fixed a scary typo!
Lots of typo fixes and such
i before e!
fixed cosmetic menu item dropping bug
more grammatical errors hast been fixed
Grammatical errors hath been fixed!
2016-01-22 18:38:26 -06:00
Shaun Bennett
b2e4dff9e5
Add time to perfect build message
2016-01-22 19:18:23 -05:00
Shaun Bennett
02b45bd302
Forgot to register stat tracker
2016-01-22 19:14:25 -05:00
Shaun Bennett
ddc86f0897
Add Speediest Builderizer achievement
2016-01-22 19:13:23 -05:00
Shaun Bennett
d0e5be9c93
Guardian is impressed (untested!)
2016-01-22 18:35:18 -05:00
Thanos paravantis
a74d4fa960
Working on chicken attack when a player looses all of his lives.
2016-01-22 23:59:29 +02:00
NewGarbo
bf6f1a1701
sapling stuff messed up oops
2016-01-22 15:28:12 +00:00
NewGarbo
090b6e496a
sapling stuff messed up oops
2016-01-22 15:27:44 +00:00
NewGarbo
c524247777
supplies command for sieges
2016-01-22 15:27:10 +00:00
NewGarbo
6638562866
npe fix
2016-01-22 15:21:20 +00:00
NewGarbo
f25c7b0277
don't need that + npe fix
2016-01-22 15:19:32 +00:00
NewGarbo
b869d4a7a8
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-22 15:16:20 +00:00
NewGarbo
c4bbeb2535
more control over saplings
2016-01-22 14:55:50 +00:00
NewGarbo
a377a09925
fixed wind blade dupe bug
2016-01-22 11:22:20 +00:00
NewGarbo
cc48d98208
pushing to beta to change to alpha
2016-01-22 11:06:19 +00:00
Virizion
3f715ab4dd
Enable inventory click.
2016-01-22 02:23:58 -05:00
Shaun Bennett
4bbd956e14
Don't use the same build twice (untested!)
2016-01-22 01:37:47 -05:00
Shaun Bennett
49e439af55
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-22 01:28:09 -05:00
Shaun Bennett
6bb60ddebd
Ignore empty builds (untested!)
2016-01-22 01:27:29 -05:00
Virizion
c66f37817e
Fixed invis bug.
2016-01-22 01:22:31 -05:00
Virizion
5c83f5c1e5
Renamed to Speed Builders from Speed Builder.
2016-01-22 00:20:58 -05:00
Virizion
0da921f3d2
Removed debug thing.
2016-01-21 23:52:59 -05:00
Virizion
a38319147a
Stopped physics which fixed the torch bug.
2016-01-21 23:49:49 -05:00
Shaun Bennett
582fa4c915
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-21 22:42:33 -05:00
Shaun Bennett
c38596a09f
Name the guardian, 10 seconds to view builds
2016-01-21 22:42:25 -05:00
Virizion
24e97176cc
Call clear build area method on eliminate.
2016-01-21 22:05:30 -05:00
Virizion
d37b8b40fc
Disable item merge to (hopefully) fix phantom rails.
2016-01-21 20:41:28 -05:00
Virizion
50c9b33701
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-21 20:13:53 -05:00
Virizion
636da8f4fa
Mob destroying. Removed a debug change that only selected builds with mobs in them.
2016-01-21 20:13:32 -05:00
Cheese
5675aed698
velocity the drops to the player
2016-01-22 11:56:52 +11:00
Virizion
69825893c9
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-01-21 19:11:36 -05:00
Virizion
6ab6307f74
Pushing all my stuff for Shaunpai.
2016-01-21 19:08:38 -05:00
Shaun Bennett
877ec4710e
Removing duplicate NCP hooks
2016-01-21 17:22:10 -05:00
Shaun Bennett
3803a3d82e
Add player heads back to friends lsit
2016-01-21 17:19:51 -05:00
Shaun Bennett
0fd5540de6
Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop
...
* commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16':
Give item fix for offline players
2016-01-21 15:44:34 -06:00
Shaun Bennett
a41816ca22
Include version.properties in Mineplex.Core
2016-01-21 16:37:35 -05:00
Shaun Bennett
a0f39bf36e
Merge remote-tracking branch 'origin/develop' into develop
2016-01-21 16:31:52 -05:00
Thanos paravantis
44de231c7d
Start implementing chicken attack on player death.
2016-01-21 21:35:14 +02:00
Shaun Bennett
64ec092d09
Rename coin command to shard command
2016-01-21 09:10:39 -05:00
Teddy
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
Keir Nellyer
dd0fc23467
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-21 10:12:02 +00:00
md_5
447583624e
Fix ascii.png duplication.
2016-01-21 17:47:21 +11:00
Shaun Bennett
5af8d747b3
Merge remote-tracking branch 'origin/develop' into develop
2016-01-20 15:07:48 -05:00
Shaun Bennett
269cd710fc
Fix wrong group id for spigot excludes
2016-01-20 15:07:39 -05:00
Shaun Bennett
c0d4fa1bea
Merge pull request #125 in MIN/mineplex from bugfix/mb-wins to develop
...
* commit '4924d652f555392c9e36feb05a64cccd61b6c594':
Store winner UUID instead of Player object to avoid leaking excess data
Fixed who the winner is in MB Games.
2016-01-20 12:33:56 -06:00
Shaun Bennett
4924d652f5
Store winner UUID instead of Player object to avoid leaking excess data
2016-01-20 13:33:40 -05:00
Shaun Bennett
7715df8e6a
Merge pull request #130 in MIN/mineplex from md_5/servermonitor/leak to develop
...
* commit '55c54eeff4dc72619fc9be1bb724b9dd37804919':
Fix ServerMonitor not actually removing ServerGroup instances.
2016-01-20 12:24:33 -06:00
Shaun Bennett
359655f417
Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop
...
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
Fix some misc suspicious calls to Collection methods.
2016-01-20 12:23:55 -06:00
Shaun Bennett
c7bb380a56
Merge pull request #128 in MIN/mineplex from md_5/mineplexer/leak to develop
...
* commit '6cf08193dfbedb08352fd3a450022afac0ecd331':
Fix small memory leak in Mineplexer.
2016-01-20 12:23:13 -06:00
Shaun Bennett
0a5791a92f
Go back to compile scope, need to talk to md_5 about this
2016-01-20 13:13:20 -05:00
Shaun Bennett
037a2f8353
Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command
2016-01-20 13:04:31 -05:00
Shaun Bennett
8977735baf
Include a version.properties in maven build
2016-01-20 11:57:21 -05:00
Shaun Bennett
8017da9413
Delete JedisTest
2016-01-20 10:25:31 -05:00
Shaun Bennett
ea315a1447
Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop
...
# Conflicts:
# Plugins/Libraries/craftbukkit.jar
2016-01-20 10:19:09 -05:00
Shaun Bennett
77d9f7cf32
Merge branch 'master' into develop
2016-01-20 10:12:20 -05:00
fooify
376f719c26
fixes important bug, fixed a scary typo!
2016-01-19 18:52:54 -08:00
md_5
bb4091c7a6
Use Maven for Compilation
2016-01-20 11:20:58 +11:00
Teddy
573d0dd67d
Stats added for all other games
2016-01-19 23:10:45 +00:00
Shaun Bennett
9884742552
Fix OrderedObjectives, Starting CombatTutorial work
2016-01-19 16:34:51 -05:00
Shaun Bennett
80d55b2c9c
It works!
2016-01-19 13:34:17 -05:00
Shaun Bennett
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
Shaun Bennett
947ce254da
Tutorial Gui, Fixes
2016-01-19 10:59:56 -05:00
William Burns
7af8d78fc3
Add resource pack and other fixes
2016-01-19 14:00:23 +00:00
Shaun Bennett
951c27123a
Remove /disguise for YOUTUBE_SMALL in arcade
2016-01-18 22:10:01 -05:00
Teddy
c52bc8024c
Halloween, added kit to stats
2016-01-18 11:41:30 +00:00
Teddy
740eeae9bd
Halloween, added stats
2016-01-18 11:40:46 +00:00
Teddy
3fc25359be
Gravity, added stats
2016-01-18 11:38:43 +00:00
Teddy
b22f452b1f
Gladiators, added stats
2016-01-18 11:36:16 +00:00
Teddy
297e9baf41
Evolution, added stats
2016-01-18 11:34:43 +00:00
Teddy
f3d27c9d93
Draw my thing, added stats
2016-01-18 11:32:40 +00:00
Teddy
3d88f5aaae
Dragons, added stats
2016-01-18 11:11:32 +00:00
Teddy
ba50b5fdb1
Dragon Riders, added default registery
2016-01-18 11:09:19 +00:00
Teddy
c3d9be2123
Dragon Escape Teams, added stats
2016-01-18 11:05:09 +00:00
Teddy
85f4ee50f0
Dragon Escape, added stats + implemented kit display for stats
2016-01-18 11:04:12 +00:00
Teddy
66f484760e
Death Tag, added stats
2016-01-18 10:53:56 +00:00
Teddy
96d16932dd
Christmas Chaos, added stats
2016-01-18 10:50:04 +00:00
Teddy
dc44207d7a
Champ TDM, added stats
2016-01-18 10:48:10 +00:00
Teddy
4e09aa4c34
Champ Dominate,added stats
2016-01-18 10:45:48 +00:00
Teddy
f79acaaa2a
Champ CTF,added stats
2016-01-18 10:43:46 +00:00
Teddy
508c4e99d2
Castle Siege,added stats
2016-01-18 10:41:10 +00:00
Teddy
b0eb5a6d4e
Cards Against Humanity, skipped/left blank
2016-01-18 10:34:43 +00:00
Teddy
56b3e482f2
Master Builders, added stats
2016-01-18 10:32:38 +00:00
Shaun Bennett
044d2bac83
Fix some Invisibility preference bugs
2016-01-17 22:55:04 -05:00
Shaun Bennett
2b6074a210
Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command'
2016-01-17 22:46:56 -05:00
Shaun Bennett
976779b9f2
Tutorial Work
2016-01-17 22:45:38 -05:00
Sarah
5ed9295944
updating Hub command as well
2016-01-17 18:10:16 +01:00
Thanos paravantis
821ff58ab0
Merge branch 'master' into thanos-mineware
...
Conflicts:
.gitignore
2016-01-17 14:03:00 +02:00
md_5
4927bb8c0b
Fix some misc suspicious calls to Collection methods.
2016-01-17 20:20:48 +11:00
md_5
55c54eeff4
Fix ServerMonitor not actually removing ServerGroup instances.
2016-01-17 20:11:25 +11:00
Sarah
52bda30f85
Mysts OCD again......
2016-01-17 03:03:00 +01:00
Sarah
4a5d6b5f2a
Mysticates OCD....
2016-01-17 02:48:15 +01:00
Keir Nellyer
40833c80bd
Tiny spell fix.
2016-01-17 00:34:18 +00:00
Keir Nellyer
398c56983b
Retrieve player ranks from database and display them.
2016-01-16 23:45:37 +00:00
xGamingDudex
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
xGamingDudex
8ee485e44c
Progress
2016-01-16 14:43:14 +01:00
md_5
6cf08193df
Fix small memory leak in Mineplexer.
...
* Leak was on line 74 (toString omitted when removing from String collection).
* Impact was actually pretty much nil - collection is rebuilt every minute.
* Side effect of optimization by using UUID itself which has a good hashCode and fast equals implementation.
2016-01-16 20:36:49 +11:00
NewGarbo
40c52ac557
made it so that cannons don't rely on outposts. this should help with testing them without needing an outpost
2016-01-16 08:25:30 +00:00
NewGarbo
254a2e45e4
comments + cannons state enum rename
2016-01-16 08:22:35 +00:00
NewGarbo
e71a2d2e48
quick npe fix
2016-01-16 08:20:11 +00:00
NewGarbo
1042edb134
CANNONZ!
2016-01-16 08:18:06 +00:00
William Burns
f22297418c
Clear full canvas at start fix
2016-01-15 19:08:25 +00:00
William Burns
733bfadf68
Added spray can tool
2016-01-15 18:52:26 +00:00
Sarah
410bc1c74b
not being able to disguise as banned/muted players
2016-01-15 19:12:50 +01:00
Teddy
c16a719be1
Bridges, added stats
2016-01-15 13:37:55 +00:00
Teddy
9cd7240b61
BouncyBalls, giving errors when Loading, skipping chat stats
2016-01-15 13:28:42 +00:00
Teddy
ec75169b70
BossBattles, giving errors when Loading, removed chat stats.
2016-01-15 13:07:21 +00:00
Teddy
3315a510dc
Barbarians stats added + Block break stat tracker added
2016-01-15 13:01:26 +00:00
Teddy
6a3e9ac19f
BaconBrawl stats added
2016-01-15 12:10:53 +00:00
NewGarbo
1faeb43b73
fixed iron block sometimes sticking around after placing cannon
2016-01-15 07:17:51 +00:00
NewGarbo
a554f1b7c6
needed to update some code with the cannon item location changing. also removed unused imports.
2016-01-15 07:00:39 +00:00
NewGarbo
f78c469875
moved cannon item to Cannon.java to be consistent with the outpost item being in Outpost.java
2016-01-15 06:59:18 +00:00
NewGarbo
e0b7be0813
made /meow give you 64 cannons and 64 outposts
2016-01-15 06:58:20 +00:00
NewGarbo
70444ff508
cannon + siege work with outposts, also moved outposts to the clans.siege package
2016-01-15 06:53:58 +00:00
Shaun Bennett
404e049c31
Give item fix for offline players
2016-01-14 08:06:27 -05:00
Mysticate
cf7f5af9ca
Fixed who the winner is in MB Games.
2016-01-14 07:41:36 -05:00
Mysticate
2e433d8b06
Made sure that the active morph gets disabled on clear
2016-01-14 07:17:40 -05:00
NewGarbo
595ab0d763
siege work
2016-01-14 09:46:12 +00:00
Teddy
d33d682ebb
Implementing stats for every game, got all stat names ready
2016-01-13 18:40:29 +00:00
Thanos paravantis
2ffaf61135
Rename methods starting with a capital letter, change several event method names and refactor classes and cleanup imports.
2016-01-13 18:40:37 +02:00
Keir
19301271a4
Fix format character.
2016-01-13 11:51:49 +00:00
Keir
26246604a7
This should've gone with the previous commit :/
2016-01-13 11:48:18 +00:00
Keir
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
Virizion
ee6425bbaf
Removed extra blank lines.
2016-01-12 23:31:35 -05:00
Virizion
dfd5a63b78
More changes and fixes.
2016-01-12 23:29:08 -05:00
fooify
63897b9b54
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-12 20:05:34 -08:00
Virizion
528a7435e7
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2016-01-12 20:25:08 -05:00
Virizion
b27d5849d8
General fixes.
2016-01-12 20:23:25 -05:00
NewGarbo
fb53e443e7
cleanup and cannons stuff
2016-01-12 20:27:24 +00:00
NewGarbo
f3003e795e
Implemented Outpost MK III
2016-01-12 18:59:01 +00:00
NewGarbo
6cde84ec5f
fixed outpost block placing/breaking boundary checking
2016-01-12 18:57:25 +00:00
NewGarbo
025f82e5ed
made the forcefield bump much weaker
2016-01-12 16:31:21 +00:00
Thanos paravantis
2795c858d7
Don't allow air blocks to be added to the block modification list. Add /skip without the need to use the async chat event.
2016-01-12 18:31:05 +02:00
Teddy
f1314d5c26
JSON now handled by JsonMessage Builder
2016-01-12 13:25:47 +00:00
NewGarbo
62f16ada81
that's not the correct bounds!
2016-01-12 07:57:35 +00:00
NewGarbo
5b4b5fb2b5
fixed outpost forcefield knocking you away even if the building is complete, also made the particles show the actual boundaries
2016-01-12 07:44:20 +00:00
libraryaddict
b1c6af4d1a
Update CB
2016-01-12 20:18:03 +13:00
NewGarbo
7d858c72f3
Merge branch 'clans/beta' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-12 07:12:18 +00:00
NewGarbo
a6be919e4a
agh lost some code ;-;
2016-01-12 07:10:22 +00:00
NewGarbo
ed8d9459b2
goes with the commit below VVVV
2016-01-12 07:02:19 +00:00
NewGarbo
d3452772ed
outposts work (grr git is weird trying to switch over to clans/beta)
2016-01-12 07:02:03 +00:00
NewGarbo
c873b6b886
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-12 06:58:53 +00:00
libraryaddict
c3e11e87ea
Fix small issues with burning and ignition
2016-01-12 19:10:32 +13:00
libraryaddict
11da5a3fe1
Fix fire combusting and cancelled damage events
2016-01-12 18:56:48 +13:00
Shaun Bennett
4e9a4c87d4
Merge pull request #123 in MIN/mineplex from bugfix/disguise-command to develop
...
* commit '0f587ba5d908afdccb877358d71e56a3edda49cd':
fixing "Kicked for flying again" again...
2016-01-11 17:20:51 -06:00
Shaun Bennett
3693a2b2c5
Merge pull request #122 in MIN/mineplex from bugfix/thanos to develop
...
* commit 'ed439569453dc248623834af6fb553341779e46c':
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
Remove unused imports.
Prevent players from stacking others with a menu inventory opened.
Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
2016-01-11 16:26:09 -06:00
Shaun Bennett
025b87c806
Merge pull request #121 in MIN/mineplex from feature/mutedsign to develop
...
* commit 'fa7eef504597011da14093fb76a8e088524eafd0':
Muted players can't write on signs.
2016-01-11 16:23:34 -06:00
Teddy
88c53bf464
Added default ChatStat for all games to prevent my server from dying when testing
2016-01-11 19:35:00 +00:00
NewGarbo
d656c7a212
fixed clans banned players counting as being online after joining and their territory then being blown up
2016-01-11 18:02:03 +00:00
Teddy
02ff8bdbdb
Custom stats working, escaping bug fix and List reset bug
2016-01-11 12:59:57 +00:00
Teddy
40d913beaf
Changed a List to reset each time its registered to prevent stats copying to the next game, automatic string escaping, party colour name changed to original colour
2016-01-11 12:35:44 +00:00
Teddy
b9d44d9a24
not updating properly, fixed
2016-01-11 12:14:29 +00:00
Teddy
78eaee98df
Typo mistake
2016-01-11 12:09:08 +00:00
Teddy
ec6e916c7b
more stable, progress for making 'easier-to-use'
2016-01-11 12:06:30 +00:00
NewGarbo
3773ab3f0b
fixed safelog npcs sticking around some time
2016-01-11 10:14:32 +00:00
NewGarbo
60a78e396f
remove legendary announcement in chat/middle text
2016-01-11 09:16:11 +00:00
Shaun Bennett
6c055c31a0
Fix flashing through doors, Update to 0.18c
2016-01-10 20:39:56 -05:00
NewGarbo
d5b5ac7bb0
changed regen level on giants broadsword from 4 to 3 and made slowness last longer so that screen doesn't glitch out
2016-01-10 23:06:39 +00:00
NewGarbo
d4ccb82791
didn't push this earlier
2016-01-10 23:03:16 +00:00
NewGarbo
6673081fb3
fixed LeechingAttribute from throwing an error when setting health above 20
2016-01-10 22:31:51 +00:00
NewGarbo
04c7f2c1f1
made pressure plates, buttons, and levers from working with block toss
2016-01-10 22:20:50 +00:00
Keir
1c49e3a111
Make chat log clickable, only close report instruction line suggests command.
2016-01-10 21:28:57 +00:00
NewGarbo
bccee71ff7
made signs placed by muted players get cleared on being placed
2016-01-10 21:16:49 +00:00
NewGarbo
734351011a
made all old clans ban clients get unloaded. there seems to have been problems with certain clients not unloading.
2016-01-10 21:15:50 +00:00
NewGarbo
9c3a62a308
made it so punished players can't place signs
2016-01-10 21:03:34 +00:00
NewGarbo
68808efb49
made players not be able to chat while chat is silenced
2016-01-10 20:57:12 +00:00
NewGarbo
fa3de2a479
made clans ban messages not public
2016-01-10 20:55:29 +00:00
NewGarbo
51872faa04
fix mutes not working
2016-01-10 20:53:55 +00:00
Mysticate
fa7eef5045
Muted players can't write on signs.
2016-01-10 13:13:38 -05:00
Teddy
5caeb8bee0
even nicer visual
2016-01-10 17:34:15 +00:00
Teddy
c814132b24
ratio's and nicer visuals
2016-01-10 17:33:18 +00:00
Teddy
83375a6883
stats not updating
2016-01-10 16:01:40 +00:00
Teddy
1bce624ab3
Finally got rid of MalformedJSON
2016-01-10 15:13:11 +00:00
Thanos paravantis
ed43956945
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
2016-01-10 16:37:51 +02:00
Shaun Bennett
46695f8449
Fix hub fly for YOUTUBE_SMALL
2016-01-09 18:44:32 -05:00
Shaun Bennett
83e5c7399e
Fix YOUTUBE_SMALL preferences
2016-01-09 18:41:19 -05:00
Shaun Bennett
8193b5121b
Dont allow /disguise for YOUTUBE_SMALL
2016-01-09 18:39:47 -05:00
Shaun Bennett
cd3037e7e5
Fix treasure purchases
2016-01-09 18:37:24 -05:00
Keir
bd865c7e64
Fix command permissions.
2016-01-09 23:12:08 +00:00
Keir
7db3f3469f
Destroy pool when a thread ends.
2016-01-09 22:21:27 +00:00
Keir
5f362a878a
Run some Redis functions async (as it sometimes blocks).
2016-01-09 22:21:15 +00:00
Keir
8b3bc7ca18
Fix timezone, correct url prefix and remove old debug code.
2016-01-09 21:51:54 +00:00
fooify
942460b471
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-09 13:05:44 -08:00
Teddy
263e1326cd
JSON progress
2016-01-09 20:22:29 +00:00
NewGarbo
fa509f0043
fixed giant's broadsword giving HUGE regen. PLEASE PUSH ASAP
2016-01-09 19:58:31 +00:00
Thanos paravantis
ce1bac8037
Remove unused imports.
2016-01-09 17:03:14 +02:00
Thanos paravantis
62e1fb3688
Prevent players from stacking others with a menu inventory opened.
2016-01-09 17:01:57 +02:00
xGamingDudex
f8e8669b5c
Added Party and Cupid set (arrow, jump, death, particle + full set
...
effect)
2016-01-09 14:07:40 +01:00
Sarah
0f587ba5d9
fixing "Kicked for flying again" again...
2016-01-09 12:07:57 +01:00
Thanos paravantis
ba3e7cb197
Merge branch 'master' into bugfix/thanos
2016-01-09 12:23:54 +02:00
Shaun Bennett
2df626b35e
Fix CustomDataManager crash
2016-01-08 18:06:33 -05:00
Shaun Bennett
511b39caa7
Merge branch 'master' into develop
2016-01-08 17:05:54 -05:00
Thanos paravantis
a1759a9fe3
Fix anvils not spawning from start and make the wave harder on anvil dance challenge.
2016-01-08 21:36:54 +02:00
Thanos paravantis
c1d65ed382
Do not allow score to increment above the max number on dogs vs cats challenge.
2016-01-08 17:51:00 +02:00
Thanos paravantis
45c40f5568
Fix map generation on mine a diamond challenge.
2016-01-08 17:35:17 +02:00
Keir
710654cd06
Use Validate class from Apache Commons to minify code.
2016-01-08 15:06:13 +00:00
Keir
7ce028203b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-08 13:59:43 +00:00
Keir
5cb91bb315
Allow reuse of ReportManager instance (for later use).
2016-01-08 13:59:30 +00:00
Teddy
43fb04b482
Import clean up
2016-01-08 13:46:57 +00:00
Teddy
78405749a4
Changed TreasureShard rewarding, removed Queue
2016-01-08 13:46:39 +00:00
Thanos paravantis
e114b623bd
Update water horror challenge to the latest version. Fix NPE on player quit.
2016-01-08 15:03:58 +02:00
Shaun Bennett
ee73b374a6
Forgot to uncomment in ClansLoginManager
2016-01-08 06:36:59 -05:00
Shaun Bennett
a75e2c15b8
Merge remote-tracking branch 'origin/develop' into develop
2016-01-08 06:35:37 -05:00
Shaun Bennett
15109707f3
Merge pull request #119 in MIN/mineplex from clans/alpha to develop
...
* commit '025615d080b8b925f319a2f7707d2c3fa4755a88':
Clans Alpha 0.18b fixes
2016-01-08 05:34:35 -06:00
NewGarbo
025615d080
Clans Alpha 0.18b fixes
2016-01-08 11:24:36 +00:00
Thanos paravantis
7d79a47093
Update water horror challenge to the latest version. Change death effect skull, hologram and particle height.
2016-01-08 13:21:20 +02:00
Sarah
5482d1dc40
Fixing "kicked for Flying"
2016-01-08 12:17:28 +01:00
Shaun Bennett
0a56a838d2
Fix ClansLoginManager, Remove pointless code in CoreClientManager
2016-01-08 05:45:49 -05:00
Shaun Bennett
6096fcad42
Fix hotbar issues
2016-01-08 04:06:11 -05:00
Shaun Bennett
504d9d508c
Slightly reduce Squid's Ink Blast damage in SSM
2016-01-08 03:15:30 -05:00
Shaun Bennett
1d2f61db8c
Disable purchasing Christmas Treasure
2016-01-08 03:15:05 -05:00
Shaun Bennett
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
Shaun Bennett
db7d814e02
Disable hub music
2016-01-08 01:42:05 -05:00
Shaun Bennett
19bb44cb9a
Disable HolidayManager and HolidayGiftManager
2016-01-08 01:41:02 -05:00
Shaun Bennett
9c3b07123f
Revert to normal HubType
2016-01-08 01:39:54 -05:00
Shaun Bennett
003af1b87c
Disable Holiday Words in DMT and Build
2016-01-08 01:38:49 -05:00
Shaun Bennett
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
NewGarbo
15d2118bc1
Added C.Mod rank, and started on rank info.
2016-01-07 23:32:51 +00:00
Shaun Bennett
b606c8da22
More tutorial
2016-01-07 18:08:54 -05:00
NewGarbo
e1e8c2bb97
changed outpost forcefields to be a bit larger to surround the outpost more.
2016-01-07 21:02:55 +00:00
NewGarbo
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
Teddy
6bf0970dbe
Unused import removed
2016-01-07 19:52:04 +00:00
NewGarbo
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
Keir
3be6030a5d
Exit if no identifier is supplied before any errors are caused.
2016-01-07 16:21:33 +00:00
Keir
21d8576787
Fix "bubbles" becoming detached from their icon.
2016-01-07 15:52:03 +00:00
NewGarbo
90a06d97b5
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)
2016-01-07 14:04:26 +00:00
NewGarbo
d4fdda8ef2
fixed outpost being built instantly on output block place.
...
cleaned up a bit
2016-01-07 14:03:15 +00:00
NewGarbo
5c810a46c9
holograms above outpost block should be centered in the block and made them despawn on outpost death
2016-01-07 13:26:18 +00:00
NewGarbo
e9789b2ee8
legendary pickkup message fix (FINALLY FIXED NOW )
2016-01-07 10:31:23 +00:00
NewGarbo
d88b14d9d6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-07 09:35:07 +00:00
NewGarbo
b685a207bc
quick modification to outposts, and fixed the legendary announcements being weird
2016-01-07 09:34:16 +00:00
Keir
644453a9c4
Name PubSub threads.
2016-01-07 07:06:55 +00:00
Keir
a63d98a2d7
Write to files asynchronously.
2016-01-07 07:04:24 +00:00
Keir
abc15e3a4c
Handle multiple multi-threaded Redis connections (and re-connections), improved logging, various refactors.
2016-01-07 06:58:21 +00:00
Keir
98a7b6d6d6
Allow data directory to be configured using a command-line parameter.
2016-01-07 04:40:39 +00:00
NewGarbo
ef929b39b3
updated clans version
2016-01-06 22:38:45 +00:00
NewGarbo
76c0230805
quikc change
2016-01-06 22:35:09 +00:00
NewGarbo
52c4a55180
outpost changes, and some other things
2016-01-06 22:32:36 +00:00
Thanos paravantis
dafd336526
Add water horror challenge idea, fix death effect hologram height.
2016-01-07 00:06:32 +02:00
libraryaddict
de6f6cf5f0
Add a IsLive check in Spleef
2016-01-07 08:49:26 +13:00
libraryaddict
c920d4efa1
Modify MapText to actually work, modify UtilText to save the images of characters
2016-01-07 04:48:44 +13:00
Thanos paravantis
71a0cd44a2
Format anti hack fix class.
2016-01-06 14:47:34 +02:00
Morten
82163e376b
Minor stuffs. Waiting for the build team to make us a chicken c:
2016-01-05 23:42:42 +01:00
Keir
63f8b3a74e
Keep files for 15 days instead of 1.
2016-01-05 22:33:07 +00:00
Teddy
99f0404fff
Queue speed up
2016-01-05 21:05:02 +00:00
Teddy
e2824dd0e0
Debugs removed
2016-01-05 21:01:51 +00:00
Teddy
d4fd6a6bf7
Treasure not giving Shards when dupes occur, fixed.
2016-01-05 21:00:43 +00:00
Thanos paravantis
101caf12ff
Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
2016-01-05 20:48:28 +02:00
Sarah
db2cddc443
Fixing Join/Quit messages
2016-01-05 19:10:40 +01:00
Teddy
d819671d16
Queue implemented for duplicate shard reward
2016-01-05 16:21:34 +00:00
Shaun Bennett
a73309fc11
Merge remote-tracking branch 'origin/develop' into develop
2016-01-04 18:14:10 -05:00
Shaun Bennett
f749300d48
Fix team stats not displaying properly
2016-01-04 18:13:54 -05:00
Shaun Bennett
10eb65a8d6
Merge pull request #114 in MIN/mineplex from bugfix/disguise-command to develop
...
* commit 'dd6d7b1b96947a400911bc5fa310039ab147c159':
updating denial message
Love you Sarah <3
Fixing Disguise File
update /Disguise for Hub as well
updating /disguise
2016-01-04 15:58:43 -06:00
Shaun Bennett
652084d071
Merge pull request #115 in MIN/mineplex from bugfix/thanos to develop
...
* commit '3770211e66b41e16440609a0a79b3999b9b6cca7':
Turf Wars: Include Teddy's border fix.
Turf Wars: Undo bracket formatting.
Turf Wars: Apply knockback on all players when there are only two in the match.
Turf Wars: Add comment on block physics event.
Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
2016-01-04 15:56:32 -06:00
Shaun Bennett
962efe4a61
Fix not being able to join games through portals
2016-01-04 16:41:07 -05:00
Shaun Bennett
ed81411373
Fix carl bonus messages
2016-01-04 15:58:27 -05:00
Thanos paravantis
3770211e66
Turf Wars: Include Teddy's border fix.
2016-01-04 22:58:11 +02:00
Shaun Bennett
05ef4d30c7
Store a set of active members for objective goals
2016-01-04 15:56:33 -05:00
Morten
f24cc35ef8
Made some bugfixes and made a challenge harder
2016-01-04 21:13:12 +01:00
Thanos paravantis
982e684a45
Turf Wars: Undo bracket formatting.
2016-01-04 21:42:58 +02:00
Shaun Bennett
c50fb52a88
Disable New Years Countdown
2016-01-04 14:21:21 -05:00
Shaun Bennett
c739ecc26d
Fix forcefield for YOUTUBE_SMALL
2016-01-04 14:20:39 -05:00
Shaun Bennett
ce8586e5c5
More work and refactoring on the tutorial
2016-01-04 14:18:58 -05:00
Keir
7d16aeb84d
Cache private messages for chatsnap reports.
2016-01-04 18:04:47 +00:00
Keir
80c389faf4
Make private message event implement cancellable.
2016-01-04 17:59:16 +00:00
Thanos paravantis
47c78bcba1
Turf Wars: Apply knockback on all players when there are only two in the match.
2016-01-04 17:19:40 +02:00
Thanos paravantis
f6ce98f65b
Turf Wars: Add comment on block physics event.
2016-01-02 23:33:08 +02:00
Thanos paravantis
03c6395a30
Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
2016-01-02 23:30:27 +02:00
AlexTheCoder
2b365e4afd
- Fixed blacklisting to stop join spam
2016-01-02 14:35:05 -05:00
Sarah
dd6d7b1b96
updating denial message
2016-01-02 16:45:15 +01:00
Thanos paravantis
5ac841dbf1
Merge branch 'master' into thanos-mineware
2016-01-02 16:34:30 +02:00
Thanos paravantis
a0d5a8229f
Change /restrict command, update death effect.
2016-01-02 16:33:21 +02:00
NewGarbo
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
Thanos paravantis
b3e2d67152
Change death effect skull and item spawn height, add /restrict <challenge> command.
2016-01-02 15:27:44 +02:00
Morten
7e1b0b9110
Love you Sarah <3
2016-01-02 03:19:39 +01:00
Sarah
a06a0060aa
Fixing Disguise File
2016-01-02 01:53:19 +01:00
Sarah
a30c2b0d75
update /Disguise for Hub as well
2016-01-02 00:53:56 +01:00
Thanos paravantis
c0a397b9fb
Add particles on death effect, started working on chicken attack.
2016-01-01 17:39:16 +02:00
Thanos paravantis
e89785963a
Change kit helmet to skull.
2016-01-01 15:35:45 +02:00
Thanos paravantis
bd63ff84e7
Add missing DeathEffectData and DeathText.
2016-01-01 15:30:16 +02:00
Thanos paravantis
49e3fabee5
Improve death effect, add death effect data and text.
2016-01-01 15:29:00 +02:00
Thanos paravantis
faa866fba1
Stable death effect version.
2016-01-01 01:35:05 +02:00
Shaun Bennett
2e017fa5ca
Fix redis command
2015-12-31 16:11:51 -06:00
Thanos paravantis
edb6318f31
Add rotating chicken head when a player dies on a challenge.
2015-12-31 23:27:15 +02:00
Shaun Bennett
8232d11cd1
Remove in game notifications, change sale message
2015-12-31 15:07:26 -06:00
Shaun Bennett
74eb04e5b4
Merge pull request #112 in MIN/mineplex from feature/new-year to develop
...
* commit '6b3a5416643389a7bcac8df93f40f492452971e5':
Accurate timings
Small edits
Flame
Made it activate in all lobbies via command.
Added a new years countdown to the hub.
2015-12-31 14:51:49 -06:00
William Burns
6b3a541664
Accurate timings
2015-12-31 18:53:57 +00:00
Thanos paravantis
287f782b82
Spawn eggs with velocity when a player dies.
2015-12-31 20:15:47 +02:00
Shaun Bennett
456b0dbeb7
Merge pull request #110 in MIN/mineplex from feature/MasterBuilder-Unban to develop
...
* commit 'f83016e0074ce810f727276a0feb127ecd69098f':
Also really quickly fixed the Invisibility in lobby bug (hopefully)
Removed a weird query :/
Finished up the Unban feature...
Added a feature to unban clients across the network But there still a bug when you type a username of a none registered member. Will fix ASAP - likely after Mineware
2015-12-31 11:27:08 -06:00
Sarah
8ef1a524c1
updating /disguise
2015-12-31 12:01:24 +01:00
Mysticate
efbd1c52d2
Merge remote-tracking branch 'origin/master' into feature/typewars-antimacrorekter
2015-12-31 03:01:23 -05:00
Mysticate
5ff9d1985b
Monitoring for josh + the mods
2015-12-31 03:00:40 -05:00
William Burns
637baed830
Small edits
2015-12-31 01:24:58 +00:00
William Burns
874695cdf6
Flame
2015-12-31 00:50:53 +00:00
William Burns
a64dc6a8d4
Made it activate in all lobbies via command.
2015-12-31 00:46:31 +00:00
Keir
3496abe227
Java 8 goodness.
2015-12-30 21:41:24 +00:00
William Burns
1b40cece80
Added a new years countdown to the hub.
2015-12-30 20:04:01 +00:00
libraryaddict
1a30e0b335
Latest changes to CB
2015-12-30 23:34:27 +13:00
AlexTheCoder
a4853e667c
- Gameplay edits and disabling broadcaster code
2015-12-30 03:23:21 -05:00
libraryaddict
92c4450eea
Update the dual version
2015-12-30 21:12:11 +13:00
Keir
2716039d07
Small cleanup.
2015-12-29 23:49:57 +00:00
Keir
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
Keir
dffd7d95ec
Don't include sender in recipients.
2015-12-29 23:35:54 +00:00
William Burns
f1c7424939
Fixing hotbar
2015-12-29 15:19:09 +00:00
Shaun Bennett
55cdf4148a
Merge branch 'develop'
2015-12-29 03:21:03 -06:00
Shaun Bennett
16ee74885e
Add maintenance line
2015-12-29 02:52:53 -06:00
Shaun Bennett
7ad12d0a6b
Show Host Rank in private servers
2015-12-29 00:50:20 -06:00
Shaun Bennett
7104f1363a
Give YT rank access to extra preferences
2015-12-29 00:34:18 -06:00
Keir
00e92f2569
Change date time format, biggest -> lowest units.
2015-12-29 06:20:13 +00:00
Keir
16b3ad6c1c
Hovering over a reports age now shows the full date and time it was created.
2015-12-29 06:09:45 +00:00
Keir
738815bbb1
Show age of report instead of creation date and time for ease of use.
2015-12-29 05:51:50 +00:00
Keir
278932b9b8
Use CST timezone.
2015-12-29 05:23:18 +00:00
Keir
912b4aa4c8
Get Redis connection data from redis-servers.dat file.
2015-12-29 05:19:56 +00:00
fooify
fe337986bf
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-28 16:16:10 -08:00
Virizion
8a8d5b088b
Switch to 7x7 builds.
2015-12-28 16:48:03 -05:00
Virizion
3d9a252868
Added auto pickup and fixed some stuff.
2015-12-27 15:26:43 -05:00
Virizion
162b3eb33f
Stopped a bunch of block events.
2015-12-27 14:34:24 -05:00
Thanos paravantis
a15f6f8473
Working on the new MineWare theme.
2015-12-26 22:33:54 +02:00
William Burns
1066becd68
push
2015-12-26 20:21:46 +00:00
Thanos paravantis
d5dd342af3
Start changing MineWare theme.
2015-12-26 14:45:54 +02:00
Thanos paravantis
317f5799fe
Fix classpath on mineplex core.
2015-12-26 12:54:47 +02:00
Thanos paravantis
499ad655c9
Merge branch 'MortensRawBugFixes' into thanos-mineware
...
Conflicts:
Plugins/Mineplex.Core/.classpath
2015-12-26 12:29:26 +02:00
Thanos paravantis
fcc1cd46a5
Make bouncing block red wool traps less strict when player walks on them.
2015-12-26 12:28:07 +02:00
Thanos paravantis
dcff689faf
Merge branch 'master' into thanos-mineware
...
Conflicts:
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-26 11:55:57 +02:00
Virizion
845014b677
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-25 15:49:41 -05:00
Shaun Bennett
c680d91b56
Nerf TypeWars gems (again)
2015-12-25 03:12:04 -06:00
Shaun Bennett
dd8e91e463
Update MOTD
2015-12-25 03:03:53 -06:00
Shaun Bennett
25d36b546a
Remove unnecessary files
2015-12-25 01:53:00 -06:00
Shaun Bennett
d08cfa0c4c
Holiday Gifts
2015-12-25 01:51:36 -06:00
Keir
fb24f4a1b0
Re-add ReportServer module (got removed somehow) and add it under the "Other" group.
2015-12-25 00:37:21 +00:00
Keir
56c5b8edee
Rename module to ReportServer.
2015-12-24 21:29:40 +00:00
Keir
2252a5397d
Fix file filter and reduce it down to 1 line.
2015-12-24 21:25:55 +00:00
Keir
cc421c1435
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-12-24 21:19:30 +00:00
Keir
42aba8bda1
Added file purger (runs every 30 minutes, purges anything older than a day).
...
Use a logger instead of sout.
General cleanup, especially of console messages.
2015-12-24 21:13:09 +00:00
fooify
41f56e9853
Lots of typo fixes and such
2015-12-24 11:13:54 -08:00
fooify
b356bce177
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-24 11:09:08 -08:00
libraryaddict
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
Virizion
b0f8edb0f9
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-23 18:25:52 -05:00
NewGarbo
aa50c4762f
fixes (?)
2015-12-23 18:55:44 +00:00
libraryaddict
1d4a5e5804
Clean up imports, set resource pack on clans.
2015-12-24 07:47:05 +13:00
libraryaddict
000b1f85b7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2015-12-24 07:41:55 +13:00
libraryaddict
67bdc6832f
Tentative beginnings for clans resource packs
2015-12-24 07:40:49 +13:00
NewGarbo
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
NewGarbo
ff24ebc9f4
lots of changes that i can't remember at this point
2015-12-23 18:22:20 +00:00
William Burns
79dea726aa
Added check for falling from map.
2015-12-23 10:59:12 +00:00
William Burns
c48df36459
Canvas reset with starting picture.
2015-12-23 10:26:14 +00:00
William Burns
ad1d444af8
Kit changes and new words.
2015-12-23 09:52:52 +00:00
William Burns
08b5e7b4db
Working loadouts.
2015-12-23 09:21:43 +00:00
Morten
f83016e007
Also really quickly fixed the Invisibility in lobby bug (hopefully)
2015-12-23 00:39:16 +01:00
Morten
8c399f03da
Removed a weird query :/
...
Status: Finished
2015-12-22 21:36:19 +01:00
Morten
9336eb19fa
Finished up the Unban feature...
2015-12-22 21:31:57 +01:00
fooify
0ac2158988
i before e!
2015-12-22 11:02:57 -08:00
fooify
255dd0bdb3
fixed cosmetic menu item dropping bug
2015-12-22 11:02:37 -08:00
fooify
592fcbd282
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-22 10:55:11 -08:00
fooify
a8d9956846
more grammatical errors hast been fixed
2015-12-22 10:35:20 -08:00
Morten
14fd00a368
Bug fixes
2015-12-22 16:02:45 +01:00
Virizion
0322ae1217
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-12-22 00:02:21 -05:00
William Burns
b255c58653
Merge branches 'develop' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-21 21:56:08 +00:00
Shaun Bennett
2ccd7a5de0
Fix Type Wars stat icon
2015-12-21 13:20:04 -05:00
Shaun Bennett
7a72762c78
Update MOTD
2015-12-21 12:56:37 -05:00
Shaun Bennett
c63014b51f
Type-Wars merge
2015-12-21 12:49:10 -05:00
Sarah
a5436d63c0
Updating Holiday Achievements
2015-12-21 18:45:26 +01:00
Sarah
7c66bdbbde
Updating Stats GUI
2015-12-21 18:25:44 +01:00
Sarah
010b1b0a5d
Achievements....
2015-12-21 18:08:11 +01:00
Sarah
6e3274ff2f
changing Category
2015-12-21 18:06:00 +01:00
Sarah
f15c318e5c
adding PM message.
2015-12-21 18:02:25 +01:00
Sarah
082b5e156c
fixing Kit NPEs
2015-12-21 17:48:17 +01:00
Sarah
ff5761cc1d
Fixing ending Stats.
2015-12-21 17:44:15 +01:00
Sarah
590da2128c
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-12-21 17:43:51 +01:00
Morten
1726aa2530
Added a feature to unban clients across the network
...
But there still a bug when you type a username of a none registered member.
Will fix ASAP - likely after Mineware
2015-12-21 12:58:19 +01:00
Shaun Bennett
5469289d82
Wrong iterator!
2015-12-21 06:57:56 -05:00
Shaun Bennett
fae2a5d2bf
Update game display
2015-12-21 04:40:30 -05:00
Shaun Bennett
a235103066
Merge pull request #106 in MIN/mineplex from update-menu to develop
...
* commit 'f4050fb1ff54dbe4639b0258eff53360d800d0b9':
Adjust GUI, fix beta button
Yo shaun debug this m8 ty
2015-12-21 03:36:46 -06:00
Shaun Bennett
f4050fb1ff
Adjust GUI, fix beta button
2015-12-21 04:35:57 -05:00
Shaun Bennett
99285b2ac8
Merge remote-tracking branch 'remotes/origin/type-wars' into develop
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-12-21 03:50:55 -05:00
Shaun Bennett
0da28faab8
Work on new tutorial
2015-12-21 03:49:27 -05:00
Mysticate
0f5be6444b
Yo shaun debug this m8 ty
2015-12-21 02:23:59 -05:00
Morten
c683ce5f0a
Improved minors bugs and implemented a more efficient Challenge rotation system
2015-12-20 21:08:32 +01:00
Sarah
816da0f633
Fixing Gems
2015-12-20 12:00:32 +01:00
fooify
fe658b30a1
Grammatical errors hath been fixed!
2015-12-19 15:03:42 -08:00
Morten
7c52b813f9
Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBouncingBlock.java
2015-12-19 23:32:21 +01:00
Sarah
f1188529f2
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 13:09:26 +01:00
Sarah
c56cd0d56e
adjusting some timings
2015-12-19 13:08:53 +01:00
Sarah
35966d88cf
Fixing Tutorial Minion
2015-12-19 13:05:39 +01:00
Sarah
7327d9463f
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 13:00:49 +01:00
Sarah
8a54388480
fixing last commit
2015-12-19 13:00:12 +01:00
Sarah
32a0dd6668
adding Tutorial notification
2015-12-19 12:59:37 +01:00
Sarah
152e759c10
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 12:56:05 +01:00
Sarah
7cb002ca86
Adding Tutorial notification
2015-12-19 12:55:28 +01:00
Sarah
f8bffc9f88
nuke delay and Stats
2015-12-19 12:45:06 +01:00
Virizion
c0ab31fdac
Finished up fixes.
2015-12-19 00:19:50 -05:00
AlexTheCoder
66c9fa122c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2015-12-18 21:33:59 -05:00
AlexTheCoder
09528a9262
- Initial broadcast stuff
2015-12-18 21:33:40 -05:00
Virizion
a5c18f4677
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-18 20:05:03 -05:00
Sarah
b3afa0094e
Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes
2015-12-19 00:59:15 +01:00
Sarah
dab2416ccd
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 00:49:16 +01:00
Sarah
6c5e3d7509
Fixing visibility.
2015-12-19 00:48:42 +01:00
Thanos paravantis
3128e9766f
Remove arrow trail from arrow rampage challenge.
2015-12-18 21:55:44 +02:00
William Burns
c2e88c2794
Merge branch 'develop' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data
2015-12-18 18:16:32 +00:00
William Burns
13cfc0e12a
Updated to a better check
2015-12-18 18:16:20 +00:00
Keir
a72125b1dc
Implement new error thingy.
2015-12-18 18:11:25 +00:00
William Burns
0e0a22ab15
Error page
2015-12-18 17:56:22 +00:00
Keir
0b4568e785
Commit progress.
2015-12-18 17:41:03 +00:00
Keir
77595c8fbc
Allow search form to be loaded when no identifier is supplied (error messages are a bit crappy atm I'm aware).
2015-12-18 16:20:57 +00:00
Keir
bd887e1eef
Make search box functional.
2015-12-18 15:52:20 +00:00
William Burns
f57304764c
Added a hotbar layout editor
2015-12-18 15:16:00 +00:00
NewGarbo
1840572c49
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.
2015-12-18 11:13:38 +00:00
Shaun Bennett
298ea1e5e6
Merge pull request #101 in MIN/mineplex from update-paintball to develop
...
* commit 'd561915fd32885036b55cc6a05899934a544e131':
FORMATTING CHANG EI'M GOING TO CRY UGH
DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D
Changed dns api key to new key. Prevent server monitor redis calls to cause restarts. Added winter chests to customer support.
Epic chnage that saved the day omg
Die player cache
Quick changes to improve things.
Uncommented bouncy balls
Final tweaks to random armorstand
Quick thing before merge
Worked on double.
Switching branches
Formatting
Reformatted
Fixed paintball to the max. :>>
Class
Switching branches c:
Sniper work
Work. Deemed unsuitable due to an issue with the paintballs flying wide.
Added a sniper kit! :D
2015-12-17 23:32:22 -06:00
Shaun Bennett
f80648bfbc
Update DBPool to load from file
2015-12-18 00:32:07 -05:00
Mysticate
d561915fd3
FORMATTING CHANG EI'M GOING TO CRY UGH
2015-12-17 23:16:57 -05:00
Mysticate
2bf734a15c
DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D
2015-12-17 23:08:07 -05:00
Shaun Bennett
2c09fd969b
Attempt at fixing spectator page
2015-12-17 22:24:44 -05:00
Virizion
806b656dcf
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-17 21:56:01 -05:00
Shaun Bennett
53f9a051c5
Fix spectator page sorting team list
2015-12-17 21:52:34 -05:00
Virizion
7621fe793d
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-17 21:50:32 -05:00
Virizion
5f506e3810
Moved team generation.
2015-12-17 21:49:15 -05:00
Mysticate
066d0a861f
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-17 21:00:15 -05:00
NewGarbo
4bf7e15055
player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
2015-12-18 01:05:02 +00:00
Jonathan Williams
c2fb6e6c15
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-17 18:34:25 -05:00
Jonathan Williams
2953fe395f
Changed dns api key to new key.
...
Prevent server monitor redis calls to cause restarts.
Added winter chests to customer support.
2015-12-17 18:33:49 -05:00
William Burns
e7243d4b9c
Re-add getArcadePlayer(Player player)
2015-12-17 22:19:45 +00:00
William Burns
3e8c3cb928
Changed to setData in PlayerCustomData
2015-12-17 22:16:05 +00:00
William Burns
2ac28c4fd5
Merge branches 'develop' and 'feature/player-data' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-12-17 21:44:31 +00:00
William Burns
5c045bfce4
Changes to core client manager, and finishing custom data!
2015-12-17 21:27:44 +00:00
libraryaddict
7f188072ad
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2015-12-18 10:03:41 +13:00
libraryaddict
66372c397b
First version of ResourcePackManager that handles all resource packs globally
2015-12-18 10:03:03 +13:00
Thanos paravantis
9a1a652e85
Merge branch 'master' into thanos-mineware
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
2015-12-17 20:54:28 +02:00
Thanos paravantis
51c572bf44
Prevent game countdown if there is only one player, fix typo on Dog vs Cat challenge.
2015-12-17 20:48:55 +02:00
Keir
2e02b9c8ea
Hide WIP rank label.
...
Fix spelling issue.
2015-12-17 17:43:36 +00:00
Thanos paravantis
d38276d23d
MineWare updates and several changes on challenges.
2015-12-17 17:57:33 +02:00
William Burns
7d9b97180d
Testing ArcadePlayer implementation
2015-12-17 01:48:55 +00:00
Mysticate
d28c2be1c3
Epic chnage that saved the day omg
2015-12-16 20:26:04 -05:00
NewGarbo
b4c3ce9fba
a couple more prettificatons to pvp timer messages.
2015-12-16 23:19:04 +00:00
NewGarbo
eb9ba92fb1
one more quick message change/fix
2015-12-16 22:53:24 +00:00
NewGarbo
2ee1ccbcf9
qa changes to pvp safety
2015-12-16 22:48:55 +00:00
William Burns
ee202bc7f5
Add MineplexPlayer -> ArcadePlayer
2015-12-16 22:32:34 +00:00
William Burns
4077aa808f
Add to Arcade and Hub
2015-12-16 22:01:51 +00:00
William Burns
370c59ce75
Added custom data
2015-12-16 21:52:41 +00:00
NewGarbo
d619a9644b
few changes to pvp timer, and fixed bugs etc
2015-12-16 18:25:30 +00:00
Sarah
4e9e0243cd
Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
2015-12-16 18:16:08 +01:00
Keir
ad9620bb3d
Fix formatting.
2015-12-16 16:02:45 +00:00
Keir
3ecb4c7fb8
Report handlers are now parsed and displayed correctly.
2015-12-16 16:01:19 +00:00
Keir
db5327d2e4
Online reports can now be updated without re-sending all the data (ie we don't want to update all the chat messages when a member of staff handles a report).
...
Misc. changes and fixes.
2015-12-16 15:51:01 +00:00
Thanos paravantis
81f03e4b68
Update anti-hack jump fix for Bouncing Block and Arrow Rampage.
2015-12-16 17:18:19 +02:00
Keir
cd18d2a94f
ReportServer fixes and improvements.
2015-12-16 15:05:00 +00:00
William Burns
baf0f254bb
Custom data, waiting for JLO
2015-12-16 14:41:57 +00:00
Morten
ba7c4dc4ce
Small fixes
2015-12-16 15:41:08 +01:00
Keir
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
Keir
9c7c6fdb37
Don't treat these ints as strings (quicker comparison).
2015-12-16 13:58:05 +00:00
Keir
56d606adf0
Constants cannot hold arrays.
2015-12-16 13:38:48 +00:00
Virizion
628ee8a137
Some small fixes.
2015-12-16 00:02:21 -05:00
Virizion
7fa1963268
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-15 23:06:13 -05:00
Mysticate
d16dd4a9d2
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-15 19:35:55 -05:00
Mysticate
4566577c68
Die player cache
2015-12-15 19:26:09 -05:00
Keir
b5149d2da7
Implemented williams frontend design.
2015-12-16 00:22:55 +00:00
Mysticate
b36bf37197
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-15 19:22:38 -05:00
William Burns
958399be59
Merge branch 'feature/report' of ssh://184.154.0.242:25565/min/mineplex into feature/report
2015-12-15 22:17:15 +00:00
William Burns
bc88a35cea
Add my first design!
2015-12-15 22:17:05 +00:00
Keir
398fcfdcba
Update php code to parse new report data.
...
Main class is now view.php.
2015-12-15 22:13:23 +00:00
Keir
5528c7c885
Push iml file.
2015-12-15 21:55:42 +00:00
Keir
1042032836
Update the web side to handle to handle the new changes.
2015-12-15 21:36:54 +00:00
Keir
6d9bcb8e66
Reworked serialization and store more data in json files for later parsing.
...
Internally store UUIDs for reports and convert them as needed for display to user.
Many other misc. changes and refactorings.
2015-12-15 21:30:45 +00:00
NewGarbo
7ac1fd86b4
made pvp timer players immune to skills
2015-12-15 21:12:49 +00:00
NewGarbo
baef84f4d9
fixed pvp timer subtitles bugged out
2015-12-15 20:09:54 +00:00
Shaun Bennett
211e440e67
Merge remote-tracking branch 'remotes/origin/master' into develop
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
2015-12-15 15:00:14 -05:00
Shaun Bennett
aef704d972
Slight winter reward rarity changes
2015-12-15 14:58:09 -05:00
Shaun Bennett
5f14d6675f
Fix shard values
2015-12-15 14:56:19 -05:00
Shaun Bennett
07f610d4bd
More Fixes
2015-12-15 14:45:12 -05:00
Thanos paravantis
7e3bcae0d4
Mineware Challenge Updates.
...
- Prevent challenge from ending if all players alive have the 'spectating' property to true.
- Prevent MAC from triggering when players jump high on Bouncing Block challenge.
- Minor changes to challenge descriptions.
- Remove Evolution of Combat challenge (unused).
2015-12-15 21:12:01 +02:00
Shaun Bennett
607c164753
Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop
2015-12-15 13:55:01 -05:00
Shaun Bennett
92b82d786b
Don't give Winter Holiday Chests to offline players
2015-12-15 13:34:47 -05:00
Shaun Bennett
b9a688c4e7
Update monthly bonuses
2015-12-15 13:07:49 -05:00
Shaun Bennett
e3e757da8a
Fix mounts owned count
2015-12-15 13:06:11 -05:00
Shaun Bennett
3edba0fac6
Fix Grinch Hat
2015-12-15 12:28:06 -05:00
Shaun Bennett
f2107b7b79
Merge remote-tracking branch 'origin/develop' into develop
2015-12-15 12:07:40 -05:00
Shaun Bennett
2216fdc52c
Dont disable new gadgets in games
2015-12-15 12:07:34 -05:00
Sarah
40ae7743c6
reverting last "fix"
2015-12-15 14:20:21 +01:00
NewGarbo
6a346790f7
disable tutorial
2015-12-15 12:00:56 +00:00
NewGarbo
1da04b84b5
test push (change version to 0.17d)
2015-12-15 11:57:33 +00:00
NewGarbo
c63bac6433
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-15 11:42:16 +00:00
libraryaddict
47ad563596
Spawn nametags far far away from players
2015-12-15 22:46:30 +13:00
AlexTheCoder
6c1c40a972
- Fixed command bugs
2015-12-15 02:25:16 -05:00
AlexTheCoder
02f6a14f07
- Game commands
2015-12-15 02:06:59 -05:00
Sarah
cf58fdee4a
trying to fix the spigot Chat spam thingy.
2015-12-15 05:29:59 +01:00
Cheese
871c97f7af
changed chest %'s
2015-12-15 09:25:44 +11:00
Sarah
afa45c47ca
Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial
2015-12-14 14:23:42 +01:00
NewGarbo
9137fcfe40
loads of changes (pvp timer, unsafe stuff)
2015-12-14 12:39:00 +00:00
AlexTheCoder
73c84c530e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2015-12-14 06:40:16 -05:00
AlexTheCoder
ee63332062
- Moved setting changes
2015-12-14 06:39:35 -05:00
Cheese
0f38c7b287
increased minimum coal
2015-12-14 22:12:50 +11:00
Cheese
951cd65903
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 22:05:22 +11:00
Cheese
045bc760c2
increassed cooldown, people getting trapped perm
2015-12-14 22:05:08 +11:00
Cheese
809ff649be
lowered rarities a bit
2015-12-14 22:03:09 +11:00
Shaun Bennett
7181a26e58
Remove pointless equals()
2015-12-14 05:56:39 -05:00
Cheese
9e72e5adf1
nicer text
2015-12-14 21:43:11 +11:00
Cheese
daa9f165b1
removed coins from gadgets
2015-12-14 21:41:47 +11:00
Cheese
52394c89dd
fixed skins beign wrong way around
2015-12-14 21:34:27 +11:00
Cheese
0ecd5a05f5
fixed hat ownership
...
reduced coal cost
2015-12-14 21:32:06 +11:00
Cheese
00de6880ba
fixed wrong types
2015-12-14 21:25:30 +11:00
Cheese
342e9f2345
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 20:53:49 +11:00
Cheese
1189535748
icon fixes
2015-12-14 20:53:34 +11:00
Shaun Bennett
816c057eb3
Notify server about opening chest
2015-12-14 04:49:44 -05:00
Shaun Bennett
6ec8ec4c01
Merge pull request #97 in MIN/mineplex from william-gladiators to master
...
* commit 'd91e4ab4f756746b31c7ebdd3e7d33c139ea7d30':
Another door bug, and a title fix.
Health looks nicer.
Bug fixes. Title shortened.
2015-12-14 03:45:55 -06:00
Shaun Bennett
daf1d29ce0
Fix Carl
2015-12-14 04:44:11 -05:00
Shaun Bennett
50bf97ae4a
Fancy treasure changes
2015-12-14 04:19:15 -05:00
Cheese
670eaa1954
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 19:16:03 +11:00
Shaun Bennett
e4fd97467f
More treasure changes
2015-12-14 03:14:52 -05:00
Cheese
288c20fc74
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 19:13:05 +11:00
Cheese
9e35399d1d
rarities tweaked + shards
2015-12-14 19:09:55 +11:00
Shaun Bennett
db9db558a0
Update GUI slots
2015-12-14 02:56:07 -05:00
Shaun Bennett
4afca01ad0
Treasures!
2015-12-14 02:49:51 -05:00
Cheese
c508b5ea96
chest visuals
2015-12-14 18:13:19 +11:00
Shaun Bennett
063c87c4fe
Merge remote-tracking branch 'origin/master'
2015-12-14 00:29:11 -05:00
Shaun Bennett
cdbcae7e3e
Cosmetic Menu Update
2015-12-14 00:28:28 -05:00
Cheese
048a9a81b8
gadget ammo should no logner be purchasable
2015-12-14 16:20:39 +11:00
Virizion
93c13d138d
Remove some debug stuff I forgot to remove.
2015-12-14 00:10:45 -05:00
Virizion
09643d3e61
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-14 00:08:32 -05:00
Cheese
7f9e5c4ec9
more coal
2015-12-14 16:06:49 +11:00
Cheese
f6f04fe256
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 16:04:05 +11:00
Cheese
55fffdad59
fixed some colors
2015-12-14 16:03:51 +11:00
Virizion
b3b41e453b
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-14 00:01:41 -05:00
Virizion
d8f44434ff
Fixed a bunch of bugs. Still need to fix clicking compass ending game.
2015-12-14 00:00:40 -05:00
Shaun Bennett
e8b0e5dd8e
Fix IntellIJ Files
2015-12-13 23:51:47 -05:00
Shaun Bennett
8e31c79c58
Merge remote-tracking branch 'origin/master'
2015-12-13 23:46:46 -05:00
Cheese
bccade55bc
reduced coal fumes size
2015-12-14 15:43:45 +11:00
Shaun Bennett
5be91de006
Merge master
2015-12-13 23:40:18 -05:00
Cheese
f26c31b7ec
xmas a little harder
2015-12-14 15:33:09 +11:00
Shaun Bennett
fe3431ba04
Cosmetic Menu Update
2015-12-13 23:31:21 -05:00
Cheese
1073981778
Merge branch 'master' into update-xmaschaos
2015-12-14 15:30:15 +11:00
Cheese
94169a5b8a
it made me push it :(
2015-12-14 15:29:34 +11:00
Cheese
c34ac3ec52
xmas
2015-12-14 15:21:43 +11:00
Jonathan Williams
dcf3c1ea88
Deleted and added new Cache since renaming was jacked up.
2015-12-13 23:14:17 -05:00
Mysticate
42244ae798
Snowman AI fix
2015-12-13 22:43:11 -05:00
Mysticate
a04eaddc42
Fixed bump
2015-12-13 22:25:18 -05:00
libraryaddict
f90484c37f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-14 15:43:03 +13:00
libraryaddict
b5bdf7ced4
Remove custom name on players on join and arcade spectator
2015-12-14 15:42:32 +13:00
Virizion
54911bb213
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-13 19:54:57 -05:00
Virizion
12eba41975
Fixed corner stairs.
2015-12-13 19:52:32 -05:00
Mysticate
0dd7db27cd
FIXED FORAMTTING
2015-12-13 19:49:41 -05:00
Mysticate
a827f95eb4
Fixed scoreboard. VIVA LA FIESTA
2015-12-13 19:24:24 -05:00
Mysticate
0e9e8c155f
Quick fix that I don't think i caused.
2015-12-13 19:11:06 -05:00
Mysticate
0c383f8bf4
Remove bad message
2015-12-13 18:58:03 -05:00
Mysticate
90145bf8e7
Merge branch 'master' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
update-xmaschaos
Conflicts:
Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
2015-12-13 18:57:35 -05:00
Mysticate
35ab40727b
XMAS UPDATE OMG :O
2015-12-13 18:55:21 -05:00
xGamingDudex
64fb2b11d8
Added fake skin data
...
+Moved hats to use fake non-changing skin data
+Added Rudolph hat
+Added Grinch hat
+Added suport for fake skins on DisguisePlayer
+Tweaked PartyPopper
2015-12-13 23:09:25 +01:00
Shaun Bennett
6c2b40d63a
Cannon work
2015-12-13 15:40:32 -05:00
William Burns
d91e4ab4f7
Another door bug, and a title fix.
2015-12-13 20:27:37 +00:00
Keir
50753e30e6
Clicking a users name copies it to the users clipboard and also displays an alert to the user that this has happened.
2015-12-13 19:12:32 +00:00
Shaun Bennett
677e95a7fd
Update IntellIJ grouping
2015-12-13 14:05:28 -05:00
Sarah
63f5794c79
Only fix Giant facings is prepare Phase
2015-12-13 14:31:21 +01:00
William Burns
e31124e212
Health looks nicer.
2015-12-13 13:29:46 +00:00
William Burns
4fad564e15
Bug fixes. Title shortened.
2015-12-13 12:50:06 +00:00
Cheese
b095fa9efe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-13 21:15:32 +11:00
Cheese
011a194dc6
fixed exploit
2015-12-13 21:14:57 +11:00
Virizion
8bcc36adb1
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-13 01:39:42 -05:00
Virizion
ec86cad7ee
Changed descriptions.
2015-12-13 01:38:38 -05:00
libraryaddict
e7213fdb7e
Remove project specific settings
2015-12-13 16:41:37 +13:00
libraryaddict
9058428484
Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage
2015-12-13 16:40:46 +13:00
Sarah
a92361f2fe
some more descriptions for Tutorials
2015-12-12 20:03:35 +01:00
Thanos paravantis
4e35b398d3
Change challenge start message format.
2015-12-12 15:57:31 +02:00
AlexTheCoder
cf05cf5d7b
- All finished
...
- Added method for disabling explosion manager miniplugin
2015-12-12 05:12:17 -05:00
Thanos paravantis
ac69b33f3e
Merge branch 'MortensRawBugFixes' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
2015-12-12 10:14:29 +02:00
Thanos paravantis
2773518e30
Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
2015-12-12 10:12:42 +02:00
Thanos paravantis
92e23b2e1b
Rename method on Fast Food challenge.
2015-12-12 10:11:42 +02:00
AlexTheCoder
1535e167cd
- Inventory enum fix
2015-12-12 02:36:01 -05:00
AlexTheCoder
49186680f0
- Game ID conflict resolution
2015-12-12 00:31:13 -05:00
AlexTheCoder
31be60bdb4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2015-12-12 00:25:24 -05:00
Virizion
2a45018fcd
array thing
2015-12-11 23:41:46 -05:00
Virizion
7a82cf04f0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-11 23:02:16 -05:00
Shaun Bennett
402530d671
Merge pull request #94 in MIN/mineplex from william-gladiators to master
...
* commit '0d4bd91b573ca251d15471b6454452bd4ebca195':
lag detection thing
Scoreboard change and breaking blocks.
Couple of fixes
2015-12-11 18:57:52 -06:00
Shaun Bennett
c470ad880d
Merge pull request #77 in MIN/mineplex from foo to master
...
* commit 'd7497ec09881047d7461630fac2c3b51bf37a06c': (23 commits)
Fixed Micro Battle icon not appearing in stats menu
Gravity's icon changed to ENDER_PORTAL_FRAME
world's smallest bugfix - admin->co-host
Fixed advertisement being able to be bypassed by spec and instant join
fixed naming pets non-alphanumeric characters
changed reference to premium ranks
removed important debug thing
fixed ssm enderman always facing south on teleport
fixed bacon blast exloding blocks
fixed shield smash and fissure affecting spectators
fixed slab issue with Assassin's Flash
Re-fixed Barbarian bug
Fixed SG Barbarian bug
SSM bug fix: magma cube flame dash doesn't make player invisible
fixed several smash bugs and one global issue
Slightly bumped Monster Maze jump time value
fixed bridge bug "Death Bomber counts suicides as well"
typo fix in legendary aura description
Update achievement kit reference text
Fixed tnt bug (SG)
...
2015-12-11 18:57:18 -06:00
Morten
2626e1869b
Merge conflitchs... Yey
2015-12-12 00:12:05 +01:00
Morten
5ca997f2a8
Merge branch 'BotspamImprovement' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
2015-12-12 00:11:27 +01:00
Morten
cecc7d8141
Updated to JAVA 8... Weird bugs happened :(
2015-12-12 00:06:28 +01:00
William Burns
0d4bd91b57
lag detection thing
2015-12-11 22:47:07 +00:00
Sarah
09e5aed6e7
Adding some descriptions.
2015-12-11 22:06:23 +01:00
Morten
bfaaf0a33b
Did some reguested bug fixed and challenge changes
2015-12-11 20:49:39 +01:00
xGamingDudex
6d1e4b6cab
Merge remote-tracking branch 'origin/master' into project-cosmetics
2015-12-11 18:09:09 +01:00
xGamingDudex
9af6fd6904
Merge branch 'project-cosmetics' of
...
http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java
2015-12-11 18:06:35 +01:00
William Burns
6456d7bd66
Scoreboard change and breaking blocks.
2015-12-11 16:55:15 +00:00
William Burns
1dcbf5f7fd
Couple of fixes
2015-12-11 16:34:04 +00:00
xGamingDudex
ba087d119a
Small tweaks
2015-12-11 17:31:05 +01:00
Thanos paravantis
d7bef0d117
Fishing Day and Anvil Dance fixes and minor changes.
...
- Changed TNT spawn criteria, now only spawning while fishing hook is in water.
- Changed grass on Fishing Day map, excluded possible spawn locations that are included in spawn points.
- Fixed fireworks from Anvil Dance spawning on other challenges.
2015-12-11 18:12:06 +02:00
Thanos paravantis
d4fd466029
Update local workspace with new Eclipse version.
2015-12-11 17:10:00 +02:00
Keir
a1f1667647
Fix "Player.php" filename case.
2015-12-11 12:28:38 +00:00
Keir
4b122b16ae
Fix formatting.
...
Fix "Player.php" filename case.
2015-12-11 12:28:12 +00:00
Cheese
2ffd1d4595
BOB ROSS
2015-12-11 23:11:33 +11:00
Cheese
d5612a8f27
added a hint to how many more coal you need to your next prize.
2015-12-11 23:09:06 +11:00
Cheese
39f5f70a5f
fixing up coal things
2015-12-11 22:43:34 +11:00
Thanos paravantis
3f4980a90f
Merge branch 'master' into thanos-mineware
2015-12-11 13:32:24 +02:00
Thanos paravantis
0b56c01c2f
Commit before pulling from master.
2015-12-11 13:30:20 +02:00
Shaun Bennett
ac6d3c2c8f
merge with master
2015-12-11 06:27:23 -05:00
Cheese
7c432461c9
changed coal item rewards to 3 tier :)
2015-12-11 22:25:14 +11:00
Cheese
e01a5369fd
set bonuses
...
item gadget gui update
2015-12-11 21:53:39 +11:00
Cheese
40c2fdc3fc
fixed suits
2015-12-11 21:11:35 +11:00
Cheese
d7f39bdfd8
costume sets
2015-12-11 20:59:55 +11:00
Cheese
7fc08f34a7
fixed typo
2015-12-11 20:34:01 +11:00
Cheese
f717a5f8cc
more set stuff
2015-12-11 20:30:41 +11:00
Cheese
0cda29e135
improved cosmetic set implementation
2015-12-11 20:08:36 +11:00
Cheese
a6f664006f
set display in gui
2015-12-11 20:01:54 +11:00
Cheese
d8a5edf9e9
fixed up gui items
2015-12-11 19:24:19 +11:00
Cheese
61a8d2825e
gadget gui overhaul
2015-12-11 19:20:13 +11:00
William Burns
523c1875ef
fix
2015-12-11 06:58:11 +00:00
Jonathan Williams
95a81ef368
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
2015-12-11 01:26:20 -05:00
Cheese
66011cde8c
fixed player count
2015-12-11 17:25:23 +11:00
Jonathan Williams
222173ab17
Improved and implemented GameProfile caching.
2015-12-11 01:24:59 -05:00
Jonathan Williams
b5c157c123
Changed PlayerCache to Cache
2015-12-11 01:24:16 -05:00
Cheese
98e91d29f6
more cosmetic stuff :)
2015-12-11 17:21:54 +11:00
Cheese
7f8c9c02bc
and the mounts
2015-12-11 16:38:44 +11:00
Cheese
fe7ce40783
finished cosmetic names
2015-12-11 16:31:15 +11:00
Cheese
05a80b23a1
converting gadget text. (kill me now)
2015-12-11 16:07:02 +11:00
Cheese
88f44a293b
candy!
2015-12-11 15:31:35 +11:00
AlexTheCoder
42065fc5dc
- Fixed duplicate code
2015-12-10 23:22:08 -05:00
Cheese
3447de9a92
Merge branch 'master' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java
2015-12-11 15:20:50 +11:00
Cheese
a5b28422cd
cosmetics
2015-12-11 15:19:20 +11:00
libraryaddict
9a4006df27
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-11 17:18:07 +13:00
AlexTheCoder
33f73aebe5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2015-12-10 23:17:59 -05:00
libraryaddict
c5f0624bf7
Add build file
2015-12-11 17:17:52 +13:00
Shaun Bennett
4588091c5b
Merge remote-tracking branch 'origin/master'
2015-12-10 23:15:42 -05:00
Shaun Bennett
21c8a66917
Fix imports
2015-12-10 23:15:35 -05:00
libraryaddict
3cd187ff04
Move LineFormat.java
2015-12-11 16:57:21 +13:00
Shaun Bennett
bc46518a05
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
2015-12-10 22:54:53 -05:00
Shaun Bennett
1ab13d2ef5
Treasure Shards!
2015-12-10 22:52:15 -05:00
AlexTheCoder
6878e4489d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2015-12-10 22:49:19 -05:00
AlexTheCoder
fe933913e8
- Fixed maps
...
- Spawners
2015-12-10 22:48:57 -05:00
libraryaddict
4cfa7c436b
Add missing file
2015-12-11 16:48:40 +13:00
Virizion
14b5a9453a
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-10 22:18:00 -05:00
Virizion
68360c6705
shortened if
2015-12-10 22:17:10 -05:00
William Burns
a760dba783
i lied.
2015-12-11 02:59:16 +00:00
William Burns
7a597d90b7
final push goodnight
2015-12-11 02:48:06 +00:00
William Burns
1607345f04
title + debug
2015-12-11 02:41:44 +00:00
Shaun Bennett
557f3e97a5
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
2015-12-10 21:32:35 -05:00
Shaun Bennett
5a1892e1ed
Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics
2015-12-10 21:32:14 -05:00
Shaun Bennett
d6aed5dff7
More work
2015-12-10 21:32:10 -05:00
William Burns
563a0f0ec7
remove tutorial and no flicker
2015-12-11 02:30:44 +00:00
libraryaddict
a0b7870acc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-11 15:21:18 +13:00
libraryaddict
1661c056c1
Added line stuff
2015-12-11 15:21:05 +13:00
Cheese
31cea3342e
some gadget stuff
2015-12-11 13:17:38 +11:00
Shaun Bennett
ffd4658740
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
2015-12-10 21:06:50 -05:00
Shaun Bennett
2694787590
Reverting
2015-12-10 20:59:57 -05:00
Shaun Bennett
cf73d27a84
Merge remote-tracking branch 'origin/master'
2015-12-10 20:53:42 -05:00
Shaun Bennett
4d05bd5c50
Player count for chiss
2015-12-10 20:53:38 -05:00
Shaun Bennett
16f39c1e71
Pushing changes to go help william
2015-12-10 20:51:34 -05:00
William Burns
f8d7aeb5ea
before revert
2015-12-11 01:32:32 +00:00
William Burns
dda5ac6728
work
2015-12-11 01:20:36 +00:00
Sarah
4abad9e1c4
fixing chat and test commands.
2015-12-11 02:00:26 +01:00
Sarah
ffb75a7832
Adding CustomEnding
2015-12-11 01:44:19 +01:00
William Burns
626a812844
Many changes
2015-12-11 00:40:54 +00:00
Shaun Bennett
4d8b8bd58b
Fix errors, update cosmetic menu
2015-12-10 19:27:32 -05:00
Shaun Bennett
a9e6224eca
Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-10 19:21:33 -05:00
Shaun Bennett
5d96ceb41e
Let owner+ disguise as staff - easy way to check a player's rank
2015-12-10 19:20:11 -05:00
Shaun Bennett
7b4f5d5b75
Christmas chest in gui
2015-12-10 19:19:20 -05:00
Shaun Bennett
72a8aaf556
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-10 19:18:49 -05:00
xGamingDudex
44a244caf4
Merge branch 'project-cosmetics' of http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into project-cosmetics
2015-12-11 01:10:54 +01:00
xGamingDudex
5b0909012d
Renamed GadgetActivateEvent to GadgetEnable event
...
Some files didn't make it to prev commit
2015-12-11 01:07:47 +01:00
xGamingDudex
a6a4c8be36
Cosmetic Update
...
+ Added GadgetDisable Event
+ Renamed GadgetActivateEvent to GadgetEnable event
+ Added hat framework, and some example hats
+ Added sets and Frost Lord set
+ Fixed some imports
+ Added new way of checking ownership of gadgets
+ Added some utility methods to GadgetManager
+ Added support for alternative package name of gadgets
+ Fixed coal
+ New Blood Helix particle
2015-12-11 01:05:32 +01:00
Shaun Bennett
d16d9a36e9
Use Account ID from client manager instead of PlayerCache
2015-12-10 17:25:39 -05:00
Shaun Bennett
ab16bf89e5
Merge remote-tracking branch 'origin/master'
2015-12-10 17:04:25 -05:00
Shaun Bennett
851b613d2e
Now playing fix
2015-12-10 17:04:15 -05:00
William Burns
4cf33eef05
Tutorial changes!
2015-12-10 21:32:14 +00:00
William Burns
624e8bbe89
Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-10 20:56:03 +00:00
William Burns
0bd276c16a
Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial
2015-12-10 20:53:01 +00:00
William Burns
8d7b03e3f6
Added the ability to have title AND subtitle per TutorialText.
2015-12-10 20:52:41 +00:00
William Burns
2951088005
Tutorial changes/additions.
2015-12-10 20:48:13 +00:00
Virizion
c73bd54aec
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-10 15:38:17 -05:00
William Burns
3586642414
Added back the tutorial.
2015-12-10 19:32:25 +00:00
William Burns
af7c058f22
Lots of bug fixes / additions since the testing 12/9/15.
2015-12-10 19:06:07 +00:00
Sarah
0f8028f6e6
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
2015-12-10 12:24:11 +01:00
Thanos paravantis
e17669427e
Merge branch 'master' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
2015-12-10 10:03:41 +02:00
Thanos paravantis
e6125b74ef
Commit all changes before pulling from master.
2015-12-10 09:59:37 +02:00
libraryaddict
1ee1e7a04b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-12-10 20:02:39 +13:00
libraryaddict
eaf3937004
Fix the damage while walking on falling block
2015-12-10 20:02:12 +13:00
Virizion
0e9d401717
Restore block when break is cancelled because it can be in the air phase and not get restored.
2015-12-09 22:32:39 -05:00
Virizion
9b53e15b4f
More stuff.
2015-12-09 21:38:00 -05:00
Virizion
662d3b464f
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-09 21:15:39 -05:00
Virizion
0ff87cf134
Stuff.
2015-12-09 21:14:45 -05:00
Cheese
fabf3dab59
updated blocksearch
2015-12-10 13:12:01 +11:00
Sarah
c94c84f203
Some fixes
2015-12-10 02:59:22 +01:00
Sarah
76b29756ff
Fixing some stats and disabling Chat spam messages.
2015-12-10 02:02:36 +01:00
Virizion
be6f9ac6dc
Capitalize enum names.
2015-12-09 19:17:12 -05:00
William Burns
87a834c01b
FIX
2015-12-10 00:03:57 +00:00
William Burns
90896073d4
debug
2015-12-10 00:03:17 +00:00
William Burns
cea2716851
fight man
2015-12-09 23:59:20 +00:00
William Burns
05bd55f720
iter
2015-12-09 23:53:04 +00:00
William Burns
b8a2304edd
work
2015-12-09 23:39:00 +00:00
William Burns
3ad0a3db6e
fix
2015-12-09 23:14:08 +00:00
William Burns
17c989d941
Less per-player arena stuff
2015-12-09 22:39:04 +00:00
William Burns
513db5dd8d
doing byes
2015-12-09 21:33:31 +00:00
William Burns
852be97bae
Work
2015-12-09 20:16:16 +00:00
Keir
7749401e62
Show UUID when clicking on a username (temporary).
2015-12-09 20:05:24 +00:00
Keir
8459cf0f95
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-09 18:13:26 +00:00
Keir
54157024f7
Committing current progress, can't afford to lose this again
2015-12-09 18:06:04 +00:00
Sarah
a5c46545df
fixing timer being shown.
2015-12-09 14:44:22 +01:00
NewGarbo
667f076202
fixed unsafe timer
2015-12-09 10:46:05 +00:00
Virizion
507761d5b0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-08 21:24:21 -05:00
William Burns
c021fbf9ed
Bounce baby bounce.
2015-12-08 23:27:38 +00:00
William Burns
d709071feb
Much fix, many wow.
2015-12-08 23:20:42 +00:00
Shaun Bennett
2e49611035
LinkedHashMaps, Buttons
2015-12-08 17:45:27 -05:00
Shaun Bennett
7f75749194
Merge remote-tracking branch 'origin/master'
2015-12-08 16:55:14 -05:00
Cheese
26c5c419f8
fixed a bug where old displayName would be used after name was updated.
2015-12-09 08:38:05 +11:00
Sarah
484dce18e1
Changing some Achievement things, to allow double values and dividing, Adding WPM, fixing some bugs.
2015-12-08 22:34:42 +01:00
Cheese
fba88ec231
mount stuff is fixed
2015-12-09 08:19:55 +11:00
Virizion
8051486fcb
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-08 16:14:41 -05:00
William Burns
a83ede3caa
Handling slow movers
2015-12-08 21:14:19 +00:00
William Burns
7bdbd5a6af
Woo almost done!
2015-12-08 21:10:27 +00:00
Cheese
2decc049c5
fixed my muddling of perks
2015-12-09 07:47:07 +11:00
Cheese
09d8367b4b
fixed method
2015-12-09 07:32:36 +11:00
Christopher Jozsa
0b8e0409b6
Merge pull request #92 in MIN/mineplex from update-SSM to master
...
* commit '504a49278cb7e140029e4c2ceb85f3defe524a33':
SSM kit description change, grammar mistake
SSM Pig bomb bug fix
2015-12-08 14:29:32 -06:00
Shaun Bennett
ca71f1f64f
Merge remote-tracking branch 'origin/master'
2015-12-08 14:32:17 -05:00
Keir
9ce7b25482
Prevent escaping in id string.
2015-12-08 18:37:05 +00:00
William Burns
d598f83ec0
More progress
2015-12-08 18:17:43 +00:00
Teddy
504a49278c
SSM kit description change, grammar mistake
2015-12-08 16:35:49 +00:00
Teddy
2bf1012fa4
SSM Pig bomb bug fix
2015-12-08 16:34:07 +00:00
William Burns
f8f95c64e5
Fixing arena moving
2015-12-08 15:10:29 +00:00
Shaun Bennett
a1915e324c
Some java 8 code
2015-12-08 08:42:45 -05:00
William Burns
4e2a422f27
Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
2015-12-08 13:13:18 +00:00
William Burns
2b12016e14
Progress
2015-12-08 13:12:30 +00:00
Shaun Bennett
addb2c8c0e
Fix java 8 compiler issue
2015-12-08 08:02:40 -05:00
William Burns
cdc602a435
Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-08 10:55:57 +00:00
Shaun Bennett
89e8a7a2b5
Merge pull request #91 in MIN/mineplex from clans-beta to master
...
* commit 'b22c64ca6a5419e6b23abea1681cc750d15b6d37':
Fix excludes
2015-12-08 04:51:58 -06:00
Shaun Bennett
b22c64ca6a
Fix excludes
2015-12-08 05:51:21 -05:00
Shaun Bennett
ffbf76a125
Merge pull request #90 in MIN/mineplex from clans-beta to master
...
* commit 'a84f580719d1b221bbcaa49cd19d4251defa3b11':
Update IntelliJ to Java 8
2015-12-08 04:46:47 -06:00
Shaun Bennett
a84f580719
Update IntelliJ to Java 8
2015-12-08 05:45:26 -05:00
William Burns
99cf7ea22c
Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-08 10:44:43 +00:00
William Burns
e6d995008e
Arenas
2015-12-08 10:44:24 +00:00
Keir
c22a206a0e
Added some documentation (mainly declaring variable types).
2015-12-08 10:38:44 +00:00
Virizion
48a5776fb7
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-07 23:30:30 -05:00
Virizion
d22a905206
Lot more stuff! :D
2015-12-07 23:29:33 -05:00
Cheese
fe1f763374
changed order blocks will be added to the list
2015-12-08 15:26:32 +11:00
xGamingDudex
b1536547d3
Cosmetic Update 2
...
+ Item Coal
+ Freeze Cannon
+ Party Popper / Party Bomb
+ Snowball
+ Coal Fumes Particle
+ Snowman sneak trail/glide
+ Teaked stuff
2015-12-08 00:50:08 +01:00
Virizion
f837fd14db
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-07 18:45:42 -05:00
Keir
529eab5aef
Improved the report php code, made it more object orientated.
...
Commented out debug code.
2015-12-07 23:43:29 +00:00
Cheese
719297ebb1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-08 10:31:25 +11:00
Cheese
4ba2e8c96c
fixed old staff being stuck invis.
...
partially changed scoreboard to show playercount
2015-12-08 10:31:11 +11:00
Shaun Bennett
42a0354c9e
Now Playing, Preference to disable ads
2015-12-07 18:28:05 -05:00
William Burns
43192317ad
Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-07 23:20:21 +00:00
William Burns
55f0453897
Start of re-write
2015-12-07 23:20:03 +00:00
Virizion
ec4a21a282
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-07 18:19:16 -05:00
Sarah
0619fb857f
fixing invisibility.
2015-12-07 23:44:02 +01:00
Keir
d38ce9ef1e
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-12-07 18:54:53 +00:00
Shaun Bennett
8ff034fb5d
Merge pull request #89 in MIN/mineplex from clans-beta to master
...
* commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a':
Winter MOTD, Stat fixes (maybe?!)
made use ability teleport player back to where they should be
Forgot to push these changes last update!
fixed tnt blowing up in claims when offline
fixed task not getting cleanup up after /skiptutorial
fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
Fix heavy attribute, disable claim visualizer
Disable subtasks for now
Clans alpha 0.17
clan claim visualizer
fixed infinite claims
2015-12-07 12:22:10 -06:00
Shaun Bennett
eed6966a5b
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-07 13:21:17 -05:00
Shaun Bennett
c3ace42a68
Winter MOTD, Stat fixes (maybe?!)
2015-12-07 13:21:11 -05:00
Keir
31d05cdb3b
Fix error from last commit (git forced me to commit unfinished files due to the merge).
2015-12-07 18:13:48 +00:00
Keir
67b3fe1d23
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-07 18:11:40 +00:00
Sarah
3f7eef35d5
Forcefield range.
2015-12-07 18:59:06 +01:00
Sarah
dfb1837e81
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
2015-12-07 18:54:19 +01:00
Shaun Bennett
ffbb057d23
Merge pull request #88 in MIN/mineplex from iKeirNez_Bugfix to master
...
* commit '9bd7869e2260e23a0ff981b7084ff9b4a3768b43':
Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
2015-12-07 11:25:17 -06:00
Keir
eed944597c
Commit PHP code.
2015-12-07 17:05:58 +00:00
Shaun Bennett
7984c0ac31
Add !
2015-12-07 06:12:49 -05:00
Cheese
a39b11ce67
slowed meteors
2015-12-07 21:56:00 +11:00
Cheese
1fe6b5489a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 21:53:49 +11:00
Cheese
d318a5cf87
interacto!
2015-12-07 21:53:34 +11:00
Shaun Bennett
c6c012031f
Less ugly formatting
2015-12-07 04:44:19 -05:00
Shaun Bennett
4354133de9
Add Minecraft timings to /lag
2015-12-07 04:40:34 -05:00
Cheese
6e67f34db1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 20:39:46 +11:00
Cheese
e1efcabfbf
chat sale msgs
2015-12-07 20:39:31 +11:00
Shaun Bennett
3cdf8c4b08
Merge remote-tracking branch 'origin/master'
2015-12-07 04:23:33 -05:00
Shaun Bennett
2afbe23a7c
Load songs from update folder
2015-12-07 04:23:26 -05:00
Cheese
7b11baf24b
Christmas sale bossbars
2015-12-07 20:20:49 +11:00
Cheese
8c4615203c
sale message
2015-12-07 20:07:20 +11:00
Cheese
ed3bea8e85
DONE!
2015-12-07 18:36:05 +11:00
Cheese
5c632a1e3a
sharper target
2015-12-07 18:20:12 +11:00
Cheese
1a0d90a495
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 18:06:43 +11:00
Cheese
fea637db80
fixed some freeze
2015-12-07 18:06:26 +11:00
Shaun Bennett
ecde1dd314
Merge remote-tracking branch 'origin/master'
2015-12-07 02:06:09 -05:00
Shaun Bennett
44a5bcb793
remove titan chest message, update pumkin message, holiday MB/DMT words
2015-12-07 02:06:00 -05:00
Cheese
d75d7a2c8f
snowfight finish
2015-12-07 17:56:35 +11:00
Cheese
1e441ac017
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 17:37:04 +11:00
Cheese
1ada06af91
rewrote lots!
2015-12-07 17:36:45 +11:00
Shaun Bennett
7b5db2d4fb
Hub Music, HubMusic Preference
2015-12-07 00:58:44 -05:00
Virizion
6904f7c9a9
Tons more stuff on the checklist.
2015-12-06 22:54:45 -05:00
Cheese
5486d8acf6
more prep
2015-12-07 13:42:59 +11:00
Cheese
97fe633e4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 13:25:48 +11:00
Cheese
54ec0e39bb
more polisshhhh on snowfight
...
enabled xmas chests
2015-12-07 13:25:32 +11:00
Shaun Bennett
488895ea53
Note block player
2015-12-06 21:12:10 -05:00
Cheese
cbafb2ba91
fixes
2015-12-07 13:04:45 +11:00
Cheese
0c397d6a81
simplified kits and intro
2015-12-07 13:02:26 +11:00
xGamingDudex
c36182b8d4
Cosmetic Update
...
New:
+ New GUI System
+ Candy Cane Particle
+ Candy Cane Double Jump
+ Candy Cane Death Effect
+ Candy Cane Arrow Trail
+ Snowman Morph
+ Baby Reindeer Mount
+ Pet Coal Apparition
Fixed/Updated:
* Added getTick to UpdateEvent and UtilTime
* Added more methods to UtilParticle
* Gadget manager isMoving now counts flying as moving
* Updated some cosmetics
2015-12-07 02:53:14 +01:00
Cheese
b2a595b01b
snwo fight changes
2015-12-07 12:02:53 +11:00
Mysticate
09f7a03444
Quick changes to improve things.
2015-12-06 20:00:22 -05:00
AlexTheCoder
118bde5484
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2015-12-06 19:57:27 -05:00
Sarah
072856be7d
teleportations.
2015-12-06 23:19:53 +01:00
Mysticate
b5967a1205
Uncommented bouncy balls
2015-12-06 17:14:51 -05:00
Mysticate
e74b83f8f2
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-06 17:12:29 -05:00
Mysticate
5e57caa94d
Final tweaks to random armorstand
2015-12-06 17:09:33 -05:00
Cheese
6f16eeead7
missin files
2015-12-07 08:48:55 +11:00
Sarah
10d26ca32b
timer fixes.
2015-12-06 22:41:04 +01:00
Virizion
ca7e5d0d6d
remove later
2015-12-06 16:37:00 -05:00
Sarah
64f8ee7280
fixing some timings.
2015-12-06 21:48:21 +01:00
NewGarbo
425463d339
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-06 19:11:13 +00:00
NewGarbo
a9c7f088f3
made use ability teleport player back to where they should be
2015-12-06 19:10:18 +00:00
Keir
e21bd37b92
Add connection host for Jedis.
2015-12-06 19:05:20 +00:00
Sarah
3260550368
adding proper forcefield for minions and giants.
2015-12-06 19:38:23 +01:00
Mysticate
88dcdaa445
Merge remote-tracking branch 'origin/master' into update-paintball
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
2015-12-06 12:00:06 -05:00
Mysticate
11b2748a5a
Quick thing before merge
2015-12-06 11:45:10 -05:00
Cheese
fa6418769b
YT name change
2015-12-06 21:26:02 +11:00
AlexTheCoder
4278f3fa99
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2015-12-06 03:51:08 -05:00
AlexTheCoder
430de10008
- Everything except maps [probably should've committed sooner]
2015-12-06 03:47:07 -05:00
Cheese
ccb6456110
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
2015-12-06 18:09:24 +11:00
Cheese
35c362b8bf
small youtuber perms
2015-12-06 18:08:36 +11:00
Shaun Bennett
b7b5235f59
Fix error
2015-12-06 00:57:43 -05:00
Cheese
d095e14b4c
Merge branch 'monster-league'
2015-12-06 16:33:21 +11:00
Cheese
9880e9a3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-06 16:32:59 +11:00
Cheese
040e94f1fb
bouncy
2015-12-06 16:32:45 +11:00
Shaun Bennett
618105b4c8
Add minimum rank to Announcement Command
2015-12-06 00:15:49 -05:00
Shaun Bennett
8d831d5228
Fix END_PORTAL bug causing gui's to break
2015-12-06 00:06:31 -05:00
Cheese
9c7eea86b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-06 14:56:18 +11:00
Shaun Bennett
32a6d572ee
Disable gadgets in arcade for player count > 40
2015-12-05 22:56:15 -05:00
Cheese
5aabd00972
set hub to christmas
...
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
2015-12-06 14:55:28 +11:00
Shaun Bennett
11e1e53a36
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-05 21:36:19 -05:00
Shaun Bennett
d5a9a92913
Forgot to push these changes last update!
2015-12-05 21:36:07 -05:00
libraryaddict
b98944b0a0
Handle attach entity
2015-12-06 14:38:00 +13:00
Virizion
9144ab7b3f
Fixed some demolition stuff.
2015-12-05 20:30:21 -05:00
Virizion
5b49c4adc3
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-05 19:58:55 -05:00
Virizion
d3ce0d6434
Some more stuff on the checklist.
2015-12-05 19:57:48 -05:00
Sarah
114ae33d89
fixing spawns and monster slowdown.
2015-12-06 00:00:50 +01:00
libraryaddict
d5606f55ea
Modified CustomTagFix to support player name titles
2015-12-06 10:18:35 +13:00
Sarah
90c6d0a83f
spelling fixes, disabling Particles, fixing mob limit.
2015-12-05 22:17:45 +01:00
Thanos paravantis
b64f561659
Merge branch 'MortensRawBugFixes' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
2015-12-05 22:54:50 +02:00
Thanos paravantis
0c85e5d199
Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
2015-12-05 22:53:51 +02:00
Thanos paravantis
a943808250
Remove old unused build race challenge.
2015-12-05 22:52:52 +02:00
Morten
e8f7b140df
Added Achievements and fixed bugs.
2015-12-05 21:47:13 +01:00
Sarah
4c4b997453
fixing giant facing.
2015-12-05 19:00:44 +01:00
Virizion
62c49fa8e6
some more stuff on the checklist
2015-12-04 23:04:52 -05:00
Keir
9bd7869e22
Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
2015-12-05 01:08:21 +00:00
Keir
2e72e46242
Add report preferences to exclusive preferences.
2015-12-05 01:05:43 +00:00
Keir
ef6fd0eaa3
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-12-05 00:05:05 +00:00
Sarah
a3d6af884d
spawns after tutorial and Giants facing each other.
2015-12-05 00:57:27 +01:00
fooify
d7497ec098
Fixed Micro Battle icon not appearing in stats menu
2015-12-04 15:56:48 -08:00
Cheese
49c735e43c
removed duplicate code
2015-12-05 10:34:06 +11:00
Keir
ddf6037fc4
Wrote standalone chatsnap handler and implemented required changes in Core.
2015-12-04 23:30:27 +00:00
Cheese
4a53667539
gadget restructure
...
converted frost lord and titan particles into 4 subcategories.
2015-12-05 10:22:00 +11:00
Keir
c19baf5750
Make periodic handler message display close command and clicking it suggests the command.
2015-12-04 22:08:44 +00:00
Thanos paravantis
91e0547612
Merge branch 'master' into thanos-mineware
...
Conflicts:
.gitignore
2015-12-04 22:04:46 +02:00
Thanos paravantis
e27ce2587d
Finalizing Fishing Day Challenge.
2015-12-04 22:01:47 +02:00
Sarah
35534afd4a
overall runtime.
2015-12-04 19:54:02 +01:00
Sarah
1bb40b21d3
Tutorial/Phase Time.
2015-12-04 19:49:28 +01:00
NewGarbo
5d59b1a015
fixed tnt blowing up in claims when offline
2015-12-04 18:32:46 +00:00
NewGarbo
bca65116ab
fixed task not getting cleanup up after /skiptutorial
2015-12-04 18:23:23 +00:00
Shaun Bennett
f57f4ed0aa
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-04 12:10:10 -05:00
NewGarbo
e158704534
fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
2015-12-04 15:58:51 +00:00
Shaun Bennett
bb382a969c
Fix heavy attribute, disable claim visualizer
2015-12-04 08:02:38 -05:00
NewGarbo
3b125dc8a5
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
2015-12-04 11:12:19 +00:00
Shaun Bennett
2435ebba13
Disable subtasks for now
2015-12-04 05:16:14 -05:00
Shaun Bennett
5c575b41fc
Clans alpha 0.17
2015-12-04 05:15:28 -05:00
Virizion
efbabb1519
Players now look at the middle of the middle block instead of the corner.
2015-12-03 21:27:10 -05:00
Cheese
e01d30b920
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-04 13:19:07 +11:00
Cheese
ef2511434d
tuber arnk
2015-12-04 13:18:23 +11:00
Virizion
465f8c28f6
Set FixSpawnFacing to false so that out looking at the middle feature would work.
2015-12-03 21:13:33 -05:00
Virizion
bb708911d6
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-03 21:10:31 -05:00
Christopher Jozsa
fc68ce9b78
Merge pull request #87 in MIN/mineplex from virizion_utils to master
...
* commit '9951701ded301c47bcc203c12001ef866204b78c':
Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it.
2015-12-03 19:05:15 -06:00
Virizion
9951701ded
Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it.
2015-12-03 19:51:11 -05:00
fooify
b1bd2ff5ac
Gravity's icon changed to ENDER_PORTAL_FRAME
2015-12-03 16:50:27 -08:00
fooify
91aaf5f2fb
world's smallest bugfix - admin->co-host
2015-12-03 16:45:30 -08:00
Virizion
c3a564faa7
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-03 19:31:24 -05:00
fooify
348f2d8e4c
Merge remote-tracking branch 'origin/master' into foo
2015-12-03 16:31:16 -08:00
Christopher Jozsa
8717f962e6
Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master
...
* commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01':
Added missing MountData and SingleEntityMountData files.
Mount bug fix.
Added method to edit NoAI field on entities.
Implemented new mount data system replacing instead of entities as data.
We only need to add the "Go Back" page once...
TitanMount fixes
2015-12-03 17:15:21 -06:00
NewGarbo
39daf969fd
clan claim visualizer
2015-12-03 22:29:36 +00:00
Sarah
19254fc4a0
Prepare Timer flag.
2015-12-03 18:06:27 +01:00
NewGarbo
584a02ae3e
fixed infinite claims
2015-12-03 10:30:06 +00:00
Virizion
ee51766e1f
Removed teleports. Made the spawns face the middle but it doesn't work yet because of GameTeam changing the direction again.
2015-12-02 22:12:53 -05:00
Virizion
f0c28e6234
Updated references to the util method.
2015-12-02 20:20:14 -05:00
Virizion
cab5c2a76d
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-02 20:12:41 -05:00
Christopher Jozsa
fc0cae8e0f
Merge pull request #85 in MIN/mineplex from virizion_utils to master
...
* commit 'bf92af647abceb78596f9fd1922d3522e61ff053':
Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
2015-12-02 18:53:30 -06:00
Sarah
27f335779a
adding tutorial sounds and flag for it.
2015-12-02 19:39:44 +01:00
NewGarbo
e9fd661311
disabled koth
2015-12-02 18:25:53 +00:00
NewGarbo
8fea5afdce
fixed message on tick (might be cause of laggg)
2015-12-02 06:56:58 +00:00
NewGarbo
92c1abf221
a few last touches
2015-12-02 06:04:53 +00:00
NewGarbo
8db5ffe5c7
forcejoin command for ADMIN+ and fixed auto tree replanting.
2015-12-02 05:54:00 +00:00
NewGarbo
3a4e453ac3
made it so that you can only use /reset in safe zones
2015-12-02 05:18:04 +00:00
NewGarbo
d6ca52e4a4
modifications
2015-12-02 05:11:09 +00:00
Virizion
bf92af647a
Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
2015-12-02 00:00:32 -05:00
fooify
b04f139883
Fixed advertisement being able to be bypassed by spec and instant join
2015-12-01 19:26:52 -08:00
Virizion
1810defd2d
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-01 20:39:54 -05:00
fooify
338e0f1892
fixed naming pets non-alphanumeric characters
2015-12-01 16:23:07 -08:00
NewGarbo
b8e2086928
changes to tutorial
2015-12-02 00:19:48 +00:00
NewGarbo
ba27d94158
fixed skiptutorial message not displaying
2015-12-01 23:23:11 +00:00
NewGarbo
cffb6bd62f
bunch o' changes
2015-12-01 23:01:41 +00:00
Keir
9508556d57
Refactor.
2015-12-01 22:47:51 +00:00
NewGarbo
a7d6026c07
made skip tutorial messages be seen whilst in tutorial
2015-12-01 22:33:47 +00:00
NewGarbo
69cb395f5a
made entire clan know about disband
2015-12-01 22:30:05 +00:00
NewGarbo
35ae89ab1f
fixed players from being able to eat their carrot in the making money task
2015-12-01 19:37:53 +00:00
NewGarbo
ea099d7a82
fixed some annoying bugs and fixed certain messages not showing in tutorial
2015-12-01 18:41:33 +00:00
Sarah
b0e16f6612
Zombie smash Color.
2015-12-01 17:05:55 +01:00
Sarah
d335e58652
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java
2015-12-01 17:01:44 +01:00
NewGarbo
fbf9c8eb0c
made certain messages visible in tutorial that are actually required to be seen
2015-12-01 13:37:34 +00:00
NewGarbo
f536bf23e5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-01 12:06:25 +00:00
NewGarbo
d32e6fdb96
Got rid of deployed tasks. using different system now. (untested)
2015-12-01 11:28:14 +00:00
Jonathan Williams
633697dc7a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 23:49:32 -06:00
Jonathan Williams
03a1f19df9
Fixed memory leaks in Disguise and Recall.
...
Removed debug messages in ItemMapManager
2015-11-30 23:49:16 -06:00
Cheese
51023a7630
cosmetic cooldown fix
2015-12-01 15:38:54 +11:00
fooify
48ae23ebff
changed reference to premium ranks
2015-11-30 19:58:41 -08:00
fooify
06ef964000
removed important debug thing
2015-11-30 19:33:03 -08:00
fooify
ed96c8e3b3
fixed ssm enderman always facing south on teleport
2015-11-30 19:27:34 -08:00
Virizion
1ad534366e
Switch item dropping to the new util method.
2015-11-30 22:09:15 -05:00
Cheese
208eaf3a01
cosmetics recharge slowdown
2015-12-01 11:38:52 +11:00
Virizion
d24135771f
Fixed formatting by adding bodies to all for loops.
2015-11-30 19:10:59 -05:00
Virizion
ae8a10d55d
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-11-30 18:50:21 -05:00
xGamingDudex
c98b427fde
Added missing MountData and SingleEntityMountData files.
...
For some reason, git decided that it was a good idea to remove these two
files from the index...
2015-12-01 00:46:20 +01:00
Cheese
1a1fa684e4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-01 10:44:39 +11:00
Cheese
7217cd0f33
remove conditions upon death
2015-12-01 10:44:13 +11:00
Virizion
9d380a0b31
Merge remote-tracking branch 'remotes/origin/master' into virizion_utils
2015-11-30 17:47:08 -05:00
Virizion
666b9963e4
Added an utility method in UtilBlock to get an ItemStack from a block and also handles correcting Material types and Data Values.
2015-11-30 17:42:48 -05:00
NewGarbo
18504e48f7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-30 21:00:42 +00:00
NewGarbo
1a851679c4
made it so players cannot see chat whilst in tutorial
2015-11-30 20:40:30 +00:00
Jonathan Williams
482ec8a120
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 14:26:37 -06:00
Jonathan Williams
513810caaa
Fixed memory leak in MarkedForDeath
2015-11-30 14:26:25 -06:00
NewGarbo
6eb44ed87b
whoops.. this isn't php hehe
2015-11-30 19:11:18 +00:00
NewGarbo
813e7ee789
made it so that no messages are shown when in tutorial
2015-11-30 19:08:16 +00:00
Keir
0bbb705654
Small method & class renames, document methods.
2015-11-30 16:35:07 +00:00
Sarah
e2cfcef55b
RunTasksSync Flag.
2015-11-30 16:58:41 +01:00
NewGarbo
0862cfce72
fixed doors getting placed in spawn and shops
2015-11-30 07:26:02 +00:00
NewGarbo
261d6dd030
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-30 07:08:34 +00:00
NewGarbo
f528531b82
removed some testing stuff
2015-11-30 07:06:36 +00:00
Keir
4aa84b9180
Store chat messages from the last 30 minutes.
2015-11-30 02:03:26 +00:00
Shaun Bennett
34c4bade06
Merge remote-tracking branch 'origin/master'
2015-11-29 19:30:51 -05:00
Cheese
02bc7ffab6
map changes
2015-11-30 11:17:23 +11:00
Shaun Bennett
981eead816
Merge remote-tracking branch 'origin/master'
2015-11-29 19:05:56 -05:00
Cheese
0f79b5814f
more color f ixes
2015-11-30 10:52:44 +11:00
Shaun Bennett
25bb913c4f
Merge remote-tracking branch 'origin/master'
2015-11-29 18:41:35 -05:00
Cheese
2ac21b1434
better colors
2015-11-30 10:40:57 +11:00
Shaun Bennett
4a9d53de50
Merge remote-tracking branch 'origin/master'
2015-11-29 18:33:43 -05:00
Cheese
18b603ec2f
map color changes
2015-11-30 10:33:08 +11:00
Shaun Bennett
f7f7d5fdef
Merge remote-tracking branch 'origin/master'
2015-11-29 18:26:40 -05:00
Cheese
e27808a011
map!
2015-11-30 10:26:07 +11:00
Shaun Bennett
125d9988c2
Merge remote-tracking branch 'origin/master'
2015-11-29 18:21:02 -05:00
Cheese
cd6ecc1e67
pt!
2015-11-30 10:20:27 +11:00
Shaun Bennett
06706da4cf
Merge remote-tracking branch 'origin/master'
2015-11-29 18:16:13 -05:00
Cheese
a886088f48
more changes
2015-11-30 10:15:50 +11:00
Shaun Bennett
2b22639d8a
Merge remote-tracking branch 'origin/master'
2015-11-29 18:03:46 -05:00
Cheese
af77a2ddeb
fix
2015-11-30 10:03:27 +11:00
Shaun Bennett
1c71efbff7
Merge remote-tracking branch 'origin/master'
2015-11-29 17:59:39 -05:00
Shaun Bennett
58d7e8562b
update clans version for next release
2015-11-29 17:58:29 -05:00
Cheese
af61b62a47
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 09:58:06 +11:00
Cheese
7e3cab9c87
map test
2015-11-30 09:57:47 +11:00
NewGarbo
8026ad891d
fixed king of the hill
2015-11-29 21:09:18 +00:00
Sarah
dc68375ec8
TimeBetweenPhase Flag.
2015-11-29 21:48:39 +01:00
NewGarbo
be727e6e26
fixed deployed tasks not being deregistered as Listeners after being adding to Cull
2015-11-29 19:46:08 +00:00
Virizion
e7960d65e0
Moved classes into separate packages so it is more organized.
2015-11-29 14:36:51 -05:00
Virizion
840b784239
Removed some redundant calls and replaced them with a call to one method.
2015-11-29 13:42:30 -05:00
xGamingDudex
6120c8246b
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
2015-11-29 19:11:24 +01:00
xGamingDudex
d1d58919f4
Mount bug fix.
...
Mount was put in map before removed, resulting in new mount being half
disabled.
2015-11-29 19:09:55 +01:00
Virizion
c6f1d29496
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-11-29 13:09:31 -05:00
xGamingDudex
2c2370f8a0
Added method to edit NoAI field on entities.
2015-11-29 19:08:26 +01:00
xGamingDudex
509835ea64
Implemented new mount data system replacing instead of entities as data.
...
+ Removed some unnecessary code
+ Made StackManager use new mount system
This system also fixes a bug allowing players "hijack" some of the
mounts as it was not properly persistent.
2015-11-29 19:08:00 +01:00
xGamingDudex
327bf8d09b
We only need to add the "Go Back" page once...
2015-11-29 18:32:24 +01:00
fooify
61df87b446
Merge remote-tracking branch 'origin/master' into foo
2015-11-29 06:37:30 -08:00
Jonathan Williams
7bdf5451d4
Upped map scan performance.
2015-11-29 02:49:12 -06:00
Jonathan Williams
1d1a1d96f8
Fixed onAbilityUsed bug with _player (presumably because it was added to cull and _player was set to null right before SkillTriggerEvent happened.)
2015-11-29 02:39:37 -06:00
Jonathan Williams
5b04a3223d
Fixed bug with Posion effect NPE (Something in champs is adding a null source).
...
Fixed bug with Tutorial cleanup.
2015-11-29 02:29:47 -06:00
Jonathan Williams
782026556e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-29 02:24:32 -06:00
Jonathan Williams
e9da258333
Lowered scan rate significantly for ItemMapManager.
2015-11-29 02:24:17 -06:00
Shaun Bennett
f82396d485
Clans changes/fixes
2015-11-29 02:41:53 -05:00
Virizion
e09e5851a6
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-11-29 01:17:17 -05:00
Jonathan Williams
0d5fa70632
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-28 23:05:32 -06:00
Jonathan Williams
5acf6b19a4
Fixed bed checking interval.
...
Added timing logging to map rendering.
2015-11-28 23:05:22 -06:00
Shaun Bennett
7c947ad97b
Merge master
2015-11-28 23:55:00 -05:00
Jonathan Williams
c6ff01b92d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-28 22:33:03 -06:00
Jonathan Williams
118af20f44
Updated EnjinTranslator.
2015-11-28 22:32:50 -06:00
NewGarbo
b88a842f1c
stuff
2015-11-29 03:22:52 +00:00
NewGarbo
c870d99e0e
teleport stuff
2015-11-29 02:55:45 +00:00
NewGarbo
a9afe1f068
added self clan create/delete messages
2015-11-29 02:54:40 +00:00
NewGarbo
84303234fd
fixed task 2
2015-11-29 02:48:03 +00:00
NewGarbo
392ab601c2
tutorial tasks reset
2015-11-29 02:43:12 +00:00
NewGarbo
d7658f3838
fixed stuck manager taking 0 seconds
2015-11-29 02:39:09 +00:00
NewGarbo
dc5aec33b4
tutorial ending message
2015-11-29 02:37:20 +00:00
NewGarbo
8dca384d35
force join command
2015-11-29 02:31:14 +00:00
NewGarbo
9ff9724fc8
tutorial revamp 2.0
2015-11-29 02:10:39 +00:00
Cheese
5cefe27257
cosmetic fixes
2015-11-29 11:40:19 +11:00
NewGarbo
e1be0b1dbd
dupe fix
2015-11-28 23:34:41 +00:00
Sarah
66fd85af1f
Adding Phase Event.
2015-11-28 23:32:09 +01:00
Virizion
278082caed
Finished the checklist. I might recode eliminations since I kind of don't like it right now.
2015-11-28 15:18:06 -05:00
NewGarbo
aa68701ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 20:16:49 +00:00
NewGarbo
ace4548b1e
don't cull an entity if a player is nearby
2015-11-28 20:14:48 +00:00
NewGarbo
afbccba36f
added force join command for ADMIN+
2015-11-28 19:56:47 +00:00
NewGarbo
75ef42d8c9
fixed the clan claim box check
2015-11-28 19:37:03 +00:00
fooify
8cdae7ce1a
Merge remote-tracking branch 'origin/master' into foo
2015-11-28 09:33:47 -08:00
fooify
0dff0ffe1d
fixed bacon blast exloding blocks
...
fixed sg compass pointing to teammates
2015-11-28 09:32:54 -08:00
xGamingDudex
dc0da3987b
TitanMount fixes
...
Added so that the magma cube is looking in the direction of which the
player is flying.
Removed players ability to unequipt the armorstand that take out the
netherrack block from their head slot.
2015-11-28 17:22:17 +01:00
Thanos paravantis
eb820b4650
Change alive check with isDone() method. Make explosions on fishing day more realistic.
2015-11-28 17:03:10 +02:00
Cheese
51227ae4f3
fixed leak
2015-11-29 01:25:15 +11:00
libraryaddict
46360a4b91
Updated CB
2015-11-29 02:56:53 +13:00
libraryaddict
28947643e0
More updates for dual version
2015-11-29 02:54:16 +13:00
NewGarbo
f5384a1382
staff mode
2015-11-28 09:31:18 +00:00
NewGarbo
d8ae035f84
creative scoreboard team. and fixed npe in tutorials
2015-11-28 09:20:42 +00:00
NewGarbo
0dceca5cfc
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 09:04:15 +00:00
NewGarbo
a0ae500876
tutorial revamp [clans]
2015-11-28 09:03:58 +00:00
Jonathan Williams
b6f6d4458e
Fixed StaffServer.
2015-11-28 01:43:00 -06:00
libraryaddict
d4ab57e4e7
Update for 1.9 dual version
2015-11-28 19:38:58 +13:00
Cheese
700cf51206
titan stuff almost done
2015-11-28 16:35:11 +11:00
Cheese
963caae719
Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'
2015-11-28 16:00:28 +11:00
Cheese
8af545af80
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
2015-11-28 15:59:26 +11:00
Cheese
0871663498
titan stuff
...
I HATE YOU SNAKE.
2015-11-28 15:57:07 +11:00
Shaun Bennett
bcbc5244c6
Add Clans.core to hub build (IntelliJ)
2015-11-27 23:14:54 -05:00
Shaun Bennett
1a87d85174
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
2015-11-27 23:13:43 -05:00
xGamingDudex
24f8a98545
Added titan particle trail.
2015-11-28 02:22:41 +01:00
Sarah
ad54d28b0d
fixing teleportation issues.
2015-11-27 22:29:29 +01:00
NewGarbo
260002c9cf
final changes
2015-11-27 21:02:20 +00:00
NewGarbo
9e84029e04
fixes
2015-11-27 20:50:00 +00:00
NewGarbo
b36642b22b
remove trust command
2015-11-27 20:27:33 +00:00
NewGarbo
d5502500b6
fixes & changes
2015-11-27 20:24:07 +00:00
Thanos paravantis
8d58cb9055
Update Fishing Day challenge.
2015-11-27 22:14:13 +02:00
Sarah
fd0c5cf273
Adding some more flags.
2015-11-27 20:47:57 +01:00
NewGarbo
6ac871f04c
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 19:43:48 +00:00
NewGarbo
fe085c1571
loaaads of stuff
2015-11-27 19:42:15 +00:00
Sarah
e81aa72c7e
Merge branch 'rankdescriptions' of http://184.154.0.242:7990/scm/min/mineplex
2015-11-27 20:33:18 +01:00
Thanos paravantis
2b48745ba0
Sort methods and event listeners, remove outdated custom fishes, organize imports.
2015-11-27 18:51:27 +02:00
Thanos paravantis
7a7a274b40
Update Fishing Day challenge.
2015-11-27 18:45:54 +02:00
libraryaddict
636dcdf9f7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java
2015-11-28 05:28:04 +13:00
libraryaddict
5f8f643d95
What snake mount code I did
2015-11-28 05:26:43 +13:00
Shaun Bennett
f06ceab277
Adjustments
2015-11-27 09:33:31 -05:00
NewGarbo
0c463cf7cd
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 14:24:25 +00:00
NewGarbo
4d23b2a39f
fixed (I BELIEVE) chests not opening in own territory
2015-11-27 14:24:02 +00:00
Cheese
def46c715e
fixer
2015-11-28 00:52:54 +11:00
NewGarbo
627fbc7df2
add info into chat if a player is in creative
2015-11-27 13:50:18 +00:00
Cheese
b45eb53dff
remove old items
2015-11-28 00:43:01 +11:00
NewGarbo
ad0c161f16
set players time to day during tutorial
2015-11-27 13:28:37 +00:00
NewGarbo
3be2986cea
sethome command now places bed even if theres grass
2015-11-27 13:26:12 +00:00
NewGarbo
691105b2cb
force place bed on first claim
2015-11-27 13:23:37 +00:00
Cheese
fdb493d95d
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 00:23:32 +11:00
Cheese
ab3d2ba098
updated tutorials.
...
added worldmanager to cull entities.
2015-11-28 00:23:18 +11:00
NewGarbo
4423baca96
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 13:15:46 +00:00
NewGarbo
f0669cb610
fixed undead camp item naming being italic
2015-11-27 13:15:26 +00:00
Cheese
67b9755f0d
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 22:27:33 +11:00
Cheese
53da9c97d0
item frame cancel!
2015-11-27 22:27:20 +11:00
Shaun Bennett
b996dc20ca
Enable tutorial, fix stuck command
2015-11-27 06:26:32 -05:00
Shaun Bennett
a5ebf9b059
Fixes for release
2015-11-27 05:53:57 -05:00
Cheese
ec0e2d2d64
fixed colors
2015-11-27 21:09:25 +11:00
Cheese
3e37a63aa8
fixed chome teleport height
2015-11-27 20:59:23 +11:00
Cheese
dda0e827e1
FGIXEXFSD
2015-11-27 20:46:33 +11:00
Cheese
9ce4440679
extra cmds
2015-11-27 20:36:00 +11:00
Cheese
6428d28275
travel hub bed fix
2015-11-27 20:31:19 +11:00
Cheese
797dcf8d8e
fxied song again T_T
2015-11-27 20:01:48 +11:00
Cheese
936e61de57
gui changes :)
2015-11-27 19:42:04 +11:00
Cheese
c501a42094
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 19:29:33 +11:00
Cheese
5d40a57df8
sound fix
2015-11-27 19:29:17 +11:00
Shaun Bennett
0b0710458f
Hub updates/try to fix chiss stuff
2015-11-27 03:22:17 -05:00
Cheese
4e2f48b37e
Merge branch 'master' into clans-beta
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
2015-11-27 19:16:30 +11:00
Cheese
f55b6761a8
disabled titan gadgets!
2015-11-27 19:14:35 +11:00
Cheese
e25df8739d
EAST 2 WEST
2015-11-27 18:46:15 +11:00
Cheese
4085c998cd
MUSIC 4 LIFE
2015-11-27 18:44:33 +11:00
Shaun Bennett
408c2cf72a
im an idiot
2015-11-27 01:40:28 -05:00
Shaun Bennett
bdbb75e196
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-27 01:35:16 -05:00
Shaun Bennett
34368722a9
Fix gold manager again
2015-11-27 01:35:10 -05:00
NewGarbo
7efcf5426d
no hunger depletion in safe zones
2015-11-27 06:34:29 +00:00
NewGarbo
c96b0c529a
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 06:26:23 +00:00
NewGarbo
42d39a40e9
WIND
2015-11-27 06:25:58 +00:00
Shaun Bennett
94090c9434
adjust gold drops
2015-11-27 01:24:03 -05:00
Shaun Bennett
e211fe182d
Adjust gem conversion rate
2015-11-27 01:06:53 -05:00
NewGarbo
c33eea28a2
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 06:05:39 +00:00
NewGarbo
a9669ade31
Immolate fix hopefully
2015-11-27 06:05:22 +00:00
Shaun Bennett
0aeca96746
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-27 01:05:16 -05:00
Shaun Bennett
32c17cad7e
Shop price changes
2015-11-27 01:04:51 -05:00
Cheese
77be81c216
pet changes
2015-11-27 16:50:22 +11:00
Cheese
2b047cdde8
more titan stuff
2015-11-27 16:46:48 +11:00
NewGarbo
9082ace3f3
wind blade fall damage
2015-11-27 05:46:37 +00:00
NewGarbo
20a9ed5a6e
staff not being able to join fix
2015-11-27 05:13:47 +00:00
NewGarbo
f81d1d390a
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 05:04:46 +00:00
NewGarbo
b22c766c94
more clans modificatons
2015-11-27 05:04:24 +00:00
Cheese
05e7183b65
titan stuff update
2015-11-27 15:55:00 +11:00
Shaun Bennett
a46bed53fa
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 23:42:22 -05:00
Shaun Bennett
31f083387d
Use Castle icon on travel page
2015-11-26 23:42:16 -05:00
NewGarbo
174825776b
meow clams
2015-11-27 04:39:04 +00:00
NewGarbo
9dcc048953
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 04:23:14 +00:00
NewGarbo
6119500b68
changes
2015-11-27 04:23:02 +00:00
Shaun Bennett
faaa1fcf0b
Use castle clan icon for /c <clan>
2015-11-26 23:15:14 -05:00
Virizion
73c2f16d8b
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-11-26 23:11:12 -05:00
Virizion
3d74c9ca05
Fixed some bugs and finished some items on the checklist, too many to put down here.
2015-11-26 23:10:19 -05:00
NewGarbo
5744178286
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 04:06:02 +00:00
NewGarbo
dbda29e3f3
magnetic maul fixes
2015-11-27 04:05:47 +00:00
NewGarbo
73f4450fa3
clans fixes
2015-11-27 04:04:29 +00:00
Shaun Bennett
ef511f1704
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 22:38:03 -05:00
Shaun Bennett
6da10950da
Update clan icons, fix client class
2015-11-26 22:37:54 -05:00
NewGarbo
0274bf2847
loads of changes.
2015-11-27 03:28:19 +00:00
libraryaddict
3c98243201
Some more guardian stuff
2015-11-27 15:56:56 +13:00
libraryaddict
0a4416381b
Fix guardian
2015-11-27 15:55:02 +13:00
Cheese
98d988584d
titan cosmetics
2015-11-27 13:35:25 +11:00
NewGarbo
e849484670
bunch of changes and fixes and bugs and stuff and things
2015-11-26 23:59:47 +00:00
Keir
0ee042f192
Implement equals and hashCode, move compareTo into MessageSnap class.
2015-11-26 23:59:17 +00:00
Keir
3e06451ac1
Whoops, this should be 30 SECONDS, not MINUTES.
2015-11-26 23:50:45 +00:00
Keir
d47b494628
Add /chatcache (mainly for debugging).
...
Fix cache not being able to store more than 1 value per sender.
Add comparator to sort all messages chronologically.
2015-11-26 23:29:43 +00:00
NewGarbo
055702b36e
changes and fixes and woo
2015-11-26 23:08:33 +00:00
NewGarbo
56d4b34969
fixed formatting on death notices.
...
Made world event middle texts longer lasting.
Fixed logout NPC timer
2015-11-26 21:57:26 +00:00
NewGarbo
5393d1d18c
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-26 21:16:21 +00:00
Shaun Bennett
6e416b1059
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
2015-11-26 16:12:54 -05:00
Shaun Bennett
27e214a643
Region fix
2015-11-26 16:12:29 -05:00
NewGarbo
dd33d9587d
made power recharge a tad faster with Wind Blade
2015-11-26 21:12:09 +00:00
NewGarbo
0aaee24600
fixed gear UI display stuff incorrectly
2015-11-26 21:06:33 +00:00
NewGarbo
bb3ea0115d
fixed classes not loading
2015-11-26 20:41:42 +00:00
NewGarbo
67a28a94fb
bunch of fixes
2015-11-26 20:32:01 +00:00
Keir
edf93ec43f
Initial ChatSnap implementation.
2015-11-26 16:55:27 +00:00
Sarah
9e1d522876
Increase Render distance on particles, Don't spawn mob until "protect him from evil minions" title appears and changing some timings.
2015-11-26 16:47:31 +01:00
Sarah
33383af18a
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-11-26 16:37:57 +01:00
Sarah
c74732af39
One more fix.
2015-11-26 16:37:18 +01:00
Sarah
cb67e42f96
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-11-26 16:27:24 +01:00
Sarah
21f859f579
fixing 2 seconds delay.
2015-11-26 16:26:49 +01:00
Sarah
efc05803ac
Minion spawn.
2015-11-26 16:25:44 +01:00
Sarah
40259a26f1
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-11-26 16:12:51 +01:00
Sarah
a653f053a5
Adding 2 Seconds delay.
2015-11-26 16:12:13 +01:00
Sarah
9f3c3589b2
Particle render distance.
2015-11-26 16:09:29 +01:00
Sarah
3128a6005b
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-11-26 16:06:53 +01:00
Sarah
eddbde5ebd
Changing length formula.
2015-11-26 16:06:15 +01:00
NewGarbo
2bce722539
some code polishing. fixed some mispositioning with Spawn holograms.
2015-11-26 13:29:40 +00:00
NewGarbo
e5fa59b8da
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-26 13:17:28 +00:00
NewGarbo
009ddaaee1
stop players in tutorial from receiving/sending chat.
2015-11-26 13:16:50 +00:00
NewGarbo
bbfd319bcd
Spawn holograms
2015-11-26 13:14:10 +00:00
NewGarbo
1ce2a362c6
disallow item frames being rotated in Spawn
2015-11-26 12:34:12 +00:00
NewGarbo
be19c17fee
fixed gem -> gold conversion rate
2015-11-26 12:33:29 +00:00
NewGarbo
9aaad0b4a1
fixed formatting in /spawn command
2015-11-26 12:31:55 +00:00
Shaun Bennett
bdc08676d9
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
2015-11-26 03:34:33 -05:00
Shaun Bennett
d4f3786b1c
Fixes
2015-11-26 03:31:03 -05:00
NewGarbo
94a0f3244d
corrected typo in WindBlade.java
2015-11-26 07:53:37 +00:00
NewGarbo
af0df835b8
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
2015-11-26 07:52:35 +00:00
NewGarbo
97e903f403
updated regions
2015-11-26 07:51:10 +00:00
Shaun Bennett
75ff5bb3da
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 02:46:56 -05:00
NewGarbo
56d5c10481
oops util ent new method didn't commit in last commit
2015-11-26 07:29:59 +00:00
NewGarbo
c0cfdf9785
fixed windblade not recharging whilst jumping
2015-11-26 07:29:39 +00:00
NewGarbo
e80c1097b5
corrected regions
2015-11-26 07:08:30 +00:00
NewGarbo
0d43ffc7b2
fixessss
2015-11-26 06:54:49 +00:00
Shaun Bennett
6de7b8a73e
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 01:46:43 -05:00
NewGarbo
972a2d151a
simplified combat log npc title
2015-11-26 06:21:01 +00:00
NewGarbo
f92849f796
that doesn't do what i thought it did
2015-11-26 05:32:59 +00:00
NewGarbo
1e4b6b4d0f
fixed formatting error in clan tip
2015-11-26 05:30:13 +00:00
NewGarbo
7da8b8e3bf
fix players hurting each other in safe zones
2015-11-26 05:29:35 +00:00
NewGarbo
48ebfc219d
removed travel npcs from shops
2015-11-26 05:24:33 +00:00
Shaun Bennett
389956240b
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 00:20:41 -05:00
NewGarbo
76d009e0de
Unstuck (Spawn) command
2015-11-26 05:18:18 +00:00
Virizion
fdb4ae6e58
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-11-25 23:48:35 -05:00
NewGarbo
33cdd5400d
fixed some coloring issues
2015-11-26 04:32:41 +00:00
Cheese
193c5fe487
fixed static
2015-11-26 15:26:57 +11:00
Shaun Bennett
8f14c8beae
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
2015-11-25 23:26:29 -05:00
Shaun Bennett
7a663b4f7b
Fix legendaries
2015-11-25 23:24:07 -05:00
NewGarbo
8bd1f4b3c8
reduced hyper axe damage. OP as heck
2015-11-26 04:21:30 +00:00
NewGarbo
abcee009dd
stuff
2015-11-26 04:07:33 +00:00
Virizion
de82806fc0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-11-25 22:53:06 -05:00
Cheese
059a9a32cd
fixed method
2015-11-26 14:51:45 +11:00
Cheese
83a7b398bc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-26 14:47:24 +11:00
Cheese
1a5dbc073d
recursive block find method
2015-11-26 14:47:01 +11:00
Virizion
6a6807d6f0
- Added time left progress bar
...
- Added subtitle to countdown 5, 4, 3, 2, 1, TIME'S UP when a build is about to end
- Added an elder guardian who floats and shoots lasers at the losers builds and blows the blocks up with an explosion
- Added a subtitle to show who was eliminated
- Prevented players from entering other build areas
2015-11-25 22:45:23 -05:00
NewGarbo
670afc17ef
clans chat is being weird
2015-11-26 03:26:15 +00:00
NewGarbo
5230b25dfd
fixed suicide command (?)
2015-11-26 03:24:48 +00:00
NewGarbo
4f275d79fa
fixed staff tags only displaying if player is in clan
2015-11-26 03:19:40 +00:00
NewGarbo
5fb58b1dad
added suicide command
2015-11-26 03:17:05 +00:00
NewGarbo
8a64a2f4ce
fixed world events spawning floating on grass and other boundless blocks
2015-11-26 03:06:27 +00:00
NewGarbo
b43cf0b28a
got rid of enchanted effect on rare items
2015-11-26 03:00:59 +00:00
libraryaddict
55ff04ca93
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-26 15:49:54 +13:00
libraryaddict
3e8a53562e
Add new hologram interaction thingy so holograms can catch interactions that they would normally block
2015-11-26 15:49:28 +13:00
NewGarbo
7e23f896ca
changes
2015-11-26 02:49:01 +00:00
Cheese
55f5f95869
added no ammo display
2015-11-26 13:05:27 +11:00
Cheese
65a1441e1f
-Fixed smoke being removed when bomb was planted in it
...
-Fixed being unable to defuse bomb in smoke
-Fixed older smokes removing newer intersecting smokes
-Grenades will still detonate after being burned
-Bizon now gives $600 per kill
-Added replacement smoke on gun fire
-Added shell ejecting particles on gun fire
-Removed gun bobbing when firing
-Changed ammo display location
2015-11-26 12:56:26 +11:00
NewGarbo
a19ade0739
rain rain go away
2015-11-26 00:53:01 +00:00
NewGarbo
11deec75dd
fixed illusion
2015-11-26 00:44:13 +00:00
Shaun Bennett
c150ea6175
Potatoes and Tornadoes
2015-11-25 19:08:13 -05:00
Sarah
32ee1c285a
merging pregametutorial into type wars.
2015-11-26 00:29:28 +01:00
Sarah
063299ab3a
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-11-26 00:23:02 +01:00
Sarah
809faf3098
changing teleport mechanic.
2015-11-26 00:14:15 +01:00
Shaun Bennett
cc75bafb4c
Bugs and thugs
2015-11-25 16:45:04 -05:00
Thanos paravantis
941c996085
Update mineware class. Add underscore in variable name.
2015-11-25 23:18:27 +02:00
Thanos paravantis
e0bb8f60d4
Merge branch 'MortensRawBugFixes' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeAnvilDance.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBlockLobbers.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBuildRace.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeFallingBlocks.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeFastFood.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeWaveCrush.java
2015-11-25 23:14:22 +02:00
Thanos paravantis
ec01940dde
Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
2015-11-25 23:12:52 +02:00
Thanos paravantis
db8781cacb
Merge branch 'master' into thanos-mineware
2015-11-25 23:05:14 +02:00
Thanos paravantis
104beef730
Update branch with latest fishing day version.
2015-11-25 23:03:02 +02:00
Shaun Bennett
1306137cb2
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-25 14:51:00 -05:00
Shaun Bennett
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
NewGarbo
c5211e0368
buuugs
2015-11-25 17:40:12 +00:00
NewGarbo
9a8fba543d
auto-replanting trees
2015-11-25 17:03:48 +00:00
NewGarbo
2adfef41ca
bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 )
2015-11-25 16:46:53 +00:00
xGamingDudex
84fde1c087
Fixed double jump and entity ground tool.
...
Fixed isGrounded so that it doesn't return false positives when too
close to a wall.
Added 500ms recharge to double jump, preventing instant recharge
allowing players to jump twice before having to touch the ground again.
2015-11-25 16:42:32 +01:00
Sarah
de9262882a
fixing "enemy's" and some merge isssues.
2015-11-25 16:03:13 +01:00
xGamingDudex
3b89d65a09
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
2015-11-25 15:59:18 +01:00
Cheese
360f3db2ed
fixed grenade vertical rebound bug
2015-11-25 17:48:32 +11:00
Cheese
8ceb6ccfca
minestrike update!
2015-11-25 17:41:00 +11:00
NewGarbo
7e9dc7968e
gear gui fixes and legendaries changes
2015-11-25 01:32:05 +00:00
NewGarbo
bbdbb209c5
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-25 00:55:37 +00:00
NewGarbo
3a6dab7224
stuff
2015-11-25 00:55:11 +00:00
NewGarbo
3cb22c8cb7
uuid bug fixed finally!
2015-11-25 00:47:35 +00:00
libraryaddict
ecf42803f9
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-11-25 13:42:31 +13:00
libraryaddict
ca81265b9e
Readded PacketHandler debug message
2015-11-25 13:42:11 +13:00
NewGarbo
aa52c1be27
custom item stuff
2015-11-25 00:14:34 +00:00
NewGarbo
6220ce14fe
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-24 23:04:24 +00:00
NewGarbo
98edd0a452
dissallow chests, doors, furnaces, etc. from being accessed in territories that are not yours
2015-11-24 23:03:19 +00:00
NewGarbo
81c2d2a11f
*just pushing my current changes so that i can start fresh on recoding custom item serialization stuff*
2015-11-24 22:49:28 +00:00
NewGarbo
31afe9f886
removed debug message from undead camp
2015-11-24 22:29:20 +00:00
Shaun Bennett
57302221df
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-24 17:27:46 -05:00
Shaun Bennett
cb7422b4fe
Re-enable world events
2015-11-24 17:27:35 -05:00
NewGarbo
befe4d129d
formatted PlayerGear.java (to avoid further confusion)
2015-11-24 22:21:01 +00:00
NewGarbo
459e1beeff
clans buggy fixers
2015-11-24 22:18:48 +00:00
Sarah
fac7d152ae
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java
2015-11-24 16:25:44 +01:00
Sarah
2a64d06bdd
removing some debug.
2015-11-24 16:24:22 +01:00
Sarah
95b4ad74e8
fixed silencing and adding possibilty to change text.
2015-11-24 16:23:03 +01:00
Sarah
7708f879dc
Fixing attack damage.
2015-11-24 16:15:07 +01:00
Sarah
49f6679537
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
2015-11-24 15:43:59 +01:00
Sarah
46362a3d5f
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-11-24 15:38:52 +01:00
Cheese
d66bad572f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 22:19:59 +11:00
libraryaddict
5799edae50
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-24 23:45:42 +13:00
libraryaddict
ddf7528796
Updated CB
2015-11-24 23:45:22 +13:00
Cheese
837be048a6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 21:38:47 +11:00
Jonathan Williams
f8d8b75586
Changed how timings is used.
2015-11-24 04:36:18 -06:00
Cheese
7e2f5f0657
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 21:30:45 +11:00
Cheese
11a60a86a9
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-24 21:30:17 +11:00
Jonathan Williams
fbea0e702b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 02:56:40 -06:00
Cheese
c5b5d07627
evade timing
2015-11-24 16:07:11 +11:00
Cheese
913d079623
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-24 15:23:53 +11:00
Cheese
7454cf7443
MS + Champs bugs, balance and more
2015-11-24 15:23:37 +11:00
fooify
f8401e0eeb
fixed shield smash and fissure affecting spectators
2015-11-23 17:08:24 -08:00
fooify
f300fd2c98
Merge remote-tracking branch 'origin/master' into foo
2015-11-23 15:34:27 -08:00
NewGarbo
8559a63887
Added all rank names to Clans name blacklist
2015-11-23 22:10:29 +00:00
NewGarbo
3fa0beceb7
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-23 21:39:53 +00:00
Shaun Bennett
ef7c26c04c
Clans changes
2015-11-23 15:57:13 -05:00
NewGarbo
91067535db
changed getting started tutorial gold reward to be proper (5000 now)
2015-11-23 18:09:50 +00:00
NewGarbo
175a6bc31a
cleaned up world event times stuff
2015-11-23 17:24:17 +00:00
NewGarbo
9bae314278
fixed null pointer exception when interacting with a block when your clan home is null
2015-11-23 17:19:00 +00:00
NewGarbo
6ca4d12d98
fixed potential nofall exploit with logout npc
2015-11-23 17:09:51 +00:00
NewGarbo
ce2e616c74
fixed /skiptutorial bugs, removed safe log out command, fixed tutorial bugs, and much more i can't remember ;-;
2015-11-23 16:57:50 +00:00
Sarah
66598ce97e
adding teleport flag.
2015-11-23 16:16:33 +01:00
NewGarbo
da2c7d84a4
tutorial code cleanup. removed qa reset command
2015-11-23 11:19:23 +00:00
NewGarbo
a551e89310
fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT
2015-11-23 09:44:35 +00:00
NewGarbo
58ed9e586c
turned ClansTips into it's own miniplugin, as it doesn't fit as a subclass of Tutorial
2015-11-23 09:04:30 +00:00
Jonathan Williams
875b87e0e4
Fixed memory leak crashing servers.
2015-11-23 02:41:38 -06:00
NewGarbo
47abbfbedf
implemented skip tutorial being permanent
2015-11-22 20:01:54 +00:00
Morten
19803a00ab
Added the Wither Assault fixes to it's own Branch
2015-11-22 19:06:24 +01:00
Morten
ccaa86662c
Added a bunch of changes + another game
2015-11-22 18:58:07 +01:00
Keir
f0e24468d5
Enable reporting functionality for Arcade and Clans plugins.
2015-11-22 14:23:17 +00:00
Keir
dcca67e571
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-22 13:54:16 +00:00
NewGarbo
2e047b54c2
removed stone weapons from loot
2015-11-22 11:54:38 +00:00
NewGarbo
0cdee95b87
formatted some classes
2015-11-22 11:23:19 +00:00
libraryaddict
cfeafff2f6
EntityDismountEvent stuff
2015-11-22 14:44:32 +13:00
Virizion
ddc5427ae3
Merge branch 'master' into virizion_speed_builder
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-11-21 14:20:53 -05:00
fooify
205643028e
fixed slab issue with Assassin's Flash
2015-11-21 11:00:51 -08:00
Sarah
171696ff0d
final tutorial implementation.
2015-11-21 18:24:17 +01:00
Sarah
15032ac7ff
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-11-21 18:19:12 +01:00
Sarah
cba5aef9f1
small fix
2015-11-21 18:18:13 +01:00
Sarah
e10a63254a
saving typewars state
2015-11-21 18:16:24 +01:00
AlexTheCoder
3bb11bba08
- Fixed Stats [caused by bad communication between chiss and I]
2015-11-21 11:30:53 -05:00
Sarah
746cc597ab
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-11-21 17:02:27 +01:00
Sarah
6a29d2a2d6
adding some getters.
2015-11-21 17:01:17 +01:00
Sarah
d0b5f6d8ac
starting implementation of Type wars tutorial.
2015-11-21 16:56:56 +01:00
Sarah
01f67e9d3e
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-11-21 16:37:49 +01:00
Thanos paravantis
52f94f625f
Update Fishing Day challenge.
...
- Update map creation.
- Add explosion support if the player does not catch any fish.
2015-11-21 16:36:05 +02:00
Thanos paravantis
49b8aa74a6
Update Fishing Day challenge.
2015-11-21 13:26:58 +02:00
Thanos paravantis
19b79398da
Remove static and final keywords from constants.
2015-11-21 11:21:18 +02:00
Cheese
91e40d0e61
hide testing server MOTD
2015-11-21 13:37:19 +11:00
Cheese
5b8191e57c
fixed kick history stack direction
2015-11-21 11:42:59 +11:00
Cheese
02d09f2843
fixed slime dying bug
...
removed morphs
2015-11-21 11:37:17 +11:00
Cheese
9ef99cee20
fixed merge issues
2015-11-21 11:21:54 +11:00
Cheese
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
Cheese
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
Cheese
4a0cc79abf
fixed silence not working in non-champs servers
2015-11-21 11:08:09 +11:00
AlexTheCoder
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
AlexTheCoder
1274dc860d
- Stuff for chiss
2015-11-20 18:40:20 -05:00
Cheese
2f91ca5a8a
fixed errors
2015-11-21 10:35:17 +11:00
Cheese
4a70e4da90
more fixies
2015-11-21 10:34:08 +11:00
Cheese
4d128d9c7a
fixed some skills and wierd hitbox error
2015-11-21 10:29:48 +11:00
Keir
5bbf5bcce5
Only log to the database when the report has been closed.
2015-11-20 23:05:42 +00:00
Cheese
c7297a7a38
fixed invalid proxies exploding
2015-11-21 09:45:01 +11:00
Cheese
d5076b1c47
CTF fix
2015-11-21 09:41:02 +11:00
Cheese
e0885feea6
Merge branch 'master' into alex-ctf
2015-11-21 09:40:07 +11:00
Cheese
04be896ff6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-21 09:39:50 +11:00
Sarah
97471b0d9c
Finalizing Game Tutorials.
2015-11-20 23:38:02 +01:00
Keir
07b6c7cde7
Display message informing a report handler on how to close a report, when clicked this message will also fill out as much of the command as it can on the clients side.
2015-11-20 22:38:00 +00:00
Cheese
0bc64fec16
Proxy limit fixes
2015-11-21 09:28:15 +11:00
Keir
435f2b643d
Fix fetching player report stats.
2015-11-20 22:20:56 +00:00
Keir
ad16c59ab7
Forgot to commit this crucial part...
2015-11-20 22:05:10 +00:00
Keir
470ff67f86
Replace ReportProfile by using statistics to track total reports and accepted, denied & abusive reports. 1 or more abusive reports results in being banned from the report system.
2015-11-20 22:03:57 +00:00
Thanos paravantis
473f0ebcc7
Add first work in progress version of Fishing Day challenge.
2015-11-20 23:27:32 +02:00
Cheese
cfc0aa7d05
reverted to size 2 ball
2015-11-21 08:20:02 +11:00
Keir
fc6e1fe003
Notify the handler of a report (if any) when the report they are handling is purged.
2015-11-20 21:10:03 +00:00
NewGarbo
17e62f1f5a
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-20 18:31:37 +00:00
NewGarbo
fb04fac0f6
removed debug message
2015-11-20 18:31:14 +00:00
Sarah
6f7d49b71b
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-11-20 19:04:51 +01:00
Sarah
2a4d20650a
Saving for branch switching.
2015-11-20 19:04:11 +01:00
Thanos paravantis
80c95f1995
Merge branch 'master' into thanos-mineware
2015-11-20 17:02:40 +02:00
AlexTheCoder
386032a4f5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-20 06:03:30 -05:00
AlexTheCoder
f51358552a
-B
2015-11-20 05:57:29 -05:00
NewGarbo
521aa8d965
fixed furnaces in undead camp
2015-11-20 09:14:57 +00:00
NewGarbo
08f683aa98
gave Archers in undead camps the barbed arrows effect
2015-11-20 07:49:28 +00:00
Cheese
3067d9f281
final push for the day
2015-11-20 15:22:43 +11:00
Jonathan Williams
700e4c9a1f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-19 22:12:08 -06:00
Jonathan Williams
411d6fdb22
Made PlayerTracker use existing code for determining region.
2015-11-19 22:11:45 -06:00
Cheese
ed2f3a064c
MORE ML!
2015-11-20 14:31:01 +11:00
Mysticate
3f37b893d3
Worked on double.
2015-11-19 20:29:20 -05:00
Keir
80c87fa1fc
Make reports timeout after 15 minutes of inactivity.
2015-11-20 00:51:21 +00:00
Cheese
3a5ab3f17c
Merge branch 'master' into monster-league
2015-11-20 11:51:07 +11:00
Cheese
1cc92cea1b
and the files
2015-11-20 11:50:33 +11:00
Cheese
c4745c18b6
ML update
2015-11-20 11:50:20 +11:00
Mysticate
f7011032bc
Switching branches
2015-11-19 19:49:46 -05:00
Keir
bceb69bc12
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2015-11-19 23:52:02 +00:00
Mysticate
f02e2b2e72
Formatting
2015-11-19 18:02:07 -05:00
Mysticate
e816a79f37
Reformatted
2015-11-19 17:51:25 -05:00
Mysticate
502f12f00f
Fixed paintball to the max. :>>
2015-11-19 17:46:07 -05:00
Cheese
e14f5a36bd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-20 08:34:19 +11:00
Cheese
f33eedf36d
text fix
2015-11-20 08:33:51 +11:00
Sarah
0fedb99660
Changing the tutorial visuals and texts.
2015-11-19 21:04:50 +01:00
Shaun Bennett
c29fd242ca
Forgot to remove the unnecessary check
2015-11-19 14:46:01 -05:00
Sarah
ad280c96c9
adding interactive Chat elements.
2015-11-19 20:45:40 +01:00
Shaun Bennett
f47a61e38e
Use bounds for energy tracker messages aren't displayed multiple times
2015-11-19 14:44:03 -05:00
Shaun Bennett
63e580404c
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java
2015-11-19 14:36:08 -05:00
Shaun Bennett
3820035762
Cleaning up duplicate code/small optimizations (untested)
2015-11-19 14:35:59 -05:00
NewGarbo
b0c60fd1f4
sparkly rare items! woo. and fixed gold dropping waaayyy too much
2015-11-19 19:03:51 +00:00
NewGarbo
7d8e1b517d
Fixed dropped gold stacking...
2015-11-19 08:56:07 +00:00
NewGarbo
f262a22913
Fixed loot dropping in King of the Hill not dropping correct items/
2015-11-19 08:54:59 +00:00
NewGarbo
6372dfd629
fixed ArithmeticException / 0 in ClansEnergyTracker.
2015-11-19 08:29:50 +00:00
Virizion
975b1df477
Added the title message when a perfect match. Turns out having a '%' in the text caused it not to appear.
2015-11-18 22:03:04 -05:00
fooify
6d0879a175
Re-fixed Barbarian bug
2015-11-18 17:31:28 -08:00
Virizion
796f116cfd
Merge branch 'master' into virizion_speed_builder
2015-11-18 19:27:42 -05:00
Virizion
937d024ea5
Empty builds are auto eliminated. Damage player 9001 so the elimination is handled by the managers and not us. If there are not enough build areas for the players, the game ends. Shows a message that you completed the build if you complete it correctly. It also plays a sound. It would have a title but the title wasn't showing up for some reason...
2015-11-18 19:26:19 -05:00
NewGarbo
0a667afeb1
finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching
2015-11-18 22:27:01 +00:00
William Burns
4620a5a162
Hub fix
2015-11-18 21:47:52 +00:00
Sarah
a8ba1f1ea6
some perspektive changes to the tutorial and removing prepare timer.
2015-11-18 22:33:47 +01:00
Virizion
76db2710ae
It should have been all got the build 100% correct not all got the same score.
2015-11-18 16:10:44 -05:00
NewGarbo
eded09b1a9
fixed yet another bug with beds... argh it seems to be working fine now.
2015-11-18 21:02:39 +00:00
Keir
cb5672b94c
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-18 20:34:24 +00:00
NewGarbo
6f3693f804
more bug fixes
2015-11-18 19:32:20 +00:00
NewGarbo
924504ac9f
fixed clans home NPE. also added GRASS to UtilItem's item property system.
2015-11-18 19:03:44 +00:00
William Burns
6fa2a58f5d
Merge branches 'master' and 'william-global' of ssh://184.154.0.242:25565/min/mineplex into william-global
2015-11-18 18:50:09 +00:00
William Burns
0e1c72e25d
testing excludes
2015-11-18 18:46:51 +00:00
Sarah
f2830e653e
Making last changes to the tutorial
2015-11-18 19:25:12 +01:00
NewGarbo
16eecdd112
fixed clan energy alerts going off incorrectly
2015-11-18 17:30:45 +00:00
Sarah
bff9a065d9
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
# Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-11-18 18:08:51 +01:00
Sarah
64970ab8d6
adding little tutorial at the start of the game.
2015-11-18 17:53:35 +01:00
NewGarbo
5c2569e822
revert certain permissions from being ALL or containing JR.DEV (that were used for testing)
2015-11-18 16:20:27 +00:00
Shaun Bennett
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
William Burns
a11ca138e7
ranks
2015-11-18 16:01:53 +00:00
William Burns
04a4b072af
woops easy fix
2015-11-18 15:48:25 +00:00
William Burns
2e223d0660
rawr and fixes
2015-11-18 15:42:33 +00:00
William Burns
e16ee9036a
Added the ability to give out game loot.
2015-11-18 14:35:40 +00:00
William Burns
e83b49d490
Reformatting titles
2015-11-18 13:43:22 +00:00
NewGarbo
5c383a1df3
cleaned up /sethome old bed removal, as previous way would delete any beds around the home bed, which would destroy
2015-11-18 12:24:28 +00:00
NewGarbo
9eaffc8acf
Added methods into UtilBlock to place beds and doors. updated /sethome to use the new method for placing beds. i'm sure they'll come in handy later on.
2015-11-18 12:17:00 +00:00
NewGarbo
cd0ce57691
replaced useless looping with just checking the rotation of the bed.
2015-11-18 09:58:06 +00:00
NewGarbo
1ea87b8354
Fixed an NPE when destroying a Clan's Home
2015-11-18 09:37:32 +00:00
NewGarbo
03764ad480
removed the disallowing of interaction in ClansGame.java if the block that the player is hitting, is a Clan's Home. This was messing up the other code for Clan Home bed stuff.
2015-11-18 08:40:24 +00:00
NewGarbo
f5e12e5014
formatted ClansGame.java (separate commit because confusion otherwise)
2015-11-18 08:37:34 +00:00
NewGarbo
77f234e5f5
Made energy warnings stay for longer
2015-11-18 08:32:48 +00:00
NewGarbo
185f19fb6a
fixed clan energy warnings being sent to all players on the server instead of the clan.
2015-11-18 08:13:13 +00:00
NewGarbo
6da628abe1
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-18 07:40:35 +00:00
NewGarbo
f79c282225
Clan energy warnings implemented. (not tested yet)
2015-11-18 07:39:00 +00:00
Virizion
8145b127ba
Changed the score algorithm so if all players have the same score, nobody is eliminated.
2015-11-17 20:04:23 -05:00
fooify
4198e73120
Fixed SG Barbarian bug
2015-11-17 16:05:49 -08:00
Shaun Bennett
4f63d90bac
Only show player location for allies/self
2015-11-17 18:42:06 -05:00
Shaun Bennett
01a57dde2f
Fix formatting of ally messages
2015-11-17 18:39:15 -05:00
Shaun Bennett
52c55335fa
Add chunk to unclaim map
2015-11-17 18:33:21 -05:00
Shaun Bennett
ab8f9cb992
Fix map color
2015-11-17 18:31:38 -05:00
Shaun Bennett
4183f0ce07
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
2015-11-17 18:05:17 -05:00
Shaun Bennett
f6cfc36e9f
War Invasion, GUI Improvements, New ClanRelation for Winning/Losing War, Update Clan Map for new relation, Show invasions in scoreboard
2015-11-17 17:59:35 -05:00
NewGarbo
c23b2f54f5
Removed arbitrary boundary around admin territories (Chiss' request)
2015-11-17 22:41:51 +00:00
NewGarbo
9b866145ea
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-17 22:24:58 +00:00
NewGarbo
31906b025f
Clans Home switched over to using physical beds.
...
Changed "You cannot [break/place/use] [blocks/items] in [territory]" to something more simple (as per Chiss' request)
2015-11-17 22:24:19 +00:00
William Burns
e19d4e11e1
Added GlobalGiveCoins. Changes Gems a little and the manager.
2015-11-17 18:54:39 +00:00
William Burns
a28adc9673
More global stuff! Added GlobalGiveGems.
2015-11-17 18:26:19 +00:00
Mysticate
1342a8ac9f
Class
2015-11-17 11:38:15 -05:00
Mysticate
448dd33c1a
Switching branches c:
2015-11-17 11:38:02 -05:00
Keir
6ee40aa1ce
No longer close reports when the player quits, instead alert the handler and alert again when (and if) the player re-joins if the report is still active.
2015-11-17 15:08:35 +00:00
Keir
a1713ca866
If someone is currently handling a report, re-direct all messages relating to that report to them.
2015-11-17 14:21:05 +00:00
William Burns
0f7c52391f
Global Packet work. Added giveitem sub-command.
2015-11-17 08:19:36 +00:00
Shaun Bennett
6187b5e680
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-16 17:34:47 -05:00
Shaun Bennett
c3cd0e3ad2
Fix chat formatting, open clan shop with /c
2015-11-16 17:31:24 -05:00
libraryaddict
f95bec0f15
Fix up mapmanager, untested
2015-11-17 11:30:04 +13:00
Shaun Bennett
a153ffdc38
Fix enchant tables opening the wrong gui
2015-11-16 17:29:25 -05:00
Shaun Bennett
5b30cfb67e
Fix War Points bug
2015-11-16 17:27:56 -05:00
Cheese
adfc2f19eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-17 09:20:15 +11:00
Cheese
46505a8e8e
converted to new res pack locations
2015-11-17 09:19:33 +11:00
Shaun Bennett
007d5a00dc
Merge remote-tracking branch 'origin/master'
2015-11-16 16:39:43 -05:00
Shaun Bennett
e35eec4cb1
Update motdmanager and compiler.xml
2015-11-16 16:39:34 -05:00
libraryaddict
208d90c4bc
Fixed getTargetBlock being 0 when its infinite
2015-11-17 10:18:42 +13:00
NewGarbo
0d372cefaa
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-16 19:41:46 +00:00
NewGarbo
181642e200
give undead warriors stone swords.
2015-11-16 19:41:09 +00:00
Shaun Bennett
07f92d2e6e
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
2015-11-16 14:39:47 -05:00
Shaun Bennett
2627aa9933
War/War Points Update
2015-11-16 14:37:32 -05:00
Virizion
2e9ac8df4d
First commit.
2015-11-15 22:06:11 -05:00
Jonathan Williams
88dbe261db
Added logging for stacker.
2015-11-15 18:34:35 -06:00
Jonathan Williams
ac792dcd02
Removed some unnecessary code in updateRank and opened up all ranks to be used.
2015-11-15 18:33:43 -06:00
AlexTheCoder
217509b75a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Conflicts Resolved
2015-11-15 18:58:20 -05:00
libraryaddict
e5b376bc5c
Fixed wrong CB
2015-11-16 12:48:26 +13:00
AlexTheCoder
667edc8a90
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-15 17:48:16 -05:00
AlexTheCoder
ecaa4a49b4
- Fix for stats
2015-11-15 17:48:00 -05:00
NewGarbo
580ec27738
hmm getTitle() in FieldBlock returns null (presumably accidentally), and forgot to update getters with interfaces.
2015-11-15 21:03:48 +00:00
NewGarbo
c6f73d6e9a
oh deary me, i appear to have gone on a rampage of changing everything to interfaces.
2015-11-15 21:01:27 +00:00
NewGarbo
24dee0ebf6
updated ScoreboardElement to use the interface instead of the implementation. PLEASE NEVER USE THE IMPLEMENTATION FOR DEFINING THE TYPE!!!
2015-11-15 20:52:45 +00:00
NewGarbo
fff248ad86
king of the hill gold drop fix
2015-11-15 20:37:37 +00:00
NewGarbo
5209cf3d38
fixed an annoying IllegalArgument with the World Event start command. fixed limit bukkit runnable not limiting itself.
2015-11-15 20:04:44 +00:00
NewGarbo
10eb1bb9c9
enum change didn't commit in the last commit ugh
2015-11-15 19:57:16 +00:00
NewGarbo
22ae67ba81
king of the hill changes. (renamed enum for it for ease of typing)
2015-11-15 19:57:00 +00:00
NewGarbo
c247fe9317
World event prettification and fixes
2015-11-15 18:19:28 +00:00
libraryaddict
aaf3705cc7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-16 06:57:09 +13:00
libraryaddict
6e55074211
Add entitydismountevent
2015-11-16 06:56:39 +13:00
Mysticate
399edbab29
Sniper work
2015-11-15 12:47:45 -05:00
NewGarbo
2aa7dd13c3
fixed NullPointerException
2015-11-15 15:05:18 +00:00
NewGarbo
1d8366487b
Fixed King of the Hill from not working at all, and some other tiny fixes
2015-11-15 14:33:29 +00:00
NewGarbo
33d358ac6a
Quick fix in EventTerrainFinder because of incorrect block checking.
...
Added a constant "GOLD_PER_TICK" in the King of the Hill code, because hardcoded numbers are no fun.
Commented out some strange useless code.
Renamed getTicks() to getTicksRunning() and _ticks to _ticksRunning.
2015-11-15 12:09:31 +00:00
NewGarbo
e28059848c
New 1.7 leaves fix for UtilBlock#getHighest()
2015-11-15 08:51:59 +00:00
NewGarbo
1398987ff7
Removed currently unused world event types.
2015-11-15 08:49:44 +00:00
NewGarbo
321d840cfd
Throwing RuntimeException instead of legacy assert expression.
2015-11-15 08:28:57 +00:00
fooify
5767d4e2db
SSM bug fix: magma cube flame dash doesn't make player invisible
2015-11-14 16:08:14 -08:00
Shaun Bennett
f90b137ccd
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-14 16:46:03 -05:00
NewGarbo
e4981c7491
Undead camp finishing stuff
2015-11-14 20:30:37 +00:00
Mysticate
746aab7786
Merge remote-tracking branch 'origin/master' into Myst_KITS
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java
2015-11-14 14:50:48 -05:00
fooify
db21d627d8
Merge remote-tracking branch 'origin/master' into foo
2015-11-14 09:13:51 -08:00
Morten
0a907fb661
Final stable version reached. All challenges work as intented.
...
Now I will start working on the scoreboard and possibly some kits?
Thanos will continue with some challenge creations. But we are approaching
the final version of Mineware
2015-11-14 15:01:04 +01:00
Thanos paravantis
b4f9899fb1
Rename Block Runner to Build Race. Final changes on Treasure Digger map creation.
2015-11-14 16:00:51 +02:00
Thanos paravantis
c2c99c1d5d
Add additional checks for spectators on challenge events.
2015-11-14 14:31:46 +02:00
Thanos paravantis
3f4955de0d
Fix carrot item not being added to player inventory on Fast Food challenge.
2015-11-14 13:58:23 +02:00
Thanos paravantis
ecbc3f3b5d
Add additional check on Treasure Digger while placing decorations on the map.
2015-11-14 11:37:31 +02:00
Thanos paravantis
5ca96b5614
Update Treasure Digger, improved chest loot and map creation. Code refactoring on several challenges.
2015-11-14 11:23:25 +02:00
Jonathan Williams
daee44d262
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-14 02:01:24 -06:00
Shaun Bennett
9f37e3e595
Merge remote-tracking branch 'origin/master'
2015-11-14 01:46:44 -05:00
Shaun Bennett
2bb82da735
Motd update
2015-11-14 01:45:55 -05:00
Jonathan Williams
4a73bce586
Added gadget and projectileUser logging.
2015-11-14 00:36:34 -06:00
Shaun Bennett
487f974951
Clan Gui updates and code cleanup
2015-11-13 23:53:34 -05:00
Cheese
e7b86b4462
hub skytext
2015-11-14 13:05:11 +11:00
Cheese
60a6a81587
faster cleanup
2015-11-14 13:03:41 +11:00
Cheese
9518b64e3c
clean up snowballs
2015-11-14 12:55:43 +11:00
Cheese
259397b6ae
READY 2 GO
2015-11-14 12:52:14 +11:00
fooify
f9f4c2addc
fixed several smash bugs and one global issue
2015-11-13 17:28:25 -08:00
Cheese
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
Cheese
5586132429
champions balance
2015-11-14 11:05:51 +11:00
Thanos paravantis
f242919759
Update Treasure Digger (previously Evolution of Combat).
2015-11-13 23:54:17 +02:00
NewGarbo
8a972075da
Formatted WorldEventManager (seperate commit for formatting so that confusion doesn't arise in future commits)
2015-11-13 21:19:50 +00:00
NewGarbo
a0ac15dec5
Allowed Jr.Devs to start/clear world events.
2015-11-13 21:01:09 +00:00
NewGarbo
98be3a51a0
Added a Speed I effect to the UndeadWarrior and UndeadArcher creatures that spawn in the UndeadCamp world event.
2015-11-13 21:00:08 +00:00
NewGarbo
010f30f064
Made the alpha login message only send one (forgot to save the task manager stuff)
2015-11-13 20:57:33 +00:00
Shaun Bennett
8ba9a8f6c4
Fix border radius
2015-11-12 22:38:26 -05:00
Shaun Bennett
40138b6914
1.8 fix
2015-11-12 22:35:56 -05:00
Shaun Bennett
f3e94cc035
Map fix (probably broken?!)
2015-11-12 21:35:01 -05:00
AlexTheCoder
016e54977d
- Finish game [FINALLY]
2015-11-12 21:16:58 -05:00
Keir
bf81c26874
Only notify staff when a report count reaches a certain amount (3 for hacking, 1 for chat abuse).
2015-11-13 01:27:34 +00:00
Keir
a6d3ba10c2
Show the handler of the report a message every 10 seconds whilst they are handling a report. Any part of the message is clickable and when clicked shows the close report GUI.
...
Jazz-up messages sent to players.
Rename Category to ReportCategory.
2015-11-13 01:23:33 +00:00
Cheese
9de3981dec
ms update
2015-11-13 11:24:11 +11:00
fooify
a0c0f6b891
Slightly bumped Monster Maze jump time value
2015-11-12 16:19:33 -08:00
Shaun Bennett
bbc7bf770c
1.8 Fixes - Still doing map fix
2015-11-12 19:18:42 -05:00
Shaun Bennett
639d2d110f
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
2015-11-12 17:55:33 -05:00
Shaun Bennett
c4e188296a
Fix compiler and misc
2015-11-12 17:55:00 -05:00
Shaun Bennett
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
Cheese
3122397f7a
Merge branch 'master' into minestrike-update
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
2015-11-13 09:19:44 +11:00
Shaun Bennett
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
Sarah
4958ce347d
Fixing boss not despawning bug, scoreboard end bug and some achievements.
2015-11-12 18:41:40 +01:00
AlexTheCoder
bc1b185f0e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-12 02:44:54 -05:00
AlexTheCoder
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
fooify
ac4a276aff
fixed bridge bug "Death Bomber counts suicides as well"
2015-11-11 20:38:36 -08:00
fooify
8a0906587d
Merge remote-tracking branch 'origin/master' into foo
2015-11-11 20:15:31 -08:00
Shaun Bennett
875c399c9f
Merge branch 'master' into clans-beta
2015-11-11 21:31:03 -05:00
Shaun Bennett
33680e829a
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-11 21:25:32 -05:00
Keir
27d5c76376
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-12 02:01:01 +00:00
libraryaddict
25f299b490
Fix interact types
2015-11-12 14:34:12 +13:00
Keir
3c419b3217
Small fixes from last commit.
2015-11-12 00:24:31 +00:00
Keir
6295a8ce08
Closing a report will now display a GUI in which the closer can decide on the result of the report. Some of these options will yield additional options, such as punishment options if a report is indeed valid.
...
Store count of a players accepted, denied and abusive reports.
The previous partially implemented reputation system has been removed, at least for now.
2015-11-12 00:02:38 +00:00
Shaun Bennett
e66bebcfb1
Give all treaure items when opening the chest
2015-11-11 18:13:47 -05:00
Shaun Bennett
994a9e3e43
Clans Gui Work, commiting so I can switch branches
2015-11-11 18:05:48 -05:00
NewGarbo
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
Keir
9573751a87
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-11 19:24:34 +00:00
Morten
e28878eec2
Quick update
2015-11-11 20:23:34 +01:00
Keir
727da2c6b5
Embarrassing typo.
2015-11-11 19:23:10 +00:00
Keir
f2e88c1c54
Only allow 1 player at a time to handle a report.
2015-11-11 19:05:29 +00:00
Keir
d7ba2e4731
Fix infinite gson loop by separating dependencies.
2015-11-11 16:12:28 +00:00
libraryaddict
ba7515f761
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-12 04:27:17 +13:00
libraryaddict
b915131407
Fix some armorstands and interaction bugs
2015-11-12 04:26:55 +13:00
Keir
9c45a48a26
Add confirmation message when a report is successful.
2015-11-11 15:05:36 +00:00
Keir
2722aeaaec
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-11 14:53:49 +00:00
Keir
191fa0ec53
Actually fetch the showUserReports value from the database.
2015-11-11 14:53:22 +00:00
Thanos paravantis
1830d5eaa3
Update projectile manager usage on challenges.
2015-11-11 14:06:32 +02:00
Thanos paravantis
d93c2c7108
Merge branch 'master' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java
2015-11-11 13:55:28 +02:00
Thanos paravantis
ba9d468619
Update Evolution of Combat challenge.
2015-11-11 13:49:35 +02:00
Jonathan Williams
27ef2c0bbb
Fixed UtilEnt.Leash method.
2015-11-11 04:36:10 -06:00
Jonathan Williams
0e6146d5c9
Added expire to Stacker throw.
2015-11-11 04:32:56 -06:00
Cheese
3ed680e1c2
ms update
2015-11-11 15:55:48 +11:00
Cheese
ef2411b7d5
Merge branch 'master' into minestrike-update
2015-11-11 13:43:36 +11:00
libraryaddict
3e6d73221b
Disabled a fix
2015-11-11 15:21:17 +13:00
Cheese
4dd9b0967a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-11 12:50:07 +11:00
Cheese
a47752cfe2
disabled usage of /minecraft: commands in 1..8
2015-11-11 12:49:19 +11:00
Cheese
d971e3c8a3
ms update
2015-11-11 12:46:58 +11:00
libraryaddict
ee286c2676
Disable /minecraft commands
2015-11-11 13:49:06 +13:00
libraryaddict
7559d1feb5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-11 11:45:40 +13:00
libraryaddict
f18c55cbd9
Fix schedulers
2015-11-11 11:45:17 +13:00
Keir
f1c8564263
Fix preference inventory.
2015-11-10 21:40:35 +00:00
Keir
7d63a95ec9
Remove ALTER statement, modifications have been done.
2015-11-10 21:22:21 +00:00
Keir
fa9530b5bf
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-10 21:06:03 +00:00
Cheese
e3c22b356b
Merge branch 'master' into minestrike-update
2015-11-11 07:54:28 +11:00
Cheese
4eaa165826
such format
2015-11-11 07:54:13 +11:00
Cheese
59a054eeba
fixed merge erorr
2015-11-11 07:52:02 +11:00
Cheese
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
Cheese
b3125e40ff
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-11 07:43:01 +11:00
Morten
148a4e9425
Merge branch 'master' into MortensRawBugFixes
2015-11-10 17:16:00 +01:00
Morten
2ef32a14df
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
# Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java
2015-11-10 17:15:23 +01:00
Morten
2128a0d711
Updating to 1.8... sigh
2015-11-10 17:13:27 +01:00
Keir
a81da156ac
Load show user reports value from database.
2015-11-10 16:08:16 +00:00
Keir
e59b5c2549
Actually show the report toggle action.
2015-11-10 16:07:32 +00:00
fooify
394d680470
Merge remote-tracking branch 'origin/master' into monster-league
2015-11-10 07:09:19 -08:00
fooify
ca1177685f
totally WIP commit
2015-11-10 07:08:08 -08:00
Keir
ff65231912
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-10 11:38:29 +00:00
Keir
217ac78d49
Alter "accountPreferences" table to include a new column "showUserReports".
2015-11-10 11:38:13 +00:00
libraryaddict
6983af944f
Fix a craftbukkit bug
2015-11-11 00:25:20 +13:00
libraryaddict
37fdf53a51
Fixed champion's Illusion crash
2015-11-11 00:21:28 +13:00
Keir
e00c11ae28
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-10 11:17:49 +00:00
AlexTheCoder
d654f1f4b1
- Fixed class edit in lobbies
...
- Fixed conflict between rave suit and assassin
2015-11-10 06:17:25 -05:00
libraryaddict
1a2c163ce2
Fix scoreboard out of bounds error
2015-11-11 00:03:08 +13:00
AlexTheCoder
e165cad50f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-10 04:53:32 -05:00
Jonathan Williams
6e90052480
Updated StaffServer to 1.8
2015-11-10 02:01:39 -06:00
Cheese
0a9c97c32a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-10 18:05:01 +11:00
Shaun Bennett
2707173a8b
Merge with 1.8 Branch
2015-11-10 01:48:33 -05:00
Keir
47c509c975
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-11-09 22:55:00 +00:00
Cheese
83248a8fec
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-10 09:11:27 +11:00
Cheese
0ae5330634
squid changes
2015-11-10 09:11:10 +11:00
NewGarbo
1aef7fe0b9
bunch of fixes reported by qa in tutorials.
2015-11-09 20:46:38 +00:00
NewGarbo
f1fbe086d3
oh how fun, even more constructor errors!
2015-11-09 20:29:52 +00:00
NewGarbo
af6e28f14b
don't you worry Shaun, I gotcha back with fixing them constructor problems ;)
2015-11-09 20:29:27 +00:00
NewGarbo
c6ff845efa
arcade weird thingy
2015-11-09 20:28:41 +00:00
Shaun Bennett
8850737f71
Fix constructor issues
2015-11-09 15:22:15 -05:00
Shaun Bennett
0bb3f8adb1
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
# Conflicts:
# Plugins/.idea/dataSources.xml
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2015-11-09 14:41:16 -05:00
Shaun Bennett
610b5dbeb2
More work on gui
2015-11-09 14:39:52 -05:00
Keir
03a5954224
Handle saving and loading of the ShowUserReports setting.
2015-11-09 18:35:03 +00:00
Sarah
18ab3d0f5b
Mob shrinking and some Word fixes.
2015-11-09 15:40:49 +01:00
Jonathan Williams
5c89124eb6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-09 03:25:02 -06:00
Jonathan Williams
ba7d5bbcdc
Fixed Arcade!
2015-11-09 03:24:20 -06:00
Shaun Bennett
ec3427bcc0
Giveaway manager bug fix
2015-11-09 04:08:26 -05:00
NewGarbo
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
Shaun Bennett
05b52614fe
Forgot to remove debug code for testing
2015-11-09 03:49:12 -05:00
NewGarbo
0409d7ffef
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-09 08:48:12 +00:00
NewGarbo
4232a5675f
fixed bug with part 5 of the getting started tutorial (has to do with claiming events)
2015-11-09 08:45:34 +00:00
NewGarbo
8f507c4b9c
typo
2015-11-09 08:29:51 +00:00
Shaun Bennett
2eaa326929
Merge remote-tracking branch 'origin/master'
2015-11-09 03:27:50 -05:00
Shaun Bennett
2c54e9e59a
Giveaway extras
2015-11-09 03:27:42 -05:00
Jonathan Williams
fb4978305f
Fixed up EnjinTranslator
...
Added extra overload for inventoryManager if you have the accountId already.
2015-11-09 02:26:45 -06:00
Shaun Bennett
2a7b272de3
Merge remote-tracking branch 'origin/master'
2015-11-09 01:55:36 -05:00
Jonathan Williams
283a774e03
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-09 00:04:55 -06:00
Jonathan Williams
4915ebc5ad
Added Purchase logging manager for Enjin.
...
Added extra callback method for SaveRank.
2015-11-09 00:04:38 -06:00
Jonathan Williams
ff936784d3
Remove debug code.
2015-11-08 17:27:00 -06:00
Jonathan Williams
e86623c8d0
Disabled TrickOrTreatManager to test for Lobby lockups.
2015-11-08 17:26:43 -06:00
Jonathan Williams
fd3ccf7ce0
Fix Bungee lobby balancer code.
2015-11-08 17:25:54 -06:00
