JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,568 Commits 1 Branch 0 Tags 481 MiB
24c1e5fc3b
Commit Graph

3750 Commits

Author SHA1 Message Date
cnr
2d02d79cec Fix survival games' Beastmaster wolf spawning 
Beastmaster wolf spawning suffered from the same issue as the Wizards
"Summon Wolves" spell: spigot has an issue when setting an owner to a
wolf or ocelot without a previous owner. See SpigotUtil for details.
 2016-04-20 18:45:54 -05:00
Joseph Prezioso Jr.
2d45ab61cc Elo re-calculated 
Elo is now being incremented more consistently (and not multiple times)
 2016-04-20 15:48:27 -04:00
Joseph Prezioso Jr.
6a5c8336cf Elo and Division fixed 
Elo and Division should be displaying properly

Cleaned the code up a bit

Added endElo() to Game.java to handle team Elo code

Added event listener to check for GameState.End in TDM to call endElo()
 2016-04-20 14:52:06 -04:00
Thanos paravantis
6e011b3a89 Add missing SpawnDefinition interface 2016-04-19 21:52:45 +03:00
Thanos paravantis
cb4561c561 Implement team check on challenge selection system 2016-04-19 18:25:36 +03:00
Thanos paravantis
11aef273ba Fix NPE on Volley Pig 2016-04-19 18:25:04 +03:00
Thanos paravantis
50175f9453 Spawn players with equal distance from ladder on KOTL 2016-04-19 14:27:48 +03:00
Thanos paravantis
17c51f03ad Remove grass only from used spawns 2016-04-19 14:17:32 +03:00
Thanos paravantis
20fdb1f21c Restructure methods on Mini OITQ challenge 2016-04-19 13:59:09 +03:00
Thanos paravantis
816abad8de Fix Mini OITQ barriers enclosing players at spawn 2016-04-19 13:57:39 +03:00
cnr
bda9772ba6 Mitigate spigot issue when setting wolf owner 
This fixes the Summon Wolves spell in Wizards.

Explanation:

- Wolves keep track of their most recent owner.
- When a wolf is assigned a new owner, it updates the data
  watcher with the new owner's UUID
- During this process, the old owner's UUID is checked
  against the new one
- If the wolf didn't have a previous owner, the old owner's
  UUID is the empty string.
- UUID.fromString() is called on the empty string, and throws
  an exception.
 2016-04-19 02:46:38 -05:00
Thanos paravantis
09fb1842b6 Apply improvements and bug fixes 2016-04-19 10:00:06 +03:00
Shaun Bennett
6dc2559dd1 Merge remote-tracking branch 'remotes/origin/md_5/boosters' into feature/gems 2016-04-19 13:57:33 +10:00
AlexTheCoder
e08965aa25 - Fixed TowerDefender being too difficult to obtain 
- Fixed wither attacking own towers by accident
 2016-04-18 22:58:55 -04:00
AlexTheCoder
6c20427395 - Fixed some bugs and added final achievements 2016-04-18 22:32:15 -04:00
AlexTheCoder
17ac3cb597 - Fix armor checking 
- Edit wither death message
 2016-04-18 20:29:53 -04:00
AlexTheCoder
10aba533f3 - Remove all dependence on UtilShapes 2016-04-18 19:59:55 -04:00
AlexTheCoder
34399db6e8 - Fixed missing GameType 2016-04-18 18:42:56 -04:00
xGamingDudex
e45f800519 Fixed damage calculator error 2016-04-18 20:36:22 +02:00
md_5
9de990744d Stage 2016-04-18 17:46:38 +10:00
AlexTheCoder
ee30012011 Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-17 12:27:23 -04:00
AlexTheCoder
d623d0982b Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge 2016-04-17 12:02:08 -04:00
AlexTheCoder
4c35e35fc0 - More polish and bugfixes 2016-04-16 23:59:44 -04:00
Shaun Bennett
9c2cd6a883 Merge branch 'feature/redis-update' into feature/gems 2016-04-17 13:08:11 +10:00
AlexTheCoder
35d7dd8b44 - Fixed stuff 2016-04-16 20:36:19 -04:00
AlexTheCoder
b0d30a4ff4 - cleaned everything up 
- renamed game
 2016-04-16 20:32:14 -04:00
AlexTheCoder
d8f5ac66fc - More chiss 2016-04-16 14:05:46 -04:00
xGamingDudex
696088b57e Fixed gun stats between games 2016-04-16 18:16:53 +02:00
Thanos paravantis
cb4e25fb0a Implement new challenge selection system 
The new challenge selection system, picks a random challenge from
the list as a starting point. Once the challenge is ended, the next
one in the list will be selected. That process continues, until the
index is out of bounds, and from that point, a new starting point
will be selected. During that process, any challenge that is picked,
is also reviewed to make sure it's suitable according to the player
count. If that's not the case, the selection process will continue
until one challenge is found. If there is no appropriate challenge,
the game will be ended.

