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

729 Commits

Author SHA1 Message Date
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
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
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
Cheese
c4e93180fa Merge branch 'master' into smash-champs-balance 2015-10-30 13:00:30 +11:00
libraryaddict
0486404c4b 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-10-28 14:38:34 +13:00
AlexTheCoder
08fd1b5790 - Fixed MPS Whitelist for usernames with non-lowercase characters 2015-10-24 20:49:09 -04:00
NewGarbo
1e4b3442fa Conflicts: 
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
 2015-10-24 20:45:39 +01:00
AlexTheCoder
f7dab72e8c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-10-23 03:23:35 -04:00
Shaun Bennett
e3e7dd4694 Titan rewards from mythical chests 2015-10-23 02:08:31 -04:00
libraryaddict
ddb8d592f8 Remove all is1_8 checks 2015-10-22 18:37:14 +13:00
AlexTheCoder
12319169a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java
 2015-10-18 00:54:18 -04:00
libraryaddict
14a524cf54 Stuff 2015-10-17 00:08:30 +13:00
libraryaddict
f71cb80bd0 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/minestrike/MineStrike.java
 2015-10-16 22:26:07 +13:00
Cheese
6cc33fd6c6 Merge branch 'thanos-bug-fixes' 2015-10-16 12:53:43 +11:00
libraryaddict
3dda9352e7 Progress 2015-10-16 13:32:23 +13:00
libraryaddict
4205dc6c25 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/halloween/Halloween.java
 2015-10-15 12:34:34 +13:00
Mysticate
a049d7666f Merge remote-tracking branch 'origin/master' into monster-maze 2015-10-13 22:14:19 -04:00
Shaun Bennett
88709f85b6 Merge with master 2015-10-13 18:13:01 -04:00
libraryaddict
58a86c5abb That's the easy stuff done.. 2015-10-13 19:49:15 +13:00
AlexTheCoder
f497eab633 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-10-12 17:54:11 -04:00
Cheese
2b9a66e7b2 more ssm update 2015-10-12 16:32:23 +11:00
Cheese
6a173073a4 added flag to projectiles 
work on cow kit
 2015-10-12 14:39:14 +11:00
Cheese
e180e0ae78 Merge branch 'Myst_HALLOWEEN' 2015-10-12 12:29:05 +11:00
Mysticate
dda65b4c77 Fixed tnt exploding lobbies 2015-10-11 19:56:36 -04:00
Mysticate
20dd9c683b Merge remote-tracking branch 'origin/master' into monster-maze 
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java

Changed the scoreboard a bit, added it to MPS.
 2015-10-11 10:52:45 -04:00
Cheese
cb9e8f8e0b pumpkin smasher achievement 2015-10-11 14:48:02 +11:00
Mysticate
435e74225a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-10 23:35:33 -04:00
Cheese
8b75664627 queued holiday transactions 2015-10-11 12:54:35 +11:00
Cheese
6860fa608a titan placeholder perks 
art
fixed pumpkin gem count
 2015-10-11 11:26:09 +11:00
Mysticate
5e7ddb968e Changes and bug fixes. 2015-10-10 15:54:18 -04:00
Cheese
da6b1316d3 removed pumpkins from MPS 2015-10-10 22:47:19 +11:00
Shaun Bennett
a242c6b592 Halloween Update finishes 2015-10-10 03:23:37 -04:00
Cheese
7bc3b4970b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
 2015-10-10 17:34:17 +11:00
Mysticate
7851cb451a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
 2015-10-09 22:34:05 -04:00
Shaun Bennett
aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Cheese
02c6eccfda Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
 2015-10-10 10:36:42 +11:00
