4414 Commits

Author	SHA1	Message	Date
LCastr0	fb63b3a1a4	Fixes for winroom command, and illuminated chest	2016-05-15 22:49:10 -03:00
xGamingDudex	a27a618b2f	Made debugging tools only available on test servers	2016-05-16 02:04:15 +02:00
xGamingDudex	ca556f7846	Fixed win room would not sort player properly for solo games	2016-05-15 23:29:58 +02:00
xGamingDudex	7073ba4e6a	Fixed gadgets in the win room	2016-05-15 23:29:24 +02:00
xGamingDudex	1e6dda2d7d	Cleaned up some win effect backend code & fixed kits working in winroom	2016-05-15 23:28:12 +02:00
xGamingDudex	14f7e64a77	Fixed Animator and removed duplicate test call in Game.java	2016-05-15 21:05:37 +02:00
xXVevzZXx	44e52f4b5b	Add javadoc to added files	2016-05-15 10:24:29 +02:00
phobia	a67fec95fc	Remove ultra tag	2016-05-15 03:21:58 -05:00
xXVevzZXx	a1a6abc1ca	Add champions gladiators and fix tiny winners typo	2016-05-15 10:13:06 +02:00
xXVevzZXx	63c44afa10	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants	2016-05-13 22:05:27 +02:00
xXVevzZXx	df5c628c35	add new gamemodes Tiny Winners, Random Kit SSM, UHC SW, UHC SG and improve OP SG, OP SW, OP Bridges, Dukes of decoration, OP Gladiators, Faster than Light, Bunny Hopper and Countdown	2016-05-13 20:23:04 +02:00
xGamingDudex	0544e86cb1	Started fixing the stat tracking for MS knife	2016-05-13 02:39:43 +02:00
xGamingDudex	3bb3821fa9	WinEffect gadget disable and MineStrike name and data update	2016-05-13 01:04:35 +02:00
xGamingDudex	4958ab8149	Bug Fixes ... * Fixed Menu page adding glow to win effects if game modifiers were active * MineStrike skins were not properly applying material and data * Skinned knife was not dealing damage	2016-05-13 00:38:56 +02:00
xGamingDudex	2db98613ab	Cosmetic Update ... * Redid the Reward manager Added new rewards to the chest and changed some values * Fixed some MineStrike skin bugs * Removed particles/death effects from Minestrike * Removed old test minestrike skins * Moved minestrike skins to correct package * Changed the illuminated chest animation a bit * Fixed other minor bugs	2016-05-12 23:42:37 +02:00
AlexTheCoder	fab24e2139	Allow admins to be opped on testing servers	2016-05-12 17:24:37 -04:00
xGamingDudex	1b0b9a894b	Tweaked some cosmetics ... * Changed Party Death to firework icon * Removed idle spark from Emerald Trail * Changed wing style to pixie from angle on infernal wings * Added black dots to YinYang Started some work on the RewardManager	2016-05-10 20:20:44 +02:00
AlexTheCoder	de1fabf53d	Disable report system as it is not ready to go live	2016-05-09 02:10:51 -04:00
xGamingDudex	e04a897488	Added some pre-animation to chicken win effect. Removed some comments.	2016-05-06 21:58:31 +02:00
Shaun Bennett	93c2886601	Add boosters to inventory menu	2016-05-06 13:31:59 +10:00
xXVevzZXx	9f2189d173	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java	2016-05-06 03:40:00 +02:00
xGamingDudex	17a4517e71	Merge remote-tracking branch 'origin/develop' into project-cosmetics ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java	2016-05-05 21:03:15 +02:00
xGamingDudex	1a96ea3c18	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-05-05 20:29:28 +02:00
xGamingDudex	db21c7dd22	EGit FTW! ... Git, you are the greates, randomly deciding not to include everything when I spesify you to do so.... This should have been part of prev commit.	2016-05-05 20:26:00 +02:00
Keir Nellyer	a663cb3e01	Revert "Revert "Report system (version 1)"" ... This reverts commit d0d2de1e21. # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-05-04 15:24:29 +01:00
Thanos Paravantis	e7f97fa5b8	Move life related methods to challenge class	2016-05-04 16:21:14 +03:00
Thanos Paravantis	9d53eddabd	Fix lives amount display and remove disguises	2016-05-04 15:40:43 +03:00
Thanos Paravantis	703e957156	Fix volley pig health and knockback message	2016-05-04 15:38:18 +03:00
Thanos Paravantis	2b362ee4f1	Fix egg smash eggs sometimes stay on the map	2016-05-04 15:37:16 +03:00
AlexTheCoder	0e509898ec	Add a method for simply checking if a player has been participating in the current game, and implement it in the ranked bans system	2016-05-03 21:07:50 -04:00
LCastr0	cfc6f3703d	Merge pull request #50 from Mineplex-LLC/develop ... Merge from develop	2016-05-03 13:24:32 -03:00
xXVevzZXx	838cc2ce31	fix enchantments and increase arrow amount in gladiators	2016-05-02 23:01:59 +02:00
xXVevzZXx	8dd89d9dea	fix minor bugs and improve minor things in bridges, sg, uhc, quiver, runner and skywars	2016-05-02 20:27:43 +02:00
LCastr0	055b8684c2	- Added action bar message when booster is ready (Wind Up Suit) ... - Moved each suit to an individual package, to make it easier to work with - Removed some unused imports - Added util to get entity egg data - Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges) - Added specific kit pages to game modifier menu	2016-05-02 00:13:06 -03:00
xXVevzZXx	71f8640189	implement Dukes of decoration, OP Gladiators, Countdown, Heroes of the ewe, OP Skywars, Ultra spleef, Assassins and Blood diamonds	2016-05-02 01:06:00 +02:00
xXVevzZXx	6c2caac800	fix some format issues and implement God battles	2016-05-01 19:43:42 +02:00
xXVevzZXx	7bd6cdb93c	Implement Lists and Maps into the variable system and finish more gamemodes	2016-05-01 18:48:07 +02:00
AlexTheCoder	070326e72d	Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding	2016-04-30 19:26:16 -04:00
Conrad	d0d2de1e21	Revert "Report system (version 1)"	2016-04-30 14:53:59 -04:00
Conrad	e0e30a8b7f	Merge pull request #43 from Mineplex-LLC/alex-mcl ... Fix Async Elo Ranked Bans	2016-04-30 14:46:49 -04:00
AlexTheCoder	41e26f283c	Fix all async elo ranked ban methods and switch to callback system for API hooks	2016-04-30 14:10:09 -04:00
Keir Nellyer	6a00f26d5f	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-04-29 23:42:27 +01:00
Keir Nellyer	81cebc4ce7	Swap static helpers for a much better solution ... This allows for easier refactoring in the future when we move away from retrieving the CoreClientManager from a static instance. Mineplex coding standards are also against the use of static helpers in scenarios such as this, therefore this commit brings this branch to be in-line with the coding standards.	2016-04-29 23:37:40 +01:00
Thanos Paravantis	89bd325c81	Fix continuous milking sound on milk a cow	2016-04-29 14:35:48 +03:00
Thanos Paravantis	aff5396384	Prevent death effect armor stand modification	2016-04-29 13:41:16 +03:00
Shaun Bennett	184d247fc9	Start adding BoosterPage. Move Boosters to core to support UI's	2016-04-29 17:37:34 +10:00
AlexTheCoder	2887630cf8	- Added javadoc headers	2016-04-28 21:11:38 -04:00
TadahTech	680e579223	Merge Alex's branch into mine. ... Convert to Java 8 Remove unneeded comments.	2016-04-28 19:39:24 -05:00
AlexTheCoder	156982460f	- Fixed water permanently [MCL] ... - Fixed team balancing [MCL] - Fixed overjoining [MCL] - Changed bans for quitting ranked matches [MCL]	2016-04-28 20:03:09 -04:00
AlexTheCoder	b105ccb5f1	- Change event priority	2016-04-28 17:48:16 -04:00
AlexTheCoder	b13528ed66	- Further blockage of creating source blocks [MCL]	2016-04-28 17:46:57 -04:00
AlexTheCoder	3f9ef24235	- Removed debug message	2016-04-28 17:44:37 -04:00
Thanos Paravantis	8874b52b39	Merge branch 'develop' into thanos-mineware	2016-04-28 19:27:56 +03:00
Thanos Paravantis	6084d04a0f	Commit before pulling from develop	2016-04-28 19:23:21 +03:00
Thanos Paravantis	992e150608	Refactor and comment classes ... New javadoc comments have been added to describe class functionality and variable usage on specific places.	2016-04-28 16:54:46 +03:00
Thanos Paravantis	3a5ec7dc5d	Continue refactoring and comment main class	2016-04-28 13:11:27 +03:00
Thanos Paravantis	6cc8f854c4	Refactor main game class	2016-04-28 13:02:44 +03:00
Thanos Paravantis	3161cd53e9	Apply new format on floating holograms	2016-04-28 12:31:09 +03:00
AlexTheCoder	189296a586	- Fixed using water in restricted zones in MCL ... - Implemented Elo in /stats menu	2016-04-28 00:53:04 -04:00
AlexTheCoder	46f873634e	- Decrease time till Overtime in MCL ... - Block ability to flood in MCL	2016-04-28 00:33:36 -04:00
AlexTheCoder	b4c5be81f3	- Fixed random weather in MCL ... - Added Elo Division display to /stats for applicable games - Made fishing rods kept on death in MCL	2016-04-27 23:12:38 -04:00
William Burns	d90e9e7dff	Add a system for allowing all players to use game commands when in the correct mode.	2016-04-27 20:54:52 +01:00
Thanos Paravantis	aff4b6b270	Fix minecart dance double life loss	2016-04-27 22:09:06 +03:00
xXVevzZXx	1b5b18c9b2	Prevent exception while adding variables to gamemodes	2016-04-27 17:50:01 +02:00
xXVevzZXx	aa219ec3e5	Implement gamemode feature with modifiable variables and working on first moded games	2016-04-27 17:42:50 +02:00
Thanos Paravantis	ddad17855f	Improve chicken spawning on chicken shooting	2016-04-27 18:37:42 +03:00
Thanos Paravantis	f8ff99fc58	Increase hologram height gain and expire time	2016-04-27 18:37:09 +03:00
Thanos Paravantis	e3a6a0a50a	Fix spawns and map generation on smash off	2016-04-27 18:36:16 +03:00
Thanos Paravantis	c6b1065c4e	Fix scoreboard player team after death	2016-04-27 18:35:39 +03:00
Thanos Paravantis	9407265c73	Display predefined items on diamond hunt	2016-04-27 14:02:43 +03:00
Thanos Paravantis	ba5d06db88	Fix tag master and achievement progress	2016-04-27 13:14:20 +03:00
AlexTheCoder	a16145479e	- Disabled picking up lava ... - Leaving ranked matches temp bans players from rejoining them	2016-04-27 03:18:44 -04:00
Thanos Paravantis	ccebeb75f1	Implement challenge team spawning ... Team based challenges are now handled differently from the normal ones. When the game or challenge starts, instead of spawning all players with the default team spawn method, they are teleported according to their team. For example, if a player is on the blue team, he will be teleported on the blue side of the map. Moreover, teams are now generated properly, by diving the total number of players by two. One drawback, that will be fixed in a next commit, is that team challenges require an even amount of players.	2016-04-27 09:41:02 +03:00
xGamingDudex	38d03b8468	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-04-27 00:03:29 +02:00
xGamingDudex	79f210e242	Schematic and WinEffect update ... +Added better schematic support +Fixed schematics not sending block updates to nearby players +Added win room schematics *Tweaked some of the win rooms +Added sounds to the Lava Trap win effect.	2016-04-27 00:01:30 +02:00
Thanos Paravantis	38769d9616	Add missing tracker classes	2016-04-25 23:01:41 +03:00
Thanos Paravantis	d945bfa17a	Fix array out of bounds on veteran tracker	2016-04-25 23:01:17 +03:00
Thanos Paravantis	d0336be7b7	Add new achievements and modify current ones	2016-04-25 22:59:24 +03:00
Thanos Paravantis	41ef1a757c	Prevent null winner on veteran tracker	2016-04-25 18:03:25 +03:00
Thanos Paravantis	7c92971346	Remove new thread and use bukkit runnable only ... Previously, a new thread was created to display the description of a challenge. Instead of creating a new one, only a single bukkit runnable is now created. With that change, when the challenge is skipped, the correct description will show up instantaneously.	2016-04-25 18:00:37 +03:00
Thanos paravantis	a6bf059e6c	Modify challenge names and challenge intro titles	2016-04-25 12:47:55 +03:00
LCastr0	f0cfac8e73	Merge pull request #31 from Mineplex-LLC/develop ... Merge from develop	2016-04-24 23:15:36 -03:00
Thanos paravantis	c214431cbf	Move and rename stat trackers	2016-04-24 22:44:42 +03:00
Thanos paravantis	856eb6059b	Update statistics and implement data tracker	2016-04-24 22:39:56 +03:00
Keir Nellyer	96aa5d1c4b	Removed duplicate code ... Somehow this got duplicated and so therefore was causing compile time errors, might have been something to do with my git merge.	2016-04-24 17:22:21 +01:00
Thanos paravantis	e2a6500bce	Update game achievements	2016-04-24 13:37:39 +03:00
Shaun Bennett	a0fd852537	Move field to top of class in Game	2016-04-24 13:38:58 +10:00
Shaun Bennett	b21dfad12e	Merge remote-tracking branch 'remotes/origin/develop' into feature/gems ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java	2016-04-24 13:37:45 +10:00
Thanos paravantis	bfabfab2d1	Fix circle spawn locations	2016-04-24 00:27:39 +03:00
cnr	c7970d1bd0	Prevent super paintball spectators from reviving teammates. Fixes PC-103	2016-04-22 19:48:03 -05:00
xGamingDudex	b7099088a9	Merge remote-tracking branch 'origin/develop' into project-cosmetics ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java	2016-04-23 00:55:48 +02:00
Thanos paravantis	c526c86813	Add notes to fix recent bugs	2016-04-22 23:26:53 +03:00
Thanos paravantis	fa75bc15ad	Merge branch 'develop' into thanos-mineware ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java	2016-04-22 22:03:15 +03:00
AlexTheCoder	2a4c3209b4	- Enable ELO	2016-04-22 05:44:56 -04:00
AlexTheCoder	70541fd6f2	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-22 05:41:24 -04:00
Jonathan Williams	d73b720323	Merge branch 'features/elo' into develop	2016-04-22 04:34:35 -05:00
Jonathan Williams	477acf044e	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop	2016-04-22 04:34:21 -05:00
Jonathan Williams	7b18efa7b0	Prevent farming elo up with multiple games by dc and joining new game.	2016-04-22 04:05:07 -05:00
Jonathan Williams	ddd1c5af9b	Removed EloSettings and fixed scoreboard.	2016-04-22 03:10:09 -05:00
Jonathan Williams	34f94c0381	Reverted scoreboard because of MC maxlines turd nugget.	2016-04-22 02:55:27 -05:00
Jonathan Williams	4577cf0398	Fixed scoreboard :D	2016-04-22 02:47:48 -05:00
Jonathan Williams	7cc4811ede	Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into features/elo	2016-04-22 02:39:35 -05:00
Jonathan Williams	f922be51fe	Scoreboard tweak.	2016-04-22 02:39:08 -05:00
AlexTheCoder	04fe30df43	- Fix sb	2016-04-22 03:38:20 -04:00
AlexTheCoder	03bdc8d2db	Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix	2016-04-22 03:17:54 -04:00
Jonathan Williams	b69a75355c	Fixed scoreboard alignment.	2016-04-22 02:17:40 -05:00
AlexTheCoder	1d3ad3c5fd	- Enabled ELO for testing	2016-04-22 02:06:37 -04:00
Jonathan Williams	44d4255628	Added endElo in the appropriate spots.	2016-04-22 00:58:07 -05:00
Jonathan Williams	6d00e8b41f	Refactored Elo to work correctly.	2016-04-22 00:21:11 -05:00
AlexTheCoder	d0e3b094c1	- cleaned up and prepped for live update	2016-04-21 20:57:35 -04:00
AlexTheCoder	e55bec505b	- Fix players ending up teleported back to arena due to broken respawn engine	2016-04-21 20:13:39 -04:00
AlexTheCoder	df55d48ab8	- Looks better	2016-04-21 01:03:14 -04:00
AlexTheCoder	d57cc48f0f	- Added new features!	2016-04-20 22:31:54 -04:00
Joseph Prezioso Jr.	f86b18b603	Elo Works Now ... Ready to move on to MCL implementation	2016-04-20 22:09:18 -04:00
cnr	2d02d79cec	Fix survival games' Beastmaster wolf spawning ... Beastmaster wolf spawning suffered from the same issue as the Wizards "Summon Wolves" spell: spigot has an issue when setting an owner to a wolf or ocelot without a previous owner. See SpigotUtil for details.	2016-04-20 18:45:54 -05:00
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
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	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
William Burns	d91e4ab4f7	Another door bug, and a title fix.	2015-12-13 20:27:37 +00: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	ec86cad7ee	Changed descriptions.	2015-12-13 01:38:38 -05: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	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	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
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
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	3f4980a90f	Merge branch 'master' into thanos-mineware	2015-12-11 13:32:24 +02:00
Shaun Bennett	ac6d3c2c8f	merge with master	2015-12-11 06:27:23 -05:00
Cheese	d7f39bdfd8	costume sets	2015-12-11 20:59:55 +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
Jonathan Williams	222173ab17	Improved and implemented GameProfile caching.	2015-12-11 01:24:59 -05:00
AlexTheCoder	42065fc5dc	- Fixed duplicate code	2015-12-10 23:22:08 -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
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
William Burns	563a0f0ec7	remove tutorial and no flicker	2015-12-11 02:30:44 +00:00
Shaun Bennett	2694787590	Reverting	2015-12-10 20:59:57 -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	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	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	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
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	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
Sarah	a5c46545df	fixing timer being shown.	2015-12-09 14:44:22 +01: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
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
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
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
William Burns	f8f95c64e5	Fixing arena moving	2015-12-08 15:10:29 +00: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	e6d995008e	Arenas	2015-12-08 10:44:24 +00:00
Virizion	d22a905206	Lot more stuff! :D	2015-12-07 23:29:33 -05: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	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	7984c0ac31	Add !	2015-12-07 06:12:49 -05:00
Cheese	a39b11ce67	slowed meteors	2015-12-07 21:56:00 +11:00
Cheese	d318a5cf87	interacto!	2015-12-07 21:53:34 +11:00
Cheese	e1efcabfbf	chat sale msgs	2015-12-07 20:39:31 +11: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	1ada06af91	rewrote lots!	2015-12-07 17:36:45 +11: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	54ec0e39bb	more polisshhhh on snowfight ... enabled xmas chests	2015-12-07 13:25:32 +11: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
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
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	35c362b8bf	small youtuber perms	2015-12-06 18:08:36 +11: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	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
Virizion	9144ab7b3f	Fixed some demolition stuff.	2015-12-05 20:30:21 -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
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	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	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
Cheese	4a53667539	gadget restructure ... converted frost lord and titan particles into 4 subcategories.	2015-12-05 10:22:00 +11: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
Virizion	efbabb1519	Players now look at the middle of the middle block instead of the corner.	2015-12-03 21:27:10 -05: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
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	91aaf5f2fb	world's smallest bugfix - admin->co-host	2015-12-03 16:45:30 -08:00
fooify	348f2d8e4c	Merge remote-tracking branch 'origin/master' into foo	2015-12-03 16:31:16 -08:00
Sarah	19254fc4a0	Prepare Timer flag.	2015-12-03 18:06:27 +01: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
Sarah	27f335779a	adding tutorial sounds and flag for it.	2015-12-02 19:39:44 +01:00
Keir	9508556d57	Refactor.	2015-12-01 22:47:51 +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
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
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
Cheese	7217cd0f33	remove conditions upon death	2015-12-01 10:44:13 +11:00
Sarah	e2cfcef55b	RunTasksSync Flag.	2015-11-30 16:58:41 +01:00
Sarah	dc68375ec8	TimeBetweenPhase Flag.	2015-11-29 21:48:39 +01: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
Virizion	e09e5851a6	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-29 01:17:17 -05: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
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
Thanos paravantis	eb820b4650	Change alive check with isDone() method. Make explosions on fishing day more realistic.	2015-11-28 17:03:10 +02:00
libraryaddict	28947643e0	More updates for dual version	2015-11-29 02:54:16 +13:00
libraryaddict	d4ab57e4e7	Update for 1.9 dual version	2015-11-28 19:38:58 +13:00
Cheese	963caae719	Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'	2015-11-28 16:00:28 +11:00
Sarah	ad54d28b0d	fixing teleportation issues.	2015-11-27 22:29:29 +01: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
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
Shaun Bennett	a5ebf9b059	Fixes for release	2015-11-27 05:53:57 -05: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
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
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
Virizion	de82806fc0	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-25 22:53:06 -05: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
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
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
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	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	ff5d828dd7	Merge with master, lots of clans fixes/work	2015-11-25 14:50:49 -05: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
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
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	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	f300fd2c98	Merge remote-tracking branch 'origin/master' into foo	2015-11-23 15:34:27 -08:00
Sarah	66598ce97e	adding teleport flag.	2015-11-23 16:16:33 +01: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
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
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
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
Cheese	e0885feea6	Merge branch 'master' into alex-ctf	2015-11-21 09:40:07 +11:00
Sarah	97471b0d9c	Finalizing Game Tutorials.	2015-11-20 23:38:02 +01:00
Cheese	0bc64fec16	Proxy limit fixes	2015-11-21 09:28:15 +11: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
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
Cheese	3067d9f281	final push for the day	2015-11-20 15:22:43 +11: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
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
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
Sarah	ad280c96c9	adding interactive Chat elements.	2015-11-19 20:45:40 +01: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
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
Sarah	f2830e653e	Making last changes to the tutorial	2015-11-18 19:25:12 +01: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
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	e16ee9036a	Added the ability to give out game loot.	2015-11-18 14:35:40 +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
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
William Burns	0f7c52391f	Global Packet work. Added giveitem sub-command.	2015-11-17 08:19:36 +00: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
libraryaddict	208d90c4bc	Fixed getTargetBlock being 0 when its infinite	2015-11-17 10:18:42 +13:00
Virizion	2e9ac8df4d	First commit.	2015-11-15 22:06:11 -05:00
Mysticate	399edbab29	Sniper work	2015-11-15 12:47:45 -05:00
fooify	5767d4e2db	SSM bug fix: magma cube flame dash doesn't make player invisible	2015-11-14 16:08:14 -08: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
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
Thanos paravantis	f242919759	Update Treasure Digger (previously Evolution of Combat).	2015-11-13 23:54:17 +02:00
AlexTheCoder	016e54977d	- Finish game [FINALLY]	2015-11-12 21:16:58 -05: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	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
Shaun Bennett	6c17b2926c	Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta" ... This reverts commit ce1c09b88f, reversing changes made to 1aef7fe0b9.	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
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
Morten	e28878eec2	Quick update	2015-11-11 20:23:34 +01: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
Cheese	3ed680e1c2	ms update	2015-11-11 15:55:48 +11:00
Cheese	d971e3c8a3	ms update	2015-11-11 12:46:58 +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
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
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
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
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	c6ff845efa	arcade weird thingy	2015-11-09 20:28:41 +00:00
Sarah	18ab3d0f5b	Mob shrinking and some Word fixes.	2015-11-09 15:40:49 +01:00
Jonathan Williams	ba7d5bbcdc	Fixed Arcade!	2015-11-09 03:24:20 -06: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
Morten	1958fa9f5e	quick save	2015-11-08 14:31:56 +01:00
AlexTheCoder	9e24a5005f	- Completed CTF	2015-11-08 03:04:17 -05:00
AlexTheCoder	211298327f	- Fixed banners, begun work on patterns	2015-11-08 02:42:31 -05:00
AlexTheCoder	dfbf19c66a	Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-08 01:02:06 -05:00
AlexTheCoder	fb7fcccf24	- Reverting back to banners	2015-11-08 01:01:18 -05:00
Cheese	cc2e5bc6e4	minestrike update!	2015-11-08 11:30:19 +11:00
Morten	a905726544	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-11-07 16:44:00 +01:00
Morten	d4bd1d7f93	Added Chiss' suggestions and fixed up pretty much everything ... This is a stable version, I just need Thanos to send me his final changes on his games	2015-11-07 16:36:22 +01:00
libraryaddict	79d0466355	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2015-11-07 21:36:36 +13:00
Cheese	f4bf685e96	removed halloween hub ... removed titan giveaway and pumpkins	2015-11-07 13:20:29 +11:00
Shaun Bennett	4add7449eb	Merge remote-tracking branch 'origin/master'	2015-11-06 21:15:45 -05:00
Shaun Bennett	3893617d58	Logitech Giveaway (still needs testing)	2015-11-06 21:15:37 -05:00
AlexTheCoder	fafc92606c	Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java	2015-11-06 18:43:11 -05:00
Thanos paravantis	7009e46693	Several updates and bug fixes. Evolution of Combat rework (See ChallengeNewEvolutionOfCombat).	2015-11-06 20:25:38 +02:00
libraryaddict	d3d448ccfe	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-11-07 04:47:37 +13:00
libraryaddict	cc0f12f6c8	Fix player interactions packets not working properly on armorstand and when clicking block behind entity	2015-11-07 04:45:02 +13:00
Sarah	56966d690f	Fixing random Creepers, adding giant is under Attack message, adding start message, small fixes	2015-11-05 22:56:07 +01:00
AlexTheCoder	61653347c7	- Fixed proximity weapons not being able to detonate	2015-11-05 02:11:20 -05:00
AlexTheCoder	9c49ab0408	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-05 01:23:40 -05:00
libraryaddict	77125b3a24	Don't re-set scoreboard lines	2015-11-05 01:10:08 +13:00
libraryaddict	31b4fbec15	Fix a null	2015-11-05 00:49:26 +13:00
libraryaddict	0352e52a68	Tentative beginnings of wider scoreboards	2015-11-05 00:42:45 +13:00
libraryaddict	a0676b7bcf	Fix tnt in SG being usable during DM invul	2015-11-04 21:44:10 +13:00
Sarah	ee7006a3de	Giant makes Sounds, lifted up Giant, randomize Minions by time played, changing spawn Items.	2015-11-04 07:17:15 +01:00
libraryaddict	21d10e4bec	Fix typo	2015-11-04 19:15:06 +13:00
libraryaddict	b3f86ba638	Fixing bugs	2015-11-04 18:34:22 +13:00
NewGarbo	7f03ca0936	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta ... Conflicts: Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java	2015-11-03 21:19:17 +00:00
libraryaddict	c25b1969de	More progress	2015-11-04 04:00:53 +13:00
AlexTheCoder	c41d01e213	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-bugfixes ... Conflicts: Plugins/Mineplex.StaffServer/.classpath	2015-11-02 22:09:18 -05:00
AlexTheCoder	89c9f19c69	- Fixed MPS Whitelist	2015-11-02 22:08:02 -05:00
libraryaddict	975ad9e6ea	Update to master	2015-11-03 15:05:56 +13:00
libraryaddict	3de906ab19	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 ... Conflicts: Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java	2015-11-03 14:57:25 +13:00
libraryaddict	7496ed763a	Fix wither and dead bodies bug	2015-11-03 14:41:34 +13:00
Jonathan Williams	18bdcbec62	Fixed some NPEs with TrickDialogue ... Added debug messages for Tricks. Cleanup of monster targets in HubManager.	2015-11-01 22:09:36 -06:00
Sarah	ebf5ad4a4e	adding boss Mobs and changing win mechanic.	2015-11-01 22:32:25 +01:00
Sarah	7c42dc3483	fixinf random Freaks.	2015-11-01 18:33:19 +01:00
Sarah	71bb03420b	Adding sounds to spells, removing kits, notifications to Titles, Mob sizes/standardization, nuke -> Zombie Smash, 10 secs delay to Zombie Smash, Firebomb improvements and Freaks.	2015-10-31 18:37:19 +01:00
Cheese	92a2c2ebaa	fixed npe in kit npc creation	2015-10-31 19:55:58 +11:00
Cheese	5d58c56c27	fixed kit bug	2015-10-31 18:31:13 +11:00
Cheese	225f067ab3	fixed some projectile stuff	2015-10-31 18:22:53 +11:00
Cheese	b9d7c80f80	cow kit	2015-10-31 13:25:57 +11:00
Thanos paravantis	5c2c5ab280	Fast Food: Core functionality, workspace update.	2015-10-30 20:56:04 +02:00
Thanos paravantis	3ae333a15e	Setting up Fast Food Challenge.	2015-10-30 17:43:43 +02:00
Thanos paravantis	dca5e06eb9	Merge branch 'master' into thanos-mineware	2015-10-30 17:14:03 +02:00
libraryaddict	ea1e4b79f7	Changes from SnD branch	2015-10-30 19:25:02 +13:00
libraryaddict	ed18588a6a	Fix missing code and stuff	2015-10-30 19:12:04 +13:00
libraryaddict	da0a99d662	Spawn facing fixes	2015-10-30 16:06:47 +13:00
libraryaddict	50edf557ab	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-10-30 15:57:36 +13:00
libraryaddict	388aa1611c	Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate	2015-10-30 15:44:37 +13:00
Cheese	c4e93180fa	Merge branch 'master' into smash-champs-balance	2015-10-30 13:00:30 +11:00
AlexTheCoder	0be51d5629	- Even more bugfixes	2015-10-29 16:48:51 -04:00
libraryaddict	7fca42b0e0	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java	2015-10-29 21:41:59 +13:00
libraryaddict	14df456b3d	Progres	2015-10-29 21:39:38 +13:00
Aaron Brock	acc915c34e	Re-added my TurfForts patch, as well as fixed the "Game Changes to build time while spectating so you don't get your blocks" glitch.	2015-10-29 01:12:12 -04:00
Aaron Brock	8dd80094b4	Fixed a little boolean derp that stopped people from breaking blocks. ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com> (cherry picked from commit 1f0accd)	2015-10-28 23:26:18 -04:00
Aaron Brock	9df297fc11	Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist. ... Signed-off-by: Aaron Brock <TheMineBench@gmail.com> (cherry picked from commit 76e4dc6)	2015-10-28 23:25:56 -04:00
Mysticate	a707006558	Work. Deemed unsuitable due to an issue with the paintballs flying wide.	2015-10-28 21:42:41 -04:00