In addition to those changes, there are a couple of bug fixes and changes.
At first, some methods that keep track of player lists were renamed and
secondly, the enchantment lore is now hidden on challenges that use items.
 2016-04-16 15:13:52 +03:00
Joseph Prezioso Jr.
bbb81dd663 Elo calls migrated to Game.java 
Consequently, elo code is actually being called now

Bukkit.broadcastMessage calls have shown where things are breaking

handleElo() added to EloManager to facilitate movement of team elo code

preparing to use EloManager's getNewRatings() method to 
calculate team elos
 2016-04-15 20:48:56 -04:00
xGamingDudex
ffc0459e5a Cosmetic Update 
+ Support for relative copy position from with //copy from worledit in
schematics
+ Better block selection in bounding box in UtilBlock
+ Goal selector utils for entities
+ Global hide and show methods for players
+ Win effects and game modifiers
+ Tweaked player disguises
+ Added clean room generator to arcade games, previously normal flat
world
+ Animation utils

* Edited some particles, hats and death animations
 2016-04-16 02:24:41 +02:00
Jonathan Williams
2b2b251548 Merge branch 'clans/beta' into develop 2016-04-15 12:41:14 -05:00
AlexTheCoder
09f9ae3b7a - Update for playability 2016-04-14 23:05:14 -04:00
AlexTheCoder
33b557eb10 - Huuuuuuuge amount of changes for chiss 2016-04-14 22:45:21 -04:00
Joseph Prezioso Jr.
742807d80e Added generatePlayerElos and updated saveDivision 
Added method to fill EloManager's playerElos hashmap with values
--This may not work as intended
--Currently only implemented in Team Death Match
 2016-04-14 17:17:26 -04:00
cnr
6b2f601c7a Prevent a spectator race condition in arcade games 
Previously, a player would erratically become a spectator if s/he
spammed the "spectate next player" action between rounds (i.e.
left-click while spectating a player).
 2016-04-13 18:20:39 -05:00
Joseph Prezioso Jr.
9e8a7b582b Elo updates 
EloRanking turned on for Domination, Team Deathmatch, Turf Wars, CTF

Database QoL changes made to EloManager and EloRepository
--Unfortunately, Database still seems to not be updating properly
--Something on my end, or something to do with the queries? Unsure.
 2016-04-13 18:35:56 -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
Ben
a04f7c23c6 Disable incognito for staff in hub invisibility, and vice-versa 2016-04-08 20:18:56 +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
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
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
Joseph Prezioso Jr
c6c52885a9 Fixed commit 2016-04-05 15:16:40 -04:00
Ben
7f92a3c048 incognito changes 2016-04-05 00:38:27 +01:00
Shaun Bennett
ff929a8515 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
 2016-04-05 00:57:28 +10:00