Cheese
7dbd9da582 dragon sale Bar 2015-10-10 10:35:48 +11:00
Shaun Bennett
97ef4a4252 Pushing titan giveaway stuff for laptop 2015-10-09 18:23:47 -04:00
Cheese
c03c8163c5 fixed exploision stuff 2015-10-09 14:01:58 +11:00
Mysticate
598ea84e7a Fixed explosions and cleaned up. 2015-10-08 22:52:57 -04:00
Mysticate
1011c36c43 Fixed lobby being destroyed. 2015-10-08 22:41:45 -04:00
Mysticate
082b16fe0d Stuff and things to help make mounts be cool. 2015-10-08 22:28:07 -04:00
Cheese
3c437925f1 halloween prep 2015-10-08 12:36:00 +11:00
Mysticate
a0d0590777 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-10-06 21:04:49 -04:00
Thanos paravantis
c2518bc6c4 Some additional bug fixes were applied on the previous commit. 
Water damage by TNT on game lobbies is now patched.
 2015-10-04 16:32:34 +03:00
Mysticate
a7ab0cd723 ADDED MORE KITS I'M DONE HOORAY LOVE ME @CHISS 2015-10-02 22:43:29 -04:00
Ty Sayers
b4c9bfbb57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Hub/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
 2015-09-29 18:09:52 -04:00
AlexTheCoder
32a257fa55 Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts 2015-08-31 15:11:57 -04:00
AlexTheCoder
129464a845 Added CTF to MPS menus 2015-08-31 04:42:36 -04:00
Mysticate
becfbe1f13 Fixed possible game breaking bug :S 2015-08-30 20:09:47 -04:00
Mysticate
33d78a5efd Fixed eating spider eye. Yay! 2015-08-30 18:39:07 -04:00
AlexTheCoder
6fefcbd953 Kit Changes/Fixes: 
- Fixed Kit Mobs not opening guis in Champions games
- Fixed Abilities not working in CTF
- Added new event when a player attempts to choose a kit
- Cancelled changing kit while holding a flag
 2015-08-30 17:13:08 -04:00
Jonathan Williams
c98a85c2ba Added local storage of login time. 
Hooked in onlineTime bonus feature to real values.
 2015-08-28 22:09:42 -07:00
Mini-Chiss
829c1d2ae8 Merge branch 'Myst_EVO' 2015-08-28 21:30:10 -07:00
Mysticate
c40fecb03f Removed warning from private servers 2015-08-28 22:06:13 -06:00
Mini-Chiss
88ca205474 fixes 2015-08-28 20:31:29 -07:00
Mini-Chiss
8238a199d5 gem stuff 2015-08-28 20:06:39 -07:00
Mysticate
ebd3fbe6d5 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-28 20:19:27 -06:00
Mini-Chiss
abf1f23087 double gem 2015-08-28 19:16:49 -07:00
Mysticate
2d770a8dd1 More final tweaks. 2015-08-28 16:36:35 -06:00
Mysticate
513662e6e3 Fixed the block open flag. 2015-08-28 15:46:38 -06:00
Mysticate
f21ca35638 Final bug changes. 2015-08-28 15:44:41 -06:00
Jonathan Williams
e9b33668bc Added donorsOnline to MinecraftServer snapshot 
Refactored Rank class to use lowercase methods.
 2015-08-28 13:22:04 -07:00
Mysticate
7b42f2155d Tweaks. :D 2015-08-24 20:40:34 -04:00
Ty Sayers
a9f5197c64 Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Database/src/mineplex/database/Account.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
 2015-08-22 15:18:51 -04:00
Mini-Chiss
d6f17c609b carl 2015-08-12 08:58:46 +02:00
Mini-Chiss
7cda53cb28 carl spinner in arcade/ 
tutorial fixes
 2015-08-12 08:36:21 +02:00
Mini-Chiss
18843c2cc6 Merge branch 'Bonus' 2015-08-11 17:05:59 +02:00
Mini-Chiss
89dab7ec85 some little fixes 2015-08-11 16:33:32 +02:00
Mini-Chiss
cfcfbbed3b removed double gem 2015-08-11 13:34:32 +02:00
Mini-Chiss
b348c62a3f Merge branch 'EventGameUpdates' 2015-08-11 13:01:33 +02:00
Shaun Bennett
fe153bee11 Fix revert issues 2015-08-11 03:19:27 -05:00
Sarah
fef269b856 Fixing /e set. 2015-08-10 17:28:27 +02:00
Shaun Bennett
b8b19ed4a5 Merge remote-tracking branch 'remotes/origin/master' into Bonus 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-08-10 03:24:59 -05:00
Mini-Chiss
fdfc9ae99d longer games wont announce stay msgs 2015-08-09 18:17:29 +02:00
Sarah
ac5ff08fad Git fix 2015-08-09 17:23:38 +02:00
Sarah
0d70fb6b96 removing deop of Admins and adding OP condition to setHost. 2015-08-09 16:55:10 +02:00
Mini-Chiss
090c1f135d Merge branch 'SarahsAwesomeBugFixes' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
 2015-08-07 21:48:35 +02:00
Morten
608e8bf693 For Sarah <3 2015-08-07 05:40:16 +02:00
Shaun Bennett
be18dc1bf5 Add experience rewards to reward manager 2015-08-06 21:41:56 -05:00
Sarah
83da6b7a9a Improving the /disguise command even more. ;D 2015-08-05 13:32:05 +02:00
Mini-Chiss
5d7cc59909 fixed cases where negative stats were being uploaded 2015-08-05 08:56:52 +02:00
Sarah
e55557e1fd Improving the /disguise command. 2015-08-05 07:57:52 +02:00
Mini-Chiss
88fe5b3ec6 Merge branch 'MPS-Maps' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
 2015-08-04 17:37:32 +02:00
Mini-Chiss
1fd5c51f03 DINGO ATE MY BABY 2015-08-04 17:33:23 +02:00
William Burns
644d6c9914 Whitelist fixes. Implemented MapSource. 2015-08-04 11:21:58 +01:00
Mini-Chiss
40e2b6216e oops, was right before, reverting change. 2015-08-03 16:30:38 +02:00
Mini-Chiss
f350e4efe5 further fixed gem stuff! 2015-08-03 16:25:31 +02:00
Mini-Chiss
67fd0e2c1d fixed MPS awards formatting 2015-08-03 16:24:43 +02:00
Mini-Chiss
ab670a03fb fixed logic error that was displaying gems wrong 2015-08-03 16:23:50 +02:00
Mini-Chiss
e10d26dae1 reduced respawn time in OITQ 
removed respawn msg for short respawn times
 2015-08-03 16:18:59 +02:00
William Burns
0c5cc25634 Stuff 2015-08-03 12:48:17 +01:00
Mini-Chiss
bb2e15c4fd made it so games can set another game as its 'kit source' so games can share kit unlocks 2015-08-03 11:38:16 +02:00
Mini-Chiss
472409dc4b fixed broadcast formatting 2015-08-03 10:06:15 +02:00
Mini-Chiss
afc41c8831 converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity 2015-08-02 11:50:26 +02:00
Mini-Chiss
ae8d351145 Merge branch 'SSM2PlayerTeams' 2015-07-31 14:09:55 +02:00
Sarah
fba10e4cbd fixing the long term "Kit" bug ;D 2015-07-31 14:08:08 +02:00
Mini-Chiss
b2a567673c disabled sale msg 
added double gem weekend
 2015-07-31 09:53:52 +02:00
Mini-Chiss
be910cced9 gamemode color change 2015-07-29 17:00:36 +02:00
Mini-Chiss
1004203b34 fixed up some merge issues 2015-07-29 16:48:49 +02:00
Mini-Chiss
52844d7b80 Merge branch 'EventGameUpdates' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
 2015-07-29 16:41:35 +02:00