Shaun Bennett
fecd3c1eaa Final changes 2016-04-04 23:28:38 +10: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
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
Cheese
9969b7d783 support for resource packs for different MC versions 2016-04-02 11:39:40 +11: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
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
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
Thanos paravantis
51820faceb General bug fixes and minor changes. 2016-03-30 19:30:22 +03: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
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
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
AlexTheCoder
2530bc512e - Fixed some more buggies 2016-03-26 14:02:18 -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
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
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
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
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
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
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
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
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
Thanos paravantis
dd6d128b44 Rename files to match challenge name, change kit description, refactor color change challenge. 2016-03-18 18:36:32 +02: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
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
86c50cc3cd updates 2016-03-11 19:03:32 +00:00
git
557b0bf978 Fix Wither disguise 2016-03-11 01:55:49 +13: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
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
Thanos paravantis
4e6ba4ebd1 Challenge refactoring. 2016-03-06 16:45:25 +02:00
Thanos paravantis
c2d5699aa8 Challenge refactoring, bug fixes, add additional helper methods. 2016-03-06 00:59:13 +02: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
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
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
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
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
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
William Burns
dead7a0850 Use a different method for targeting blocks. 2016-02-25 16:09:00 +00:00
William Burns
a97409b64a Adjust max distance for targeting. 2016-02-25 15:04:19 +00:00
William Burns
7f6517a823 Ignore barrier blocks when drawing. 2016-02-25 14:23:16 +00:00
git
2a9d49ccd9 Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 2016-02-25 18:11:12 +13:00
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
Thanos paravantis
6a234aa50f Chicken attack and death handling progress. 2016-02-23 18:56:49 +02:00
Thanos paravantis
f1cb8378ac Test commit 2016-02-23 14:54:12 +02: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
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
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
Shaun Bennett
7714e4960c Use DBPool for everything 2016-02-19 00:17:38 -06:00
md_5
b58ea5b51a Provide option to load config from mineplex.yml, not per game folders. 2016-02-19 15:25:09 +11: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
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
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
AlexTheCoder
16c03ebb48 - Silly skeletons! Swimming is for players! 2016-02-15 21:54:18 -05: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
15ed2570e2 Valentines final changes, Change Gift Giver achievement 2016-02-15 20:43:46 -06:00
AlexTheCoder
f0d59755d2 - Update 2016-02-14 03:31:36 -05: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
Shaun Bennett
960a0cdabb Fix constructor error, add ValentinesGiftManager to Arcade 2016-02-12 05:06:13 -06:00
Shaun Bennett
d51e26a5a4 Valentines game adjustments 2016-02-12 01:34:29 -06: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
William Burns
b3045d38e7 Add colour selection for multiple block types. 2016-02-10 16:34:00 +00:00
Cheese
eebe25040e cleaned the particle effects a bit 2016-02-10 16:31:25 +11: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
Cheese
6800e4ef47 valentines final push 2016-02-09 20:43:24 +11:00
Virizion
51d152d484 Perfect build all fix 2016-02-07 19:05:53 -05: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
Cheese
2ab1b51401 bug fixes 2016-02-07 14:09:02 +11:00
Cheese
a35a9ea31f more valentines :) 2016-02-07 13:27:53 +11: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
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
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
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
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
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
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
Thanos paravantis
de1ee4f6cb Spectator and chicken attack changes. 2016-01-31 23:50:23 +02: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
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
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
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
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
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
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
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
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
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
b92ddc7575 Added proper ore pickup delay. 2016-01-28 22:39: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
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
teddy
eed55b48ac Descriptions changed 2016-01-28 09:55:48 +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
Virizion
40113f99d3 Borders for spec are fixed. 2016-01-26 17:14:21 -05: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
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
bc8f6e511c Center hologram 2016-01-25 03:44:22 -06: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
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
Sarah
00f01e09af adding entity spectating by right clicking and right clicking head in compass menu. 2016-01-24 20:00:05 +01: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
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
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
Thanos paravantis
44de231c7d Start implementing chicken attack on player death. 2016-01-21 21:35:14 +02: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
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
Teddy
573d0dd67d Stats added for all other games 2016-01-19 23:10:45 +00: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
2b6074a210 Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command' 2016-01-17 22:46:56 -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
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
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
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
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
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
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
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
Teddy
88c53bf464 Added default ChatStat for all games to prevent my server from dying when testing 2016-01-11 19:35:00 +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
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
Keir
5f362a878a Run some Redis functions async (as it sometimes blocks). 2016-01-09 22:21:15 +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
Sarah
0f587ba5d9 fixing "Kicked for flying again" again... 2016-01-09 12:07:57 +01: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
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
Thanos paravantis
e114b623bd Update water horror challenge to the latest version. Fix NPE on player quit. 2016-01-08 15:03:58 +02: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
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
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
19bb44cb9a Disable HolidayManager and HolidayGiftManager 2016-01-08 01:41:02 -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
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
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
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
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
Sarah
db2cddc443 Fixing Join/Quit messages 2016-01-05 19:10:40 +01: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
Thanos paravantis
3770211e66 Turf Wars: Include Teddy's border fix. 2016-01-04 22:58:11 +02: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
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
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
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
Thanos paravantis
edb6318f31 Add rotating chicken head when a player dies on a challenge. 2015-12-31 23:27:15 +02:00
Thanos paravantis
287f782b82 Spawn eggs with velocity when a player dies. 2015-12-31 20:15:47 +02: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
AlexTheCoder
a4853e667c - Gameplay edits and disabling broadcaster code 2015-12-30 03:23:21 -05: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
William Burns
f1c7424939 Fixing hotbar 2015-12-29 15:19:09 +00:00
Shaun Bennett
7ad12d0a6b Show Host Rank in private servers 2015-12-29 00:50:20 -06: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
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
Shaun Bennett
c680d91b56 Nerf TypeWars gems (again) 2015-12-25 03:12:04 -06: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
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
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
fooify
592fcbd282 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2015-12-22 10:55:11 -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
c63014b51f Type-Wars merge 2015-12-21 12:49:10 -05: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
Shaun Bennett
5469289d82 Wrong iterator! 2015-12-21 06:57:56 -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
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
f57304764c Added a hotbar layout editor 2015-12-18 15:16:00 +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
5f506e3810 Moved team generation. 2015-12-17 21:49:15 -05:00
William Burns
e7243d4b9c Re-add getArcadePlayer(Player player) 2015-12-17 22:19:45 +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
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
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
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
Thanos paravantis
81f03e4b68 Update anti-hack jump fix for Bouncing Block and Arrow Rampage. 2015-12-16 17:18:19 +02: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
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
b36bf37197 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:22:38 -05: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
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
92b82d786b Don't give Winter Holiday Chests to offline players 2015-12-15 13:34:47 -05:00
Sarah
40ae7743c6 reverting last "fix" 2015-12-15 14:20:21 +01: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
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
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
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
4afca01ad0 Treasures! 2015-12-14 02:49:51 -05:00
Virizion
93c13d138d Remove some debug stuff I forgot to remove. 2015-12-14 00:10:45 -05: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
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
Cheese
1073981778 Merge branch 'master' into update-xmaschaos 2015-12-14 15:30:15 +11:00
Cheese
c34ac3ec52 xmas 2015-12-14 15:21:43 +11: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