Mini-Chiss
ab2c865ab3 better colors 2015-07-29 15:48:12 +02:00
Mini-Chiss
51cef64554 improved text 2015-07-29 15:29:12 +02:00
William Burns
2b3fec754f Colour change cause colour! 2015-07-29 14:25:38 +01:00
William Burns
3bc66f16b6 Woo a push 2015-07-29 14:22:49 +01:00
Mini-Chiss
c9c3db70f3 Merge branch 'SSM2PlayerTeams' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-07-29 14:08:17 +02:00
Mini-Chiss
e0ab853e57 Merge branch 'MPS-Maps' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
	Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
 2015-07-29 13:03:05 +02:00
William Burns
8385c8a7c7 Whitelist fix 2015-07-27 22:18:41 +01:00
William Burns
76e5d3d562 Finish update 2015-07-27 18:18:37 +01:00
Mini-Chiss
1247f33b1e end game stats will display, even if no gems awarded. 2015-07-26 11:43:24 +02:00
William Burns
cf61b50d98 More changes. 2015-07-25 17:35:43 +01:00
William Burns
91d0a37d77 Animation change etc. 2015-07-25 12:48:39 +01:00
Mini-Chiss
9fa8c6ac45 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
 2015-07-25 10:48:06 +02:00
Jonathan Williams
d3fede790a Merge pull request #17 in MIN/mineplex from MinorTweaks to master 
* commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a':
  Fixed report link
  http://pastebin.com/BRhT7pZP
  Reverted things
  Reverted Trainee to Helper due to popular demand.
  LOTS of tweaks :D
  Cleaned up somethings (lib's request)
  I'm a dumbass
  Fixed a few achievements
  Changed mineplex.com/supporthub > mineplex.com/reports
 2015-07-25 03:37:28 -05:00
Mini-Chiss
59d14624c0 Merge branch 'Myst_LOBBERS' 2015-07-25 10:26:47 +02:00
William Burns
c1e5c2a9dc MPS changed requested by <insert meow here>. 2015-07-24 21:15:19 +01:00
William Burns
956d685549 Added MPS Game Voting. 2015-07-24 20:24:21 +01:00
William Burns
dcb6e0ec59 Added rejected games and whitelist to MPS. 2015-07-24 16:03:53 +01:00
Sarah
c3742ec794 Fixing the too long String bug. 2015-07-24 15:00:49 +02:00
Sarah
609199a6b8 Improving Team names in Team games. 2015-07-24 13:14:41 +02:00
William Burns
5deb699b02 Added rejected games and whitelist to MPS. 2015-07-23 18:24:41 +01:00
Mini-Chiss
71148ef387 gave twitch same perms as youtubers 2015-07-23 16:29:42 +02:00
Sarah
de1ed4ca59 Improving the Event System with ShinyRukii's requests. 2015-07-23 12:06:40 +02:00
Mysticate
e4ecc9e858 http://pastebin.com/BRhT7pZP 2015-07-22 23:31:07 -04:00
Mysticate
6addf00037 LOTS of tweaks :D 2015-07-20 14:27:10 -04:00
Mysticate
8b2b4c2826 Added to MPS 2015-07-19 15:51:34 -04:00
Cheese
6ed3f93df7 fixed some scoreboard stuff 2015-07-17 16:17:01 +10:00
Sarah
b7ad0035bc Implementing UHC team system to ssm, sg and skywars. 2015-07-17 07:06:49 +02:00
Sarah
02a71bff68 another git fix 2015-07-17 06:30:53 +02:00
Shaun Bennett
2b2e5e5c97 Spelling fixes + Observer mode 2015-07-16 15:51:21 -05:00
Sarah
3a2011ee6a Improving Map System: GameTypes can have more mapSources now. 2015-07-14 13:22:59 +02:00
Cheese
7d073fdc0d fixed skywars icon 
changed LOSSES to GAMESPLAYED for consistency
 2015-07-09 12:47:40 +10:00
Cheese
e36b0440a4 Merge branch 'bench' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
	Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
	Plugins/Mineplex.StaffServer/.classpath
 2015-07-08 13:55:01 +10:00
libraryaddict
bff3897fab Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered. 2015-07-07 12:30:20 +12:00
Cheese
de36e3d8e4 added WATER_DAMAGE support for maps 
modified some bridges code
 2015-07-01 00:18:06 +10:00
Cheese
e3d060376b disabled double gem 2015-06-30 13:10:08 +10:00
Cheese
4c164ce2a6 enabled double gems 2015-06-27 12:44:43 +10:00
Cheese
4183d6f21d some balance 2015-06-27 11:40:40 +10:00
Cheese
4e06a1aae3 fixed a few skywars bugs 
improved warning for bridges
 2015-06-27 11:24:01 +10:00
Shaun Bennett
7c698f65cf Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads 2015-06-26 02:31:35 -05:00
Jeremiah Bishop
0342a5ac61 Fixed Achievements 
Reordered Kits
Added new Kit
etc, etc, etc...
 2015-06-25 19:03:25 -04:00
Aaron Brock
8ea23f96fc Froze time using doDayNightCycle instead of setting the time on UpdateEvent. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:36:05 -04:00
Cheese
2c43dc76c9 DMT no longer effected by 3s chat delay 
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
 2015-06-20 11:12:24 +10:00
libraryaddict
b0c026e67c Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn 2015-06-16 14:01:52 +12:00
libraryaddict
8cf10afb1b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-06-06 18:31:08 +12:00
Cheese
f9b49caeed More gems for bridges/sg kills 
Changed Al'Jaha MS name to Bombers
Added Reporting functionality to Builders
Nerfed Iron Hook
Allowed longer AFk during games
 2015-06-05 12:21:20 +10:00
libraryaddict
bcdb851e21 Teleport: Don't disqualify staff if they are not alive 2015-06-02 18:48:45 +12:00
libraryaddict
ae41f232b0 GameType: Change to reflection for creating game instances 2015-05-30 10:23:46 +12:00
libraryaddict
21aa97b3b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-24 20:13:43 +12:00
libraryaddict
0d0d5eea64 Game: Change GameFlagManager to use Game.isInsideMap(), change isInsideMap to treat MaxX,Y,Z with a +1 2015-05-24 20:10:16 +12:00
Jonathan Williams
303cfd02fa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-17 23:12:27 -07:00
Jonathan Williams
f0c7f2fe76 Merge branch 'MSSQL_Conversion' 
Conflicts:
	Website/LOCWebsite.suo
 2015-05-17 23:11:50 -07:00
Shaun Bennett
1e9abaf002 [Arcade] Add more games to private servers 2015-05-15 23:38:43 -05:00
Shaun Bennett
6b7c52cb87 [Arcade] Add additional hub clock check 2015-05-14 15:17:45 -05:00
Mini-Chiss
e13e735246 UHC updates! 2015-05-12 14:46:21 -05:00
Mini-Chiss
643ed2c047 Fixed most enchants not working 
added commands to event
minor update to snowfight to make it more fun
 2015-05-11 19:55:26 -05:00
Mini-Chiss
123af16bd2 UHC map gen 2015-05-11 13:25:05 -05:00
Mini-Chiss
5ec60d234a UHC changes 2015-05-11 12:27:43 -05:00
Mini-Chiss
9b0736816b UHC changes 
abstracted out some common attribs
 2015-05-11 12:21:32 -05:00
Jonathan Williams
b1a46d0f0d Converted TaskManager 2015-05-11 01:21:27 -07:00
Mini-Chiss
b959bcaa90 fixed 1.8 req 2015-05-04 00:56:12 -05:00
Mini-Chiss
bd8bd2dfd6 Abstracted kicking non-1.8 players 
Abstracted resource pack msg
 2015-05-03 16:51:13 -05:00
Mini-Chiss
40d56c3500 Converted all code to updated UtilParticle methods 
/suicide
 2015-05-03 16:37:00 -05:00
Mini-Chiss
97a86fde90 builds! 2015-05-03 15:39:15 -05:00
Jonathan Williams
e800d74976 Disabled Double Gems. 2015-05-01 02:29:20 -05:00
Mini-Chiss
ed1c7e2336 Master Builders initial push (dont worry jon it doesnt effect anything for the update!) 2015-04-30 18:20:35 -05:00
libraryaddict
23ea7bbce4 Spectators: Set fire ticks to 0 on damage 2015-04-30 20:55:30 +12:00
Cheese
c79432c8b9 Fixed projectile hitboxes and specific values 2015-04-04 10:54:03 +11:00
Cheese
23df6daab0 Added Easter Morph 
Added Eggs Baskets in games
Added double gem for 1.8
 2015-04-03 20:31:23 +11:00
Cheese
d4e8c0c9a6 Added Respawn middle screen text 
Added Champs capture point mid screen text
Fixed hitbox mults for projectiles
Fixed inconsistent arrow damage
Lots of Champions balance
 2015-04-03 15:28:10 +11:00
Cheese
43c58bd31c removed april fools from arcade :( 2015-04-01 20:22:13 +11:00
Cheese
3355d2b457 disabled aprilfools cow for team games 2015-04-01 19:15:11 +11:00
Cheese
ed35d2a992 April Fools update 2015-04-01 16:56:13 +11:00
Jonathan Williams
f4061854cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-25 15:11:17 -07:00
Jonathan Williams
6472194d44 Optimized queries to retrieve and update player information by removing inner join calls on the account. 
Added account id retrieval on login.
Added account id caching in redis.
 2015-03-25 15:10:59 -07:00
Cheese
46dfb532fb Bridges scoreboard fix 
SG balance
DONT QUIT msg improvement
 2015-03-23 11:50:09 +11:00
libraryaddict
03bcb120fc Change border damage from Void to Border Damage 2015-03-20 17:35:27 +13:00
libraryaddict
1f0e204eb3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
 2015-03-18 00:04:41 +13:00
libraryaddict
f12d0bf9ef Allow disabling of game start sounds, and changing of the game PrepareTime. 2015-03-17 23:52:58 +13:00
Cheese
73c66fa93f Merge branch 'SpecRemoveCreative' 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
 2015-03-17 14:57:17 +11:00
Cheese
c941c383e7 fixed hosts not being able to use creative inventroy 2015-03-16 15:01:35 +11:00
Cheese
efa2b649bd updated eventserver not expiring 2015-03-16 14:19:43 +11:00
Cheese
a700b61613 added WE permissions to event servers. 2015-03-16 14:10:58 +11:00
Cheese
420c4e7229 More work on Event game 2015-03-16 13:39:33 +11:00
Cheese
3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11:00
Cheese
8e77d1fc21 more event server updates 2015-03-12 12:14:49 +11:00
Cheese
3a0e597276 more event server stuff 2015-03-09 22:15:24 +11:00
Cheese
e0ba667613 old chests drop a little more frequently 2015-03-07 11:53:18 +11:00
Cheese
0336df55aa Event update 2015-03-06 19:43:17 +11:00
Cheese
e62d9774a9 Initial Event Game push 2015-03-06 19:11:26 +11:00
Shaun Bennett
efce714375 DEVP-66 Refactor commonly used classes to Java conventions 
Refactoring + testing jira
 2015-02-26 00:07:07 -05:00
Shaun Bennett
cf7e2eed69 Merge with MPS Update 2015-02-24 21:11:16 -05:00
Shaun Bennett
857052992d Increase max player cap to 100 for SnrMod+/Youtube 2015-02-24 14:47:10 -05:00
Shaun Bennett
570374fbb4 Add Wither Assault and Wizards gametypes to legend+ private servers 2015-02-24 14:45:31 -05:00
Shaun Bennett
48dd5639d2 Kick banned players from games 2015-02-24 14:38:12 -05:00
CoderTim
0bf6866ad7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-23 20:56:34 -05:00
libraryaddict
fc5771b33c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-24 13:04:06 +13:00
libraryaddict
56e03221ad Improve party system 2015-02-24 13:03:51 +13:00