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

2980 Commits

Author SHA1 Message Date
Mysticate
ef62fb5adf Made it so that when played on an MPS, HH won't give items. Yay! 2015-10-07 22:57:30 -04:00
Mysticate
8a8591ae7f Merge branch 'master' of 
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
Myst_HALLOWEEN

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java
 2015-10-07 22:19:10 -04:00
Mysticate
e864e0867a Adds mount spider and fixes a BH bug. 2015-10-07 21:47:10 -04:00
Cheese
3c437925f1 halloween prep 2015-10-08 12:36:00 +11:00
Cheese
191392825f Merge branch 'Myst_EVO' 2015-10-08 12:07:21 +11:00
Cheese
c94184c5ae reduced number of falling blocks in skywars by 80% 
added halloween horror mount
 2015-10-08 12:04:28 +11:00
Mysticate
5378ece214 Fixed chicken being able to fly.. 2015-10-06 21:09:53 -04:00
Mysticate
a0d0590777 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-10-06 21:04:49 -04:00
fooify
a177b0cd43 Merge remote-tracking branch 'origin/master' into foo 2015-10-06 16:45:01 -07:00
Sarah
34a554584c Making mob spawn rate dynamical, removing kill message, lowering kill animation, editing Scoreboard and changing Nuke animation. 2015-10-06 17:45:38 +02:00
Sarah
6e0e618e03 Finishing Achievements. 2015-10-06 03:20:25 +02:00
Mysticate
643f47763e Improved consistency with the F5 message 2015-10-04 20:28:21 -04:00
Sarah
e5b69a85c2 Changing back from 2 disguises to one. 2015-10-05 02:27:37 +02:00
Mysticate
0de34c15ab NO more endercrystal go boom boom yay 2015-10-04 20:23:41 -04:00
Thanos paravantis
9c1ba5f3d1 Changes on bomb error messages after QA recommendations. 2015-10-04 21:23:50 +03: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
Thanos paravantis
026c596de2 Minestrike bug fixes and minor changes 
- Added a right-click message tip when the player with a bomb tries to place by left clicking.
- Changes in one of the tip messages while in game lobby.
- Moltovs and Incendiaries were not triggered once thrown to the ground.
- Players were able to extinguish grenade fire with a knife.
- The bomb was able to be planted after a round was over.
- On sniper rifles, scope was not removed if the match was ended.
 2015-10-04 13:22:12 +03:00
Thanos paravantis
2504493ebc Fixed four super paintball bugs. 
- Projectiles could paint wool in the waiting lobby.
- When players fell in the void, they didn't got killed.
- Players that were painted could take off their armor.
- Players that were painted could logout and the skeleton would still stay there.
 2015-10-04 00:34:00 +03:00
Mysticate
a7ab0cd723 ADDED MORE KITS I'M DONE HOORAY LOVE ME @CHISS 2015-10-02 22:43:29 -04:00
Mysticate
c9ff420a79 Now chooses a different maze every game. 2015-10-02 20:43:57 -04:00
Mysticate
3f6490f14a Gave health on safe pad <<<<<3 2015-10-01 10:47:37 -04:00
Mysticate
a6d7cccbe5 Fixes 2015-09-30 22:31:03 -04:00
Mysticate
4a023c4644 Tweaks - I THINK I'M DONE HOORAY 2015-09-30 21:21:29 -04:00
Mysticate
05b735ba40 Fixed jump system 2015-09-30 20:28:35 -04:00
Mysticate
c39806a4e3 Kewl stuff. Yay 2015-09-30 20:01:51 -04:00
Mysticate
09ef2d73ae Grammar <3 2015-09-30 19:45:29 -04:00
Mysticate
68c6ba595e Visual enhancements. 2015-09-30 19:31:36 -04:00
Mysticate
d089ffeb30 Added a firework when a mob gets rekt 2015-09-30 18:48:45 -04:00
Mysticate
250e9cff13 Fixed a possible NPE 2015-09-30 18:43:52 -04:00
Mysticate
a25e2c575d Peace of mind stuff. 2015-09-30 18:35:56 -04:00
libraryaddict
86cdd7a30e Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-10-01 04:39:26 +13:00
fooify
c3b2c10934 FINALLY FIXED THIS MONSTER MAZE BUG :D 2015-09-29 19:14:18 -07: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
Mysticate
2d173a5be4 Fixed a jumper perk. 2015-09-28 21:03:58 -04:00
fooify
bcfd8fcec7 bug fixes: 
- fixed bugs
- fixed more bugs
- after that, more bugs were fixed
 2015-09-28 17:54:56 -07:00
Shaun Bennett
8a9cc9ff14 Food Dupe Fix 2015-09-28 20:42:14 -04:00
Mysticate
00eecc0325 Fixes 2015-09-28 20:33:38 -04:00
fooify
3a10677b10 AI bug should be fixed, I need Mysticate to test though 2015-09-28 15:15:51 -07:00
Shaun Bennett
92436c8f9d Merge pull request #60 in MIN/mineplex from alex-bugfixes to master 
* commit '8a94602aefc1e4ea3490da434f14205f99ba1d8e':
  Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text
  Made rank unlock lore colored based on rank required for item (QA Requested)
  Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for.
  Marked the Bunny Morph to reflect its no longer available status
  Fixed previous ownership not being transferred
  Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts
  Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui
 2015-09-27 22:39:50 -05:00
AlexTheCoder
5a5dbcfe67 - Assorted bugfixes 2015-09-27 23:36:51 -04:00
Mysticate
00a8cf769b Swag 2015-09-27 14:55:37 -04:00
Mysticate
7e40d0d4bb Lots of cool stuff 2015-09-27 12:10:52 -04:00
Mysticate
eea7ef8350 Swag 2015-09-27 02:11:28 -04:00
Mysticate
54eca7fa9e Lots of work. 2015-09-26 23:18:05 -04:00
AlexTheCoder
cddc6674a5 - Fixed bug with Dwarf Toss 2015-09-26 19:22:17 -04:00
Mysticate
9350386361 Lots of things. :D 2015-09-26 15:08:43 -04:00
Sarah
c99851da37 finishing spells, kits and animations. 2015-09-26 14:31:17 +02:00
Mysticate
8e9a3e90a7 Merge branch 'monster-maze' of 
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
 2015-09-26 00:00:46 -04:00
Mysticate
30d2281785 Lots of things 2015-09-25 23:59:31 -04:00
fooify
1e018cf74a Improved Smasher 2015-09-25 20:21:06 -07:00
Mysticate
2de409c2f2 Made the mazes do things. 2015-09-25 20:14:46 -04:00
Mysticate
a0ec656bc1 Fixed another tracker. 2015-09-25 12:49:21 -04:00
Morten
1c995b14e8 Ignore this 2015-09-25 18:03:10 +02:00
Mysticate
b2f1f7d2ae Fixed the tracker for pilot. 2015-09-25 11:38:32 -04:00
Morten
59d1a949c4 Created an "END" event for challenges 2015-09-25 17:04:47 +02:00
AlexTheCoder
1cc503bd3b - Added resupply points [requested] 2015-09-25 04:37:54 -04:00
AlexTheCoder
03d1d85388 - Testing improvements 2015-09-25 04:23:24 -04:00
AlexTheCoder
7c04e5608d - Added new achievement 'Clutch' 
- Made new achievements needed for achievement skills
 2015-09-25 04:17:20 -04:00
AlexTheCoder
218aa8c584 - Fixed all formatting 2015-09-25 03:52:34 -04:00
AlexTheCoder
f23ef8eea0 - Returned to temporary placeholder block system to prepare for 1.8 update 2015-09-25 03:41:29 -04:00
libraryaddict
88a48277c0 Flags, change to packets 2015-09-25 17:15:09 +12:00
AlexTheCoder
5f45e8c1d3 - Misc changes [increased game time, captures required] 2015-09-25 00:44:28 -04:00
libraryaddict
1394df03e0 For now, set all boss battles games to spider 2015-09-25 16:43:53 +12:00
AlexTheCoder
5b42d25bff - Added achievement and stat stuff 
- Fixed banner bugs
 2015-09-24 23:16:44 -04:00
Mysticate
e66d8765e7 Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze 2015-09-24 23:02:27 -04:00
Mysticate
60c4e5812a Fixed trackers 2015-09-24 23:02:19 -04:00
fooify
69ed764483 Added another maze. 2015-09-24 19:55:43 -07:00
libraryaddict
e8725b38ab Colorize the messages for when a /game start fails 2015-09-25 14:06:35 +12:00
Mysticate
a9f20a573c Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze 2015-09-24 21:10:31 -04:00
Mysticate
9a70d4997a Fix 2015-09-24 21:10:12 -04:00
Mysticate
d9b6d8f0e3 Changes 2015-09-24 21:01:18 -04:00
Mysticate
7445fda922 Made the thing a lot better. Yay! :D 2015-09-24 11:04:05 -04:00
fooify
4663aa3eaa updated mazes 2015-09-24 07:29:48 -07:00
Mysticate
5de016c077 Merge branch 'monster-maze' of 
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
 2015-09-23 23:46:21 -04:00
Mysticate
842da3d6fb Tons of changes. 2015-09-23 23:44:10 -04:00
fooify
a301c87efc workstuffchanges on monster maze 2015-09-23 19:23:21 -07:00
Sarah
0a42ab7aee Adding spell system, spells, and more kits. 2015-09-23 22:04:45 +02:00
Mysticate
125b823a65 Fixed achievement arcade page size. 2015-09-23 15:43:14 -04:00
Mysticate
71408fabd2 One thing. 2015-09-23 15:24:34 -04:00
Mysticate
81e780d400 Merge branch 'monster-maze' of 
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MMMazes.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
 2015-09-23 15:23:08 -04:00
Mysticate
84331901d4 Added achievements and final polish. 2015-09-23 15:18:44 -04:00
AlexTheCoder
d5ef15cd6d - Trying to fix errors 2015-09-23 14:00:19 -04:00
AlexTheCoder
09e44d3372 - Fixed version stuff 2015-09-23 13:47:49 -04:00
AlexTheCoder
3ee6c5c7c8 - Fix Merge Error 2015-09-23 13:25:41 -04:00
AlexTheCoder
c709980db3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-09-23 13:08:25 -04:00
AlexTheCoder
512714219b - Visual edits 2015-09-23 13:04:30 -04:00
fooify
0ad91a6b0b more changes! :D 2015-09-23 07:10:48 -07:00
Morten
7838ad2bce For Bisko to pull 2015-09-22 16:12:51 +02:00
Cheese
4519f2dda1 Merge branch 'EventGameUpdates' 2015-09-22 14:59:17 +10:00
fooify
1f84907309 more changes to monstermaze 2015-09-20 07:40:24 -07:00
AlexTheCoder
05f47be864 - Some fixes 2015-09-19 16:38:07 -04:00
Morten
a5398cb773 Added new challenges and fixed a lot of bugs. 2015-09-19 19:01:13 +02:00
AlexTheCoder
3a1acb9f37 - Code Cleanup 
- Transitioning to banners fully
- Preparation to remove banner bugs
 2015-09-19 00:41:23 -04:00
AlexTheCoder
52a5c63166 Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-09-18 20:08:43 -04:00
AlexTheCoder
d4b8cb253c - Edited messages as per owner request 2015-09-18 20:08:22 -04:00
libraryaddict
8015f5428d Flags stuff 2015-09-19 08:36:23 +12:00
fooify
0581474a16 lots of work on Monster Maze 2015-09-18 08:25:11 -07:00
Cheese
aa30c866fd flurrry 2015-09-18 10:22:16 +10:00
libraryaddict
5e8fc77164 Add pages to spectator and in-progress server menu 2015-09-17 04:34:45 +12:00
AlexTheCoder
e6ecd2d5e1 - Fix for stolen message 2015-09-15 18:38:02 -04:00
Sarah
362d99a819 Fixing up Gem signs, Effects etc. 2015-09-15 07:10:39 +02:00
AlexTheCoder
6c5c2f4c4e - Added slowness to flag carriers and removed any active potion effects they had 2015-09-14 20:38:32 -04:00
AlexTheCoder
0035f3abb0 - Added requested flag location updating 
- Added sudden death mode when the timer runs out and the game is tied, respawning is turned off and the first to capture a flag wins
 2015-09-14 18:54:40 -04:00
AlexTheCoder
2018374b06 - Fixed a color bug 2015-09-14 18:53:10 -04:00
AlexTheCoder
abaf94618c - Increase flag respawn time 
- Fix flag timer being black
 2015-09-14 18:42:08 -04:00
Cheese
ac269839c5 squid skill 2015-09-14 14:14:06 +10:00
Cheese
d9142ac33f smash balance 2015-09-14 12:34:55 +10:00
fooify
2de7fff267 Merge remote-tracking branch 'origin/master' into monster-maze 2015-09-13 08:45:34 -07:00
fooify
aa8cb8943e more work on monster maze 2015-09-13 08:42:26 -07:00
Sarah
7ca6f58108 Adding Gem signs. 2015-09-13 10:25:44 +02:00
Sarah
353c553589 Adding more Words, Removing some Minion types and changing Items in Hotbar. 2015-09-13 10:00:18 +02:00
Sarah
216c8783a9 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-09-13 03:51:06 +02:00
Sarah
a46cb2c274 last fix in the listAreaInfo method. 2015-09-13 00:35:22 +02:00
Sarah
53d5c2fd0e adding area info command. 2015-09-13 00:30:55 +02:00
Sarah
112f94a842 forgot to add command to remove potion effects. 2015-09-13 00:00:47 +02:00
Sarah
fcec6253cd fixing @p on signs, adding potioneffects and gadgets to areas. 2015-09-12 23:56:38 +02:00
Sarah
b6ffee73f5 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates 2015-09-12 21:17:45 +02:00
fooify
55ac104e2c took forever to get it working, but the maze parsing works! :) 2015-09-12 09:50:06 -07:00
Cheese
119dc8ab52 changed name of method 2015-09-12 15:01:18 +10:00
Sarah
5c0ada3df6 Implementing RequiredRank file and command. 2015-09-12 06:39:40 +02:00
Sarah
b56813deef Improving /e commands (/e kick, /e area, etc) 2015-09-12 04:33:10 +02:00
fooify
5824ec6df0 lots of changes to monster maze, check trello for list 2015-09-07 07:08:00 -07:00
Morten
6ea9a15e6d Added a bunch of games 2015-09-07 11:46:08 +02:00
Sarah
4240026024 Adding Areas and a few more commands like /e kick and /e tempgadget to the event game. 2015-09-06 18:55:00 +02:00
Sarah
5712af8ddc Adding Redstone function signs for events. 2015-09-05 20:38:51 +02:00
fooify
c648d7c186 stuff, things...things, stuff (Monster Maze) 2015-09-05 09:30:51 -07:00
fooify
9e3f87b71e more edits to MM 
- displaying more information
- permanent safezones around the map
- spawn now does not deteriorate, is permanent
 2015-09-05 06:41:10 -07:00
Mysticate
271b86dabd Fixed spectators slowing evolution times. 2015-09-04 11:45:42 -04:00
libraryaddict
21d9f5767e CustomTagFix support changing and removing of names. 2015-09-04 19:23:33 +12:00
Cheese
03537e4650 fixed a spacing issue 2015-09-04 12:18:02 +10:00
Cheese
0ec3a8dc10 added radar for ctf and dom 2015-09-04 12:09:26 +10:00
Mysticate
0c58de3c19 Glitches. Fixed the things. 2015-09-01 02:35:06 -04:00
Mysticate
b4ce33a916 Fixed things. 
• Added a cancelled check to No Ability 
• Removed tokens on quit.
• Checked if players are alive before giving them places.
 2015-09-01 01:59:36 -04:00
AlexTheCoder
bff9c99e2c Added system to mount flags on carrier's head for easier identification and disabling of abilities as per Chiss' request 2015-08-31 21:48:25 -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
Sarah
58ae09ebd4 saving Project for pulling. 2015-08-31 11:32:18 +02:00
AlexTheCoder
129464a845 Added CTF to MPS menus 2015-08-31 04:42:36 -04:00
AlexTheCoder
cbf8b575c6 Changed data for certain types of spawning 2015-08-31 03:28:22 -04:00
AlexTheCoder
39a79eb818 Fixed a nullpointer 2015-08-31 03:05:43 -04:00
AlexTheCoder
474f1bd0b8 Made CTF follow Chiss' specifications and also added more advanced features 2015-08-31 03:04:18 -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
AlexTheCoder
149d37caad Forgot to commit with actual game 2015-08-30 04:01:01 -04:00
AlexTheCoder
eca69a8ae2 Made new branch up to date and including previous branch's code 2015-08-30 03:58:58 -04:00
Jonathan Williams
47331658ac Merge remote-tracking branch 'remotes/origin/Myst_EVO' 2015-08-30 00:14:53 -07:00
Mini-Chiss
d944d2e5c4 Merge branch 'Myst_EVO' 2015-08-29 23:54:28 -07:00
Mini-Chiss
64b9cd201c snake crap 2015-08-29 16:02:14 -07:00
libraryaddict
6ae801314c Fix spawning 2015-08-29 15:07:51 -07:00
libraryaddict
5030ae7d57 For Chiss, may the code never break. 2015-08-29 15:03:22 -07:00
libraryaddict
f0f9a4c674 Push it like a pushy pushy lady. 2015-08-29 13:46:09 -07:00
Mini-Chiss
b7b81ecaaa snake 2015-08-29 13:38:40 -07:00
Mysticate
046fa4f8b6 Fixed possible NPE 2015-08-29 14:30:22 -06:00
Mysticate
736d88c82f All achievements fixed. ^_^ 2015-08-29 14:13:15 -06:00
Mini-Chiss
d2bc4b8cb4 SNAAAKE 2015-08-29 13:13:04 -07:00
libraryaddict
5d28509474 Snakes tail final location instead of rel movement 2015-08-29 12:38:19 -07:00
libraryaddict
e7f861a6c2 Push golem changes, snakes code and rename bossability thingy 2015-08-29 12:04:53 -07:00
Mysticate
97c7980bbc Fixed evolving into walls. 2015-08-29 10:54:04 -06:00
Mysticate
55a7ea0439 Fixed kit bug. 2015-08-29 10:44:11 -06:00
Mini-Chiss
6a28845cb0 Merge branch 'Myst_EVO' 2015-08-29 00:14:15 -07:00
Mysticate
12d9888a1f Fixed wins.. 2015-08-29 00:58:53 -06: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
3f1c4d24b9 Merge branch 'Myst_EVO' 2015-08-28 21:00:00 -07:00
Mysticate
bb09720450 removed previous commit jesus 2015-08-28 21:56:35 -06:00
Mini-Chiss
d68f1fa547 Merge branch 'Myst_EVO' 2015-08-28 20:50:27 -07:00
Mysticate
6628f5a1ae Added a checker for a no kit issue 2015-08-28 21:49:57 -06:00
Mini-Chiss
19b2ff5b58 fixed scoreboard 2015-08-28 20:48:32 -07:00
Mini-Chiss
11cc4a6cea removed msg 2015-08-28 20:45:59 -07:00
Mini-Chiss
fda866a33f Merge branch 'Myst_EVO' 2015-08-28 20:35:59 -07:00
Mysticate
4466c10441 FIXED 2015-08-28 21:35:31 -06:00
Mini-Chiss
4ac6b22e53 Merge branch 'Myst_EVO' 2015-08-28 20:31:56 -07:00
Mini-Chiss
88ca205474 fixes 2015-08-28 20:31:29 -07:00
Mysticate
815add4c59 FIXED THE THIGNS 2015-08-28 21:28:39 -06:00
Mini-Chiss
5777309d18 Merge branch 'Myst_EVO' 2015-08-28 20:07:22 -07:00
Mini-Chiss
8238a199d5 gem stuff 2015-08-28 20:06:39 -07:00
Mysticate
cc60371c1f Fixed perk cancelling on death 2015-08-28 21:04:35 -06:00
Mini-Chiss
d879bc68ab Merge branch 'Myst_EVO' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
 2015-08-28 19:59:48 -07:00
Mini-Chiss
b5b8bef39e evo fixes 2015-08-28 19:58:51 -07:00
Mysticate
d6c8e51104 Things ^_^ 2015-08-28 20:57:47 -06: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
56aa235e56 Fixed kit messages 2015-08-28 19:25:52 -06:00
Mini-Chiss
c8c569281b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-28 16:18:49 -07:00
Mini-Chiss
5562345c05 Merge branch 'SarahsAwesomeBugFixes' 2015-08-28 16:02:40 -07:00
Sarah
3be6483ed3 editing /game set for test servers. 2015-08-29 01:01:05 +02:00
Sarah
0f37829b54 changing Hotbar text to money. 2015-08-29 00:56:24 +02:00
Mysticate
2d770a8dd1 More final tweaks. 2015-08-28 16:36:35 -06:00
Sarah
ccc9645c47 adding hotbar text. 2015-08-29 00:24:44 +02: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
libraryaddict
1f5cd624a4 Fix up iron golem, add slam attack 2015-08-28 11:42:33 -07:00
Sarah
2a236684ac Finalizing prototype of Type wars. 2015-08-28 14:47:49 +02:00
Mysticate
571d992dbe Fixed a few bugs. 2015-08-27 20:47:55 -06:00
libraryaddict
379ee9271a Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta 
* commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b':
  Iron Wizard, fixed iron golem custom name
  Push golem block shot as per request
 2015-08-27 16:34:46 -05:00
libraryaddict
9d3f125c9e Iron Wizard, fixed iron golem custom name 2015-08-27 14:18:10 -07:00
Mysticate
f2f6afb6ca Fixes :D 2015-08-26 20:10:58 -06:00
Mysticate
a351a8f1ed Minor improvements. 2015-08-26 13:47:01 -06:00
Mysticate
cfdb0dfa4f Added kits + achievements. Hurrah! 2015-08-26 13:19:17 -06:00
Mysticate
988382375f Started adding kits 2015-08-25 23:36:18 -06:00
Sarah
15aca5dca9 Making the mob spawning prototype. still have to figure out how to move them properly. 2015-08-26 00:59:28 +02:00
fooify
e9bc0d3a5f capitalize h 2015-08-25 08:23:22 -07:00
fooify
64ca6ecce0 Merge remote-tracking branch 'origin/master' into foo 2015-08-25 08:20:37 -07:00
fooify
1952ee7824 fix some strings mentioning "admin" in MPS 2015-08-25 08:19:09 -07:00
Ty Sayers
69afefd66f Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java

Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.
 2015-08-24 20:55:29 -04:00
Mysticate
7b42f2155d Tweaks. :D 2015-08-24 20:40:34 -04:00
fooify
549435224f changes to monster maze! 2015-08-24 09:58:07 -07:00
libraryaddict
ba41118da7 Load boss battles properly 2015-08-25 01:58:57 +12:00
libraryaddict
8798244351 Bosses stuff 2015-08-24 08:34:29 +12:00
Mini-Chiss
d454d73ccb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-23 11:32:48 -07:00
Mini-Chiss
69ff514bf8 changed perms on write 2015-08-23 11:31:32 -07: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
Morten
f9fecebeec Minor update ;) 2015-08-22 11:01:37 +02:00
Mysticate
cbaaee60d9 Removed mob spectating method from evolving. 2015-08-21 13:00:08 -04:00
libraryaddict
bad339cf04 Tweak dead bodies more 2015-08-21 20:52:57 +12:00
libraryaddict
c41328d726 Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games 2015-08-21 20:40:09 +12:00
libraryaddict
39ede2064a Bosses game progress 2015-08-21 16:12:26 +12:00
Mysticate
86ad6a09de Used armor stands for evolving. 2015-08-20 13:04:22 -04:00
Mini-Chiss
f97da1bdba Merge branch 'SarahsAwesomeBugFixes' 2015-08-19 16:33:37 +02:00
Sarah
6e926b431c Fixing snowballs and eggs in Solo Skywars. 2015-08-19 16:00:36 +02:00
Mini-Chiss
3d7c81a3b4 fixed game tips 2015-08-19 08:15:22 +02:00
Mysticate
64990ed356 Fixed parse distance. 2015-08-18 21:37:52 -04:00
fooify
15eba5b491 added more y velocity 2015-08-18 12:22:34 -07:00
Mysticate
53395a7700 Made player immovable whilst evolving. 2015-08-18 13:07:46 -04:00
fooify
a47022d242 Merge remote-tracking branch 'origin/master' into monster-maze 2015-08-17 14:54:19 -07:00
Mysticate
75a4b3d568 Changes to make evolving easier 
• Speed 1 on kill
• Evolve chargeup decreases 1.5 seconds per kill.
 2015-08-17 10:36:28 -04:00
Mini-Chiss
7a7543886f fixed a ton of commands NPEing on no args 2015-08-17 09:04:39 +02:00
Mysticate
993ed0a92d Fixed a possible NPE 2015-08-16 22:38:59 -04:00
Mini-Chiss
8cc5ff042c fixed block hunt gem exploits 2015-08-16 09:33:15 +02:00
Mini-Chiss
8584e0355a final fix! 2015-08-15 12:32:03 +02:00
Mini-Chiss
ba6806935d fixed better 2015-08-15 12:31:19 +02:00
Mini-Chiss
25f93bac2e fixed logic on setgame 2015-08-15 12:27:11 +02:00
Sarah
27da9b64b6 Merge branch 'KitPreferences' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes 2015-08-15 07:40:40 +02:00
Sarah
96dc86a481 Fixing map rotation. 2015-08-15 07:34:04 +02:00
Mysticate
2659dd4e39 Fixed minor bugs. Head now follows mob altitude. 2015-08-14 23:17:56 -04:00
Mysticate
ac18dd3b79 Fixed iron golem select message. Removed slot change message. 2015-08-14 20:22:00 -04:00
libraryaddict
a1ea03f74b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 
Conflicts:
	Plugins/.idea/misc.xml
	Plugins/.idea/modules.xml
	Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
	Plugins/Mineplex.Database/src/mineplex/database/Routines.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
 2015-08-14 19:44:56 +12:00
Mini-Chiss
80588a308b balanaced brawler 2015-08-13 21:03:48 +02:00
Mini-Chiss
a1ba2cffac fixed needler not doing posion 2015-08-13 20:56:02 +02:00
Mysticate
eaad787075 Removed the base kit and replaced it with Iron Golem. 2015-08-13 08:16:33 -04:00
Mini-Chiss
1487692609 completely disabled team armor in arcade. avoids typing it just as game starts. 2015-08-13 12:57:30 +02:00
Mini-Chiss
f3b58fe9b6 disabled team armor command in games D: 2015-08-13 12:51:57 +02:00
Jonathan Williams
8476578bc0 Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master 
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
  Various Fixes.
 2015-08-13 01:52:16 -05:00
Jonathan Williams
a308244966 Merge pull request #29 in MIN/mineplex from foo to master 
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
  minor grammar issue
  remove duplicate method
  manually updating something
  *crosses fingers* please work!
  please work...
  Freezes the time using doDayLightCycle instead of using a UpdateEvent.
  Fixed double-half-slabs (line 68)
  remove custom level to fix merge conflicts
  squirrel!
  fix getting snowballs from bedrock
  add jnr_dev to updaterank
  fix this agaaaaain
  FOOIFY IS A NOOB OKAY
  fix concurrentmodificationexception
  fix turfforts bug
  prevent STATIONARY_LAVA from breaking in creeper smash
  fix creeper smash exploding lava and bedrock
  fix spleef lava issue
  ishh also wanted this :P (let me know if I should remove it)
  ishh wanted it...k
  ...
 2015-08-13 01:49:00 -05:00
Jonathan Williams
0ff7cee229 Merge pull request #32 in MIN/mineplex from Alex_MILKCOW to master 
* commit 'cc24bb78d3968c0c364164fb43e19724007e3833':
  Fixed Cows being able to fly if they had the Rabbit Farmer kit
  Fixed new classes not appearing in repository
  Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
 2015-08-13 01:45:56 -05:00
Mysticate
ed7dbddf4a Redid how kits are done. 2015-08-13 00:12:28 -04:00
Mysticate
d7e28e9eb8 You can no longer have the option to Evolve if you kill while dead. 2015-08-12 13:28:31 -04:00
Mysticate
a7da10cb34 You no longer remain "charging" when you die. 2015-08-12 12:12:26 -04:00
Mysticate
ad94b63903 Blaze and Enderman now take water damage. 2015-08-12 10:46:12 -04:00
Mysticate
0c3c9702d9 Small fixes. 
Added holograms to show kit abilities.
Fireworks are now client side only.
Decreased the # of emerald particles.
 2015-08-12 09:44:55 -04:00
Mini-Chiss
d6f17c609b carl 2015-08-12 08:58:46 +02:00
Mini-Chiss
c00f9a7aaa Merge branch 'Bonus' 2015-08-12 08:39:31 +02:00
Sarah
be699558f1 Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus 2015-08-12 08:38:18 +02:00
Sarah
af19754bcd Implementing Carl to Arcade. 2015-08-12 08:37:54 +02:00
Mini-Chiss
7cda53cb28 carl spinner in arcade/ 
tutorial fixes
 2015-08-12 08:36:21 +02:00
fooify
ddc663cc75 remove duplicate method 2015-08-11 09:52:04 -07:00
fooify
10f979772b Merge remote-tracking branch 'origin/master' into foo 2015-08-11 09:51:13 -07:00
fooify
356060eedc more amazing changes 2015-08-11 09:41:26 -07:00
fooify
c6ec60700c monster maze is really working now! :D 2015-08-11 09:04:45 -07: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
2c30d20cb1 changing OP method, setHost permissions and /e command. 2015-08-11 09:26:01 +02:00
Sarah
d457e3a955 changing the setOP Event. 2015-08-11 08:36:39 +02:00
Mysticate
bd414cd231 Merge remote-tracking branch 'origin/master' into Myst_EVO 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
 2015-08-10 19:47:53 -04:00
Mysticate
873a2f3c56 Changed slowness from 255 - 2 2015-08-10 19:45:40 -04:00
Mysticate
a618b19b73 Small changes 2015-08-10 14:32:35 -04:00
Sarah
fef269b856 Fixing /e set. 2015-08-10 17:28:27 +02:00
Mysticate
1804d668e1 A few small tweaks. Removed the "Frozen" effect. 2015-08-10 08:42:03 -04: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
Mysticate
463dfc7049 Minor Tweaks. 
• Fixed wrong evo location
• Added a "Frozen" effect when evolving.
 2015-08-10 00:21:48 -04:00
Mysticate
a19cd3559d Renamed "Shift" to "Crouch" 2015-08-09 23:26:59 -04:00
Mysticate
158dcdc01e Created a new way to Evolve. 
• Getting a kill presents you the option "Hold Shift to Evolve"
• Holding shift for about 5 seconds evolves you as normal.
 2015-08-09 23:25:26 -04:00
Mysticate
f8a6a25b46 Various Fixes. 
• Merged w/ master
• Changed to William's method of Projectile limiting.
- Prevented TNT hitting Teammates
• Fixed gem count for Sniper
• Added gems for direct hits + TNT Thrown
• Removed assists counting for kills in 6 kill.
 2015-08-09 15:01:27 -04:00
Mysticate
d9a8830e75 Few changes 2015-08-09 14:34:55 -04:00
Mini-Chiss
ee65c72e86 and wizards! 2015-08-09 18:46:02 +02: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
Mysticate
b9edb92c1e Ready for full on testing. 2015-08-09 01:08:43 -04:00
Mysticate
5298fa341e Removed the revolving thing. 2015-08-08 16:13:54 -04:00
fooify
db521668a9 more changes! it's getting pretty cool now x) 2015-08-07 14:20:15 -07: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
Mini-Chiss
b22706e649 hub update part 1 2015-08-07 21:45:38 +02:00
Mysticate
858e57bb0d edited a few things 2015-08-07 14:39:29 -04:00
fooify
f70b1231ab AI fixes and such for Monster Maze 2015-08-07 10:32:31 -07:00
Mysticate
a9350bfacd Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-07 11:58:53 -04:00
Sarah
181b778a9c Fixing some bugs and disallow MPS while disguised. 2015-08-07 07:39:40 +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
Morten
1680b652db Added Hat layer skin 
Added Sneak animation

With love from Morten <3
 2015-08-07 03:10:17 +02:00
Sarah
d8041ba582 Fixing Players can disguise as disguised Players. 2015-08-06 20:57:56 +02:00
fooify
0a9f7cc888 Merge remote-tracking branch 'origin/master' into monster-maze 2015-08-06 10:13:54 -07:00
fooify
9e92a3a68d more changes (not really ready for testing yet though...) 2015-08-06 09:44:00 -07:00
Mini-Chiss
ebbc13c0a4 lowered headshot damage 2015-08-06 17:07:52 +02:00
Sarah
4a10f8d71a fixing very last bugs. Ready to push!!! 2015-08-06 13:23:38 +02:00
Sarah
6947b54e66 16 char limit and Steve Skin. 2015-08-06 09:45:02 +02:00
Sarah
5809359449 Random Player disguises. 2015-08-06 09:19:19 +02:00
Sarah
208ce95c97 No youtuber Disguise. 2015-08-06 09:11:39 +02:00
Sarah
b52a9477fe No Staff disguises! 2015-08-06 09:07:30 +02:00
Sarah
16a8164030 Fixing last bugs and disabling coin bombs while diguised. 2015-08-06 08:42:09 +02:00
fooify
b5d1202674 YET MORE WORK ON MM 2015-08-05 13:09:26 -07:00
fooify
551451c533 moar changes 2015-08-05 10:30:27 -07:00
Sarah
a15e8e1b95 Fixing more /disguise bugs. 2015-08-05 15:23:16 +02:00
Sarah
83da6b7a9a Improving the /disguise command even more. ;D 2015-08-05 13:32:05 +02:00
AlexTheCoder
cc24bb78d3 Fixed Cows being able to fly if they had the Rabbit Farmer kit 2015-08-05 03:07:19 -04:00
Mini-Chiss
5d7cc59909 fixed cases where negative stats were being uploaded 2015-08-05 08:56:52 +02:00
Sarah
91de6a1852 last fix... 2015-08-05 08:40:09 +02:00
Sarah
511c61611a fixing earlier commit. 2015-08-05 08:32: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
Sarah
ec3bc7cc38 Try fixing the map selection. 2015-08-04 17:04:49 +02:00
William Burns
644d6c9914 Whitelist fixes. Implemented MapSource. 2015-08-04 11:21:58 +01:00
Mini-Chiss
13d139d197 team kills/deaths only store for 3 games now 2015-08-04 08:46:00 +02:00
Mysticate
d88a37832b Work on evolving 2015-08-03 18:22:31 -06:00
AlexTheCoder
a86fdc3c21 Fixed new classes not appearing in repository 2015-08-03 18:45:16 -04:00
AlexTheCoder
b53b98d6e3 Milk The Cow: 
New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost

New Perk - Steady Hands:
- Lowers the amount of milk lost by a dead player to 3
- Removes losing milk in farmer's bucket when a cow charges into them

New Kit - Sturdy Farmhand:
- Iron skin damage reduction of 2.0
- Implements Steady Hands perk
- 2000 gems
 2015-08-03 18:30:42 -04:00
Mini-Chiss
2d07cc571c reduced invis in OITQ 2015-08-03 18:53:00 +02:00
Mini-Chiss
2f571aed25 fixed bugs from my vel fixes, WHOOPS. normalisation :( 2015-08-03 18:19:31 +02: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
817b8b03f6 Whitelist fixes etc. 2015-08-03 13:40:13 +01:00
William Burns
0c5cc25634 Stuff 2015-08-03 12:48:17 +01:00
William Burns
4ad19e4579 Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps 2015-08-03 10:52:00 +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
1d0bfbdf2d fixed team sheep displaying in UHC lobby 2015-08-03 10:56:23 +02:00
Mini-Chiss
b26e01649b removed requirement for ach kit 2015-08-03 10:13:46 +02:00
Mini-Chiss
eac8a3cd1c fixed OITQ kit being unobtainable 2015-08-03 10:12:37 +02:00
Mini-Chiss
472409dc4b fixed broadcast formatting 2015-08-03 10:06:15 +02:00
Mini-Chiss
2e1bccb3ad DUN ALLOW overful 2015-08-03 09:02:28 +02:00
Mini-Chiss
0a84bd69d8 fixed some OITQ stuff 2015-08-02 23:17:23 +02:00
Mysticate
0a20a04903 Used packets to spectate the rotation bat. 2015-08-02 10:48:00 -06:00
Mini-Chiss
4cc810f1c0 Merge branch 'Myst_KITS' 2015-08-02 17:55:53 +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
ac4755a5a9 Fixed incorrect velocity 2015-08-02 11:24:34 +02:00
Mysticate
9c14e3d35a Worked on evolution 2015-08-01 17:24:12 -06:00
fooify
519449e015 lots of stuff (: 2015-08-01 11:42:32 -07:00
Mysticate
62072077c1 Fixed evolution rotation 2015-08-01 00:47:44 -06:00
fooify
e4141a1b72 Merge remote-tracking branch 'origin/master' into snow-sprint 2015-07-31 07:32:17 -07: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
Sarah
b2c538b189 little tag fix. 2015-07-31 13:40:39 +02:00
Sarah
60a1768821 Fixing Team display bug on disbanding. 2015-07-31 13:05:28 +02:00
Mini-Chiss
b2a567673c disabled sale msg 
added double gem weekend
 2015-07-31 09:53:52 +02:00
Mysticate
53a3a29cd2 Extreme revisions. Cheers! 2015-07-31 00:50:32 -06:00
fooify
e59f2751f3 more stuff changed to snow sprint 2015-07-30 17:31:26 -07:00
fooify
014cac31f0 more changes to snow sprint 2015-07-30 14:04:39 -07:00
fooify
6c39c08abf some progress on snow sprint 2015-07-30 11:59:04 -07:00
Mini-Chiss
a3d768af6b added res pack for HH 2015-07-30 15:07:40 +02:00
Mini-Chiss
31fd19aab5 added res pack for CC 2015-07-30 15:07:05 +02:00
Mini-Chiss
8a5088e181 fixed SGT deathmatch not working 2015-07-30 14:47:59 +02:00
Mini-Chiss
45d117a95a added armor hotbar to smash 
fixed scoreboard in snowfight
 2015-07-30 14:45:28 +02:00
Mysticate
f02924987e Did things 2015-07-30 04:30:19 -06:00
Mini-Chiss
8ef93c0b33 Merge branch 'SSM2PlayerTeams' 2015-07-30 08:42:50 +02:00
Sarah
30fa3b3309 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-30 03:07:41 +02:00
Sarah
37e432f0b2 Git fix. 2015-07-30 03:07:21 +02:00
Sarah
bf75594853 Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-30 02:33:51 +02:00
Sarah
de4d0a7dc3 Fixing needler, projectiles in SW and "Banannas...". 2015-07-30 02:33:06 +02:00
Mysticate
a5d73d791a Thing 2015-07-29 16:14:38 -06:00
fooify
7c4786e7d2 Merge remote-tracking branch 'origin/master' into foo 2015-07-29 14:15:24 -07:00
fooify
5da23fa322 Merge branch 'foo' of http://Fooify@184.154.0.242:7990/scm/min/mineplex.git into foo 2015-07-29 14:13:07 -07:00
fooify
db5c5a9888 *crosses fingers* please work! 2015-07-29 14:12:52 -07:00
Mini-Chiss
97a144150b fixed an NPE that was causing games not to end in MS 2015-07-29 21:51:18 +02:00
Mysticate
ab49407584 Things 2015-07-29 11:52:44 -06:00
Aaron Brock
d583598477 Fixed double-half-slabs (line 68) 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-07-29 10:49:20 -07:00
Mini-Chiss
be910cced9 gamemode color change 2015-07-29 17:00:36 +02:00
Mini-Chiss
0e55ce1879 removed old hint 2015-07-29 16:54:30 +02:00
Mini-Chiss
1004203b34 fixed up some merge issues 2015-07-29 16:48:49 +02:00
William Burns
13af2cec74 Pick highest voting button 2015-07-29 15:44:29 +01: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
71bedbe0fc Merge branch 'WitherAssaultUpdate' 2015-07-29 16:37:29 +02:00
Mini-Chiss
c32e959f61 Merge branch 'SnowFightUpdate' 2015-07-29 16:36:33 +02:00
Morten
1a27dea32c Why was these not added... 2015-07-29 16:35:57 +02:00
Mini-Chiss
d570cce1b0 Merge branch 'WitherAssaultUpdate' 2015-07-29 16:33:06 +02:00
Mini-Chiss
862cdae14f team modes 2015-07-29 16:32:11 +02:00
Mini-Chiss
e47a343e2e added mode for team games 2015-07-29 16:20:49 +02:00
Morten
f714bfbb0f Adding testing achievement lol 2015-07-29 16:06:43 +02:00
Morten
b5d3ad0e0d Adding perks 2015-07-29 16:05:43 +02:00
Sarah
9c5ca750cf Improving /e mob command and implementing other commands. 2015-07-29 15:53:45 +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
Mini-Chiss
deba3f23fa Merge branch 'MPS-Maps' 2015-07-29 15:27:11 +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
b2db2e988f Merge branch 'WitherAssaultUpdate' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
 2015-07-29 15:13:28 +02:00
Mini-Chiss
1c2bd988f9 fixed spawns for team gameds 2015-07-29 15:10:21 +02:00
William Burns
f6e64d25a2 Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps 2015-07-29 13:27:45 +01:00
William Burns
f82defb1db Whitelist 2015-07-29 13:27:26 +01:00
Mini-Chiss
30f0b3cb60 fixed close spawn stuff 2015-07-29 14:25:15 +02: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
932fe197b4 Merge branch 'perm-changes' 
Conflicts:
	Plugins/.idea/encodings.xml
reverted it.
 2015-07-29 14:06:21 +02:00
Mini-Chiss
ef89b96144 fixed game page bug 2015-07-29 14:02:56 +02:00
Mini-Chiss
b42be044ae whtielisted MPS will be hidden from GUI 2015-07-29 13:20:20 +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
Jonathan Williams
10549601f8 Merge pull request #21 in MIN/mineplex from Myst_LOBBERS to master 
* commit 'd0a45461d07904f70b5e42dee391f69843fb3978':
  Fixed bug with direct hit
  Final tweaks. this is as good as it's goign to get! ;d
  Tweaks
  Fixed waller achievement thing
  Fixed waller kit bc I was stupid before ;c
  Added an exception for a map to make it night.
  Various improvements.
  Added an achievement, removed team one, touched up another. Swag.
 2015-07-29 00:15:41 -05:00
Mysticate
d0a45461d0 Fixed bug with direct hit 2015-07-28 21:25:29 -06:00
Mysticate
3e0eb03112 Final tweaks. this is as good as it's goign to get! ;d 2015-07-28 20:39:55 -06:00
Mysticate
99946ef1f3 Tweaks 2015-07-28 17:29:51 -06:00
Mysticate
2e58b75a1b Fixed waller achievement thing 2015-07-28 08:51:21 -04:00
Mysticate
dd53d268e4 Fixed waller kit bc I was stupid before ;c 2015-07-28 08:46:37 -04:00
Mysticate
c5cf306097 Thing 2015-07-28 08:41:35 -04:00
Mysticate
0e00086b9e Redid evolution! 2015-07-28 00:15:41 -04: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
Sarah
aaf4991737 Fixing Banana team. 2015-07-27 18:31:01 +02:00
Sarah
572ae1e99b Updating Team names. 2015-07-27 18:22:24 +02:00
Ben Sihota
0b53bca385 Needed permission changes for Jr Developers (Pending approval) 2015-07-26 18:58:35 -07:00
Mini-Chiss
1247f33b1e end game stats will display, even if no gems awarded. 2015-07-26 11:43:24 +02:00
Mysticate
0586e5fb77 Added an exception for a map to make it night. 2015-07-26 00:27:09 -04:00
Mysticate
4ceb156e69 Various improvements. 2015-07-25 23:44:55 -04:00
Mysticate
0fd59e9fdb Added an achievement, removed team one, touched up another. Swag. 2015-07-25 21:50:37 -04:00
William Burns
cf61b50d98 More changes. 2015-07-25 17:35:43 +01:00
Mini-Chiss
dffde68982 fixed bug 
removed debug
 2015-07-25 17:11:02 +02:00
Mini-Chiss
7c7b166b4d reduced particles a little 2015-07-25 16:05:12 +02:00
Mini-Chiss
aebd3eeb4f Merge branch 'Myst_LOBBERS' of ssh://184.154.0.242:7999/min/mineplex into Myst_LOBBERS 2015-07-25 15:56:23 +02:00
Mysticate
9feac87a15 Fixed not being able to buy Armorer. Lowered view distance on particles. 2015-07-25 09:51:23 -04:00
William Burns
91d0a37d77 Animation change etc. 2015-07-25 12:48:39 +01:00
Mini-Chiss
d64d713a87 Merge branch 'Myst_LOBBERS' 2015-07-25 10:50:55 +02: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
Mysticate
ae5c74680c SMALL CHANGE OMG DON'T MERGE WITH MASTER YET PELASE 2015-07-25 04:30:56 -04:00
Mini-Chiss
59d14624c0 Merge branch 'Myst_LOBBERS' 2015-07-25 10:26:47 +02:00
Mysticate
d295cead09 Final stuff 2015-07-25 04:18:18 -04:00
Mysticate
a002da4c0f Redid how lobbers works 2015-07-25 03:21:56 -04:00
Mysticate
5d87d9e1e4 . 2015-07-25 02:01:55 -04: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
13fa6bca8b Make it go back to game choose page. 2015-07-24 16:24:17 +01:00
William Burns
dcb6e0ec59 Added rejected games and whitelist to MPS. 2015-07-24 16:03:53 +01:00
Sarah
a50455acf5 Fising last character bug. 2015-07-24 15:44:36 +02: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
Mysticate
7205065a56 Merge branch 'master' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_KITS 2015-07-23 17:47:33 -04:00
Mysticate
9a3c4f3a00 Added Ninja Kit to OITQ. New Achievement kit. 2015-07-23 17:46:10 -04:00
Mysticate
365968f41d Added a bomb token thing 2015-07-23 16:26:43 -04:00
Mysticate
06d4de16cf Changed particle methods 2015-07-23 13:34:11 -04: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
e638674444 Fixed fuse on detonator 2015-07-22 20:17:19 -04:00
Mysticate
b9762bddc4 Fixes 2015-07-22 16:50:57 -04:00
libraryaddict
eff71c3e17 Champions: Add Morten G's changes to fix BlockToss 2015-07-22 08:10:57 +12:00
Mysticate
b4df9f47c5 Added a mortar kit ;o (Please don't fire me b2) 2015-07-21 11:01:45 -04:00
Mysticate
d38fc1a603 Reverted things 2015-07-20 16:40:37 -04:00
Morten
b239f0af28 Fixed some bugs with the Editor kit 2015-07-20 20:40:43 +02:00
Mysticate
6addf00037 LOTS of tweaks :D 2015-07-20 14:27:10 -04:00
Mysticate
63df369700 Cleaned up somethings (lib's request) 2015-07-20 10:18:50 -04:00
Mysticate
bb769aa0f4 I'm a dumbass 2015-07-20 10:02:50 -04:00
Mysticate
87cc40fc0c Fixed a few achievements 2015-07-19 22:38:03 -04:00
Mysticate
8b2b4c2826 Added to MPS 2015-07-19 15:51:34 -04:00
Morten
c5f7c4fe0e Finalized after QA testing. Pretty much ready to go 2015-07-19 19:50:53 +02:00
Morten
2cad6223a7 Ubs.. Forgot to actually upload the new kits.. :D 2015-07-18 15:15:53 +02:00
Morten
b986cf968e Added new kits, Changed Compass feature, Fixed a lot of bugs 2015-07-18 15:10:03 +02:00
Mysticate
2dc2b8792c Fixes, updates 2015-07-17 17:01:24 -04:00
Sarah
8b26ffaecd Improving Team names in SG, SSM and Skywars and disabled friendly fire. 2015-07-17 14:05:27 +02:00
Cheese
5e05530b1d spawn near allies! 2015-07-17 21:28:46 +10: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
5389193cab Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-17 06:31:10 +02:00
Sarah
02a71bff68 another git fix 2015-07-17 06:30:53 +02:00
Sarah
aaae11d426 Git Fix. 2015-07-17 06:29:32 +02:00
Cheese
cfb4911c25 added ability for teams will fill before moving onto next team 2015-07-17 12:54:53 +10:00
Cheese
63f6adf295 fixed spawn picking 2015-07-17 12:50:34 +10:00
Cheese
3335a7c288 changed skywars teams. forced at 16 teams. 2015-07-17 12:07:09 +10:00
Cheese
558b71f866 fixed thigny 2015-07-17 11:48:14 +10:00
Shaun Bennett
2b2e5e5c97 Spelling fixes + Observer mode 2015-07-16 15:51:21 -05:00
Morten
d46ac59e10 Added project start 2015-07-16 01:34:57 +02:00
Sarah
9eee425792 revert mistake from last commit. 2015-07-14 23:46:56 +02:00
Sarah
e6aec58ece Updating Map source. 2015-07-14 23:14:56 +02:00
Mysticate
1e1cf6403d Added achievements 2015-07-14 13:31:41 -04:00
Sarah
3a2011ee6a Improving Map System: GameTypes can have more mapSources now. 2015-07-14 13:22:59 +02:00
Sarah
2b10aa2cf9 Improving spawn selection in SkywarsTeams. 2015-07-14 08:19:33 +02:00
Cheese
251e6206af Merge branch 'SSM2PlayerTeams' of ssh://184.154.0.242:7999/min/Mineplex into SSM2PlayerTeams 2015-07-14 14:02:50 +10:00
Cheese
0315f61038 changed team spawn selection 2015-07-14 14:02:35 +10:00
Sarah
304a51de04 Improving TeamSurvivalGames Scoreboard. 2015-07-14 05:44:58 +02:00
Sarah
e72d612379 Implementing the mapSource parameter in GameType and setting up SkywarsTeams and SurvivalGamesTeams. 2015-07-14 05:25:08 +02:00
Shaun Bennett
5c5e7dd4a9 Merge master into clans 2015-07-13 20:42:10 -05:00
Mysticate
df60659786 Core edits 2015-07-13 12:14:25 -04:00
Mysticate
616c444c16 Added some things and stuff 2015-07-12 18:15:33 -04:00
Mysticate
0a09ae29f3 Merge remote-tracking branch 'origin/master' into BombLobbers 2015-07-12 18:14:25 -04:00
Sarah
bd3641cdac Updating TeamSmash with team Generation Methods. 2015-07-12 02:51:18 +02:00
Sarah
be194c5493 Adding Peace Phase Announcement. 2015-07-12 01:00:50 +02:00
Sarah
625f7d3168 Some last small changes. 2015-07-12 00:45:47 +02:00
Sarah
55a1c311bf Kit improvements and balancing. 2015-07-12 00:21:13 +02:00
Sarah
251accb40a Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-11 18:49:38 +02:00
Sarah
d41fcb1b7b Improving the SSM Team Game. 2015-07-11 18:44:33 +02:00
Mysticate
d0180910e9 Added two new kits. 2015-07-11 10:25:04 -04:00
Sarah
64915a0b7d Implementing Meteoroids for Game end and changing Kit description. 2015-07-11 04:28:37 +02:00
Mysticate
0353b8571d Merge branch 'BombLobbers' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into BombLobbers 2015-07-10 16:41:29 -04:00
Mysticate
f812fd0530 Please push please 2015-07-10 16:31:37 -04:00
Sarah
5429e3eb76 snowfight kits 2015-07-10 13:17:07 +02:00
Sarah
152523fc3d snowfight update 2015-07-10 13:13:38 +02:00
Mysticate
9e07be51c7 Bug fixes 2015-07-09 12:03:56 -04:00
Mysticate
1b3d7f1c20 Fixed and added things 2015-07-08 23:57:48 -04:00
Cheese
49daf597b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-09 12:47:57 +10:00
Cheese
7d073fdc0d fixed skywars icon 
changed LOSSES to GAMESPLAYED for consistency
 2015-07-09 12:47:40 +10:00
Shaun Bennett
a9e68ff777 Completed Energy 2015-07-08 21:39:31 -05:00
William Burns
3ba7ba259c Added map selection to MPS. 2015-07-08 15:24:16 +01:00
William Burns
e819a4dab3 Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps 2015-07-08 09:56:39 +01:00
William Burns
6008e58c12 Added map selection to MPS. 2015-07-08 09:49:41 +01:00
libraryaddict
7e3fdef2e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-08 18:43:56 +12:00
libraryaddict
1f250bf951 MineWare: Add current progress 2015-07-08 18:43:37 +12:00
Ben Sihota
ca880371a6 Merge remote-tracking branch 'origin/master' 2015-07-07 21:19:43 -07:00
Cheese
480a29b874 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-08 13:55:16 +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
Ben Sihota
ffbee4a9aa Add more details to /game 
Fix NPE with /game set
 2015-07-07 18:20:27 -07:00
libraryaddict
9eff5b7245 Perks: Forgot to include this in last commit, no harm done. 2015-07-08 07:51:33 +12:00
fooify
8149d61343 Merge remote-tracking branch 'origin/master' into foo 2015-07-07 07:59:46 -07: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
libraryaddict
3d0dda382b Stacker: Fixed an infinite loop 2015-07-06 07:07:19 +12:00
Cheese
1e26ebe0bd disabled ice forming 2015-07-02 10:09:39 +10:00
fooify
70d351adae fix getting snowballs from bedrock 2015-07-01 16:58:16 -07:00
Cheese
0100ca1b8c fixed a derp bug 2015-07-02 09:41:33 +10:00
fooify
d1e4306684 fix this agaaaaain 2015-07-01 16:38:10 -07:00
fooify
04c863c0eb FOOIFY IS A NOOB OKAY 2015-07-01 16:10:41 -07:00
fooify
4495468c7f fix concurrentmodificationexception 2015-07-01 15:50:07 -07:00
fooify
8574c0bdeb fix turfforts bug 2015-07-01 09:58:45 -07:00
fooify
b7476cec5e prevent STATIONARY_LAVA from breaking in creeper smash 2015-07-01 08:25:17 -07:00
fooify
6dc7384c82 fix creeper smash exploding lava and bedrock 2015-07-01 08:16:14 -07:00
fooify
6d42be4d13 fix spleef lava issue 2015-07-01 07:17:41 -07:00
Cheese
dd9fc8e7c6 bridge speed increase 2015-07-01 15:14:46 +10:00
Cheese
0650b73374 more bridge tweaks 2015-07-01 14:16:56 +10:00
Shaun Bennett
9ccc85a79e Improved block restore for Events 2015-06-30 22:30:49 -05:00
Cheese
190e58c37e bridges update 2015-07-01 12:58:54 +10:00
fooify
a72eee9cf3 Merge remote-tracking branch 'origin/master' into foo 2015-06-30 09:20:43 -07:00
fooify
d2cc8d5077 fix grammar bug 2015-06-30 09:19:21 -07:00
fooify
11fb02a594 add stained glass to list of blocks that can be broken in quiver 2015-06-30 09:03:43 -07: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
fooify
4ff456b722 Merge remote-tracking branch 'origin/master' into foo 2015-06-29 11:29:22 -07:00
Cheese
48f5fa118a fixed a few sky bugs 2015-06-29 14:26:00 +10:00
Cheese
b0f8369bcd lowered block falling speed. 
fixed a bug where some chests didnt fall
 2015-06-29 10:09:36 +10:00
Cheese
ead402d026 skywars art 2015-06-28 14:31:25 +10:00
Shaun Bennett
d07c319581 Saving some work 2015-06-27 22:22:02 -05:00
Cheese
08e4ef199e added twitch to dguisecmd 2015-06-28 12:53:18 +10:00
Cheese
faca14dd23 fixed disguise permission 2015-06-28 12:50:27 +10:00
Cheese
840ebabf2a added delay on mad scientist eggSpawn 
fixed Exp bug
 2015-06-27 20:39:05 +10:00
Cheese
1f34bc40a3 increased time you can hold TNT for in CS 2015-06-27 14:08:16 +10:00
Cheese
4c164ce2a6 enabled double gems 2015-06-27 12:44:43 +10:00
Cheese
d0368a19d8 Players who quit early do not get full game worth of EXP. 2015-06-27 12:38:04 +10:00
Cheese
754026f403 chicken teleport fix 
scientist minion name fix
 2015-06-27 12:18:12 +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
fooify
333c54cff9 Merge branch 'master' into foo 2015-06-26 10:07:13 -07:00
Cheese
9a0ac821a2 fixed stat bug 2015-06-26 19:44:13 +10:00
Cheese
750769d03a fixed gem thing 2015-06-26 19:12:34 +10:00
Cheese
62a7fd6a99 you now get levels for kills/assists 
fixed scoreboard bug
 2015-06-26 19:12:11 +10:00
Cheese
b0019242e7 skywars scoreboard fix 2015-06-26 19:02:34 +10:00
Jonathan Williams
8c427bee24 Fix _gameDisplay bug. 
Fix Skywars quickmenu link.
 2015-06-26 03:57:39 -05:00
Jonathan Williams
8f2c0cf9d8 Fix file names. 2015-06-26 03:15:16 -05:00
Cheese
1aa0832bb9 SkyWars to Skywars 2015-06-26 17:55:49 +10:00
Cheese
9bf58a2d98 disabled pistons 2015-06-26 17:47:04 +10:00
Cheese
1564a8bc51 disabled hoppers 2015-06-26 17:46:05 +10:00
Shaun Bennett
2657ef336a Merge remote-tracking branch 'origin/master' 2015-06-26 02:33:00 -05:00
Shaun Bennett
60901cc17e Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
 2015-06-26 02:32:51 -05:00
Cheese
c31d3609bb soup no longer spawns in stacks 2015-06-26 17:32:46 +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
Cheese
a5aa2bc0e9 text changes 2015-06-26 17:28:23 +10:00
Cheese
c514cacd5d more skywars fixes 2015-06-26 17:05:29 +10:00
Cheese
027efe02fc skywars! 2015-06-26 16:38:44 +10:00
Cheese
257c088948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 16:08:17 +10:00
Cheese
b744320ecc pearl trail fix 2015-06-26 16:08:04 +10:00
Cheese
16af8453e3 pearl fix 2015-06-26 16:04:07 +10:00
Cheese
338797f4a6 skywars update 2015-06-26 15:57:47 +10:00
Cheese
aef8a00017 update! 2015-06-26 15:25:43 +10:00
Cheese
8f3d0ad84b fixed some bugs :O 2015-06-26 14:38:39 +10:00
Cheese
0874178973 skywars update! 2015-06-26 14:14:22 +10:00
Cheese
2d1d65b239 skywars fixes 2015-06-26 13:15:03 +10:00
fooify
7f7edddf42 Fix TNT bug in SG - tested, works fine! :) 2015-06-25 19:36:31 -07:00
Cheese
5710831777 fixed webs dropping webs 2015-06-26 12:34:26 +10:00
Cheese
7d4e36651f less random chests 2015-06-26 12:26:57 +10:00
Cheese
fdbaa4e9c7 dont allow overfill 2015-06-26 12:18:25 +10:00
Cheese
f1da68a82a fixed chickens not spawning 2015-06-26 12:14:35 +10:00
Cheese
00da27a3d6 added middle chests 
added chicken spawns
added zombie/chicken loot
 2015-06-26 12:06:40 +10:00
Cheese
beb78270e5 skywars loot changes 2015-06-26 11:54:35 +10:00
Cheese
bb569a26e2 skywars update 2015-06-26 11:22:33 +10:00
Cheese
b48820a753 ore gen fixed! 2015-06-26 10:50:38 +10:00
Cheese
d9a8d2b6ab ore changes 2015-06-26 10:36:45 +10:00
Jeremiah Bishop
0342a5ac61 Fixed Achievements 
Reordered Kits
Added new Kit
etc, etc, etc...
 2015-06-25 19:03:25 -04:00
Cheese
2179795677 Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
 2015-06-25 20:48:34 +10:00
Cheese
2bf1faa70d fixed a few skywars bugs 
added ore generation (but theres some wierd bug, still working on it)
 2015-06-25 20:24:31 +10:00
Jonathan Williams
5bdb90b459 Changed disguise perm to YOUTUBE 2015-06-25 04:57:56 -05:00
Jeremiah Bishop
ed667fedee Added more achievements 2015-06-24 22:59:28 -04:00
Jeremiah Bishop
cd10a2ad79 Fixed both kits 
Added game achievements.
 2015-06-24 20:08:31 -04:00
Jeremiah Bishop
5b4a3249ca Added chest loot and such. 2015-06-22 21:42:45 -04:00
Jeremiah Bishop
03c45116ef Various fixes, and added the new data to Zoologist kit 2015-06-21 23:38:25 -04:00
Jeremiah Bishop
a05c2d085d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-21 16:17:51 -04:00
Jeremiah Bishop
e12ff7ef7d Fixed? 2015-06-20 22:20:30 -04:00
Jeremiah Bishop
3cf1297d89 Added SkyWars ;) 2015-06-20 22:08:15 -04:00
Jonathan Williams
91b5beaff2 Fixed new Chat constructor requirement. 2015-06-20 03:43:38 -05: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
Aaron Brock
1f0accd2a1 Fixed a little boolean derp that stopped people from breaking blocks. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:09:21 -04:00
Cheese
478a3c8591 some champs fixes/balance 
duplicate message improvement
 2015-06-20 15:00:16 +10: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
Aaron Brock
61494f93ba Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench 2015-06-19 18:13:48 -04:00
Cheese
8a224950b3 Added sale notifications 
Added 3s chat delay
 2015-06-19 13:27:59 +10:00
Aaron Brock
76e4dc6056 Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-18 19:50:06 -04:00
Jeremiah Bishop
dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
Cheese
9a3a014dd5 removed debug! 2015-06-18 12:04:49 +10:00
Aaron Brock
41e77b1ade Fixed double-half-slabs (line 68) 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-17 20:49:35 -04:00
Shaun Bennett
dbdb2b3fc5 Scoreboards and WorldEvent work 2015-06-17 17:40:16 -05:00
Cheese
6886484d79 Fixed Micro Battles lag (stupid lava) 
cmds for jnr devs
smaller head hitbox in MS
added MB to parser plugin
 2015-06-17 13:02:12 +10:00
Cheese
3014521e79 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-17 10:43:01 +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
Shaun Bennett
8245b6c466 Schematic generation over time, fixes to gold manager drops 2015-06-14 17:30:02 -05:00
Cheese
a141cec104 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-11 08:57:04 +10:00
Cheese
390ffcab6d bridges support for lillypads map 2015-06-11 08:56:32 +10:00
Shaun Bennett
a20f41be09 Merge remote-tracking branch 'origin/master' 2015-06-09 13:21:26 -05:00
Shaun Bennett
3f9010fb7a Fix GameScore comparator 2015-06-09 13:21:15 -05:00
libraryaddict
2971761a5e Game stop command: Move unregister of game listener after the gamestate has been changed 2015-06-09 22:19:03 +12:00
libraryaddict
1f08c989b5 Minestrike: Enforce resource pack 2015-06-09 03:31:24 +12:00
libraryaddict
8cf10afb1b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-06-06 18:31:08 +12:00
libraryaddict
fd3232f45d Mineware: Rename old MineWare and move packages 2015-06-06 18:30:47 +12:00
libraryaddict
ef9c69f356 UtilShapes: Fix a method, add a space in OldMineWare in GameType 2015-06-06 18:08:37 +12:00
libraryaddict
5f2810ae37 SurvivalGames: Fix anyone able to start game 2015-06-06 18:07:55 +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
a961e5f0d5 Wizards: Don't gain wands from stats page 2015-06-02 18:49:50 +12:00
libraryaddict
4d8a54e7ba Wizards: Add spellbook on /spec 2015-06-02 18:49:27 +12:00
libraryaddict
bcdb851e21 Teleport: Don't disqualify staff if they are not alive 2015-06-02 18:48:45 +12:00
libraryaddict
35c005feb8 Game: add isInsideMap(Player) and have border call that on Game.java in order to have games able to define specific borders for players 2015-05-30 10:30:30 +12:00
libraryaddict
092447170e Game Border: Fix typo that offsets border by one block 2015-05-30 10:24:15 +12:00
libraryaddict
ae41f232b0 GameType: Change to reflection for creating game instances 2015-05-30 10:23:46 +12:00
Shaun Bennett
a900a2a70a [Arcade] Another attempt at fixing spectator gui.... :^) 2015-05-26 19:50:01 -05:00
Shaun Bennett
25ba20e411 [Arcade] Fixes for DMT and DT not counting loses properly 2015-05-26 19:28:42 -05:00
libraryaddict
e15e42afae UHC: Expanded from 32 blocks to 36 2015-05-27 02:40:27 +12:00
libraryaddict
b8cd2aaece UHC: Expand anti-build protection from 16 blocks to 32 2015-05-26 11:04:27 +12:00
libraryaddict
c53d52ee42 UHC: Disable gadgets 2015-05-24 20:17:39 +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
63e28e25c9 HoleInTheWall: Push the failed game 2015-05-24 20:10:56 +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
c107f4d0d9 [Arcade] Working on private servers 2015-05-17 16:31:09 -05:00
Shaun Bennett
5cd191f582 Merge remote-tracking branch 'origin/master' 2015-05-17 16:29:01 -05:00
Shaun Bennett
1e9abaf002 [Arcade] Add more games to private servers 2015-05-15 23:38:43 -05:00
libraryaddict
f899194e3b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-15 12:23:27 +12:00
libraryaddict
091f98fa9d DrawMyThing: Remove all found words from the checked string when looking for multiple guesses 2015-05-15 12:23:05 +12:00
Shaun Bennett
6b7c52cb87 [Arcade] Add additional hub clock check 2015-05-14 15:17:45 -05:00
Mini-Chiss
d390d83dd1 removed some meh words 2015-05-13 22:35:26 -05:00
Mini-Chiss
f49c2ca546 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 22:27:41 -05:00
Mini-Chiss
e68a2775e8 ex p chnage 2015-05-13 22:27:33 -05:00
libraryaddict
67f1e4ad1f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-14 14:29:43 +12:00
libraryaddict
0fc1d680af UHC: Add 20 seconds of invincibility on game start 2015-05-14 14:29:30 +12:00
Mini-Chiss
44cb6d8a62 increased exp more 2015-05-13 17:08:56 -05:00
libraryaddict
4bc38e3396 Arcade: Removed ocean, river and swampland from biome generation for UHC 2015-05-14 09:55:22 +12:00
libraryaddict
c46bdfd2dc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-14 09:18:51 +12:00
libraryaddict
1b27e84e54 DrawMyThing: Fixed a check being in the wrong brackets 2015-05-14 09:18:35 +12:00
Mini-Chiss
bd58c06017 fixed being able to team with self in UHC 
fixed eventgame admin toggle
 2015-05-13 13:32:20 -05:00
Mini-Chiss
c34cac42ee Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 13:20:14 -05:00
Mini-Chiss
c26174ffa2 fixed team name 2015-05-13 13:20:05 -05:00
libraryaddict
938386bf77 Wizards: Removed chainmail loot, added gold armor instead 2015-05-13 19:14:40 +12:00
libraryaddict
20aeccb3be Wizards: Lowered ice shards max level to 3, removed damage from web shot 2015-05-13 14:04:19 +12:00
libraryaddict
744c867990 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-13 13:19:09 +12:00
libraryaddict
d2e37df4ca DrawMyThing: Prevented all multiple guesses, not just when it contains an accurate word 2015-05-13 13:18:54 +12:00
libraryaddict
a75aab7f98 DrawMyThing: Added more words, fixed the multiple guesses prevention never firing. 2015-05-13 13:15:53 +12:00
libraryaddict
03c384e7e6 Wizards: Remove boat from loot, fix napalm typo 2015-05-13 10:04:05 +12:00
Mini-Chiss
e1dd3a318e UHC!!!!! 2015-05-12 15:52:19 -05:00
Shaun Bennett
32338cfce4 [MB] More words for update 2015-05-12 17:25:37 -05:00
Shaun Bennett
bdfffa3a4c Merge remote-tracking branch 'origin/master' 2015-05-12 17:14:57 -05:00
Shaun Bennett
26db4fa269 [MB] Add more build themes 2015-05-12 16:15:44 -05:00
Mini-Chiss
2928c73767 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-12 14:46:30 -05:00
Mini-Chiss
e13e735246 UHC updates! 2015-05-12 14:46:21 -05:00
Shaun Bennett
c7a9ae8cd5 [Arcade] Attempt at fixing spectator gui bugs 2015-05-12 06:23:32 -05:00
Shaun Bennett
06a0f3d0d5 Merge remote-tracking branch 'origin/master' 2015-05-12 00:37:40 -05:00
Shaun Bennett
270ef37a7c [MB] More words and more ground types 2015-05-12 00:37:13 -05:00
Mini-Chiss
ed90e97c68 removed border attack stuff 2015-05-11 21:00:38 -05:00
Shaun Bennett
9d959ee7a3 Fix/Enable Look at me Button 2015-05-11 20:46:37 -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
libraryaddict
214a750f6e UHC: Add borders from SG 2015-05-12 11:01:04 +12:00
libraryaddict
a558995e12 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-12 09:52:21 +12:00
Shaun Bennett
d57bab7430 Merge remote-tracking branch 'origin/master' 2015-05-11 15:17:50 -05:00
Shaun Bennett
e799ea0909 [MB] Look at me Button (Disabled - not working properly), Villager profession button, Small bug fixes 2015-05-11 15:17:35 -05:00
Mini-Chiss
e3f2c02836 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-11 14:11:00 -05:00
Mini-Chiss
5e73441b9a UHC world loading 2015-05-11 14:10:51 -05:00
Mini-Chiss
123af16bd2 UHC map gen 2015-05-11 13:25:05 -05:00
Shaun Bennett
c0dc531252 [MB] Allow Item Frames and Paintings 2015-05-11 12:38:21 -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
Shaun Bennett
46c07665e1 Merge remote-tracking branch 'origin/master' 2015-05-11 00:44:34 -05:00
Shaun Bennett
2e7428e79a Temporary fletcher fix 2015-05-11 00:42:55 -05:00
libraryaddict
5ee3f48754 Wizards: Nerf rumble max level from level 5 to level 3 2015-05-11 14:08:40 +12:00
Mini-Chiss
3e64115f05 vote colors 2015-05-09 17:45:08 -05:00
Mini-Chiss
41599de06f build vote update 2015-05-09 17:34:07 -05:00
Mini-Chiss
6e2b437e55 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-09 12:28:16 -05:00
Mini-Chiss
822718095d cannot PM from spawn 
first push of cards game
 2015-05-09 12:23:07 -05:00
libraryaddict
7faee918af Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-09 14:13:03 +12:00
libraryaddict
0751876622 Wizards: Do a null check and event is cancelled check on damage 2015-05-09 14:12:46 +12:00
Shaun Bennett
ef86f8bb6f merge 2015-05-08 12:22:58 -05:00
libraryaddict
689ca94c57 Wizards: Nerf rainbow beam damage, rebalance gust spell, raise armor effectiveness 2015-05-08 18:57:33 +12:00
libraryaddict
3e02806b75 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-07 02:57:20 +12:00
libraryaddict
47acf7fb85 DrawMyThing: Ignore guesses containing more than two answers. 2015-05-07 02:54:55 +12:00
Shaun Bennett
ae03743c63 Build sort of bug fix for teleported into block 2015-05-04 19:27:16 -05:00
Mini-Chiss
7505bbc1a2 gravity fix 2015-05-04 15:34:57 -05:00
Mini-Chiss
b959bcaa90 fixed 1.8 req 2015-05-04 00:56:12 -05:00
Mini-Chiss
50cd692c62 fixed wither morph damaging blocks in grav lobby 2015-05-04 00:34:03 -05:00
Mini-Chiss
fa1ac52f78 grav balance 2015-05-03 20:21:00 -05:00
Mini-Chiss
838c369b7c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 20:12:13 -05:00
Mini-Chiss
95c9be47b6 missing kit 2015-05-03 20:12:06 -05:00
Shaun Bennett
cb2666c4a5 Merge remote-tracking branch 'origin/master' 2015-05-03 20:06:19 -05:00
Shaun Bennett
af1f735a43 Add lightning packets, various gui improvements 2015-05-03 20:06:10 -05:00
Mini-Chiss
58671fa229 more words 2015-05-03 19:36:50 -05:00
Mini-Chiss
6978a176b1 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 19:10:55 -05:00
Mini-Chiss
7f0e175ba1 build update 2015-05-03 19:10:49 -05:00
Shaun Bennett
044d1098f4 Merge remote-tracking branch 'origin/master' 2015-05-03 19:10:22 -05:00
Shaun Bennett
a435ed5bae More build changes 2015-05-03 19:10:13 -05:00
Mini-Chiss
1576085d87 more words 2015-05-03 18:33:31 -05:00
Mini-Chiss
73132d96b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 18:33:03 -05:00
Mini-Chiss
f36d7774cc Gravity update 2015-05-03 18:32:57 -05:00
Shaun Bennett
de1f432be4 Build bug fixes 2015-05-03 18:31:56 -05:00
Shaun Bennett
74474c6227 Use itemstackfactory for formatted name 2015-05-03 18:26:20 -05:00
Shaun Bennett
f98ac0874c Merge remote-tracking branch 'origin/master' 2015-05-03 18:22:14 -05:00
Shaun Bennett
83ff3c96aa Close inventory when game starts 2015-05-03 18:21:59 -05:00
Shaun Bennett
fbfb5e637e Mob Gui + Ground Change Gui + UtilSkull for special mob skulls 2015-05-03 18:18:16 -05:00
Mini-Chiss
a42c71ebb8 more 1.8 stuff 2015-05-03 16:54:02 -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
Mini-Chiss
a07132df49 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 15:39:04 -05:00
Shaun Bennett
73719e0df3 Fix world particles issues 2015-05-03 15:30:58 -05:00
Mini-Chiss
40c838b030 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-03 14:50:56 -05:00
Mini-Chiss
8224450b44 Build Update 2015-05-03 14:50:50 -05:00
Shaun Bennett
74dbf7e827 Merge remote-tracking branch 'origin/master' 2015-05-03 14:41:18 -05:00
Shaun Bennett
ff6da92fb7 Some Build world, support for far rendered particles 2015-05-03 14:41:09 -05:00
libraryaddict
b58bef1bd8 ResourcePack: Lengthen timeout from 10 seconds to 20 seconds 2015-05-04 04:13:23 +12:00
libraryaddict
9986bd6ee5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-04 04:10:05 +12:00
libraryaddict
3fcec13e68 Wizards: Melee with wands should say it was wands that did it 2015-05-04 04:09:49 +12:00
Shaun Bennett
11b36e6b44 [Build] Show message to players to open inventory until they click something in their inventory 2015-05-02 22:50:27 -05:00
Mini-Chiss
9c08e57602 fixed NPE 2015-05-02 22:45:14 -05:00
Mini-Chiss
122dbad45c added time setting and framework for lightning strikes 2015-05-02 22:26:03 -05:00
Mini-Chiss
6ad09f0ade Master Builder update 2015-05-02 22:05:12 -05:00
Mini-Chiss
5b04d43400 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-02 17:45:39 -05:00
libraryaddict
08140f8863 ResourcePack: Resource pack refused now links to a forum guide 2015-05-03 08:10:25 +12:00
libraryaddict
8cb9493125 Wizards: Rainbow Road no longer lasts more than 20 seconds, cooldown never decreases 2015-05-02 16:39:20 +12:00
libraryaddict
9c268786aa Wizards: Nerfed lightning strike damage 2015-05-02 16:22:59 +12:00
libraryaddict
efed6e129b Wizards: Removed fishing rod from loot, fixed overtime locations not permitted to touch the highest block. 2015-05-02 16:11:57 +12:00
libraryaddict
3e9b64db66 Wizards Implode: Don't cast spell if no blocks are effected 2015-05-02 15:26:23 +12:00
libraryaddict
cd1a5793fa Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-02 15:24:16 +12:00
Jonathan Williams
707772d58b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-01 22:07:33 -05:00
Jonathan Williams
2902e6075f Fix for n positive bug. 2015-05-01 22:05:03 -05:00
libraryaddict
05c9174491 Wizards: Prevent using keyboard shortcuts to drop hotbar locked items 2015-05-02 14:59:15 +12:00
Mini-Chiss
ab6937a525 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 18:05:55 -05:00
Shaun Bennett
e04b61a91d Give build item when game starts 2015-05-01 18:03:56 -05:00
Shaun Bennett
244ffece8a Fixes for build game + fix clans compile 2015-05-01 18:02:06 -05:00
Shaun Bennett
910cdff935 Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
 2015-05-01 17:54:00 -05:00
Shaun Bennett
37f1f7eabb Master Builders changes for chiss 2015-05-01 17:46:42 -05:00
libraryaddict
b136be0d47 ResourcePack: Removed code that demanded a enum and changed to boolean 2015-05-02 03:03:53 +12:00
libraryaddict
e8cbb2fc29 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 21:26:56 +12:00
libraryaddict
93a25d5a67 ResourcePack: Fixed links and declined message 2015-05-01 21:26:42 +12:00
Jonathan Williams
fb634c190e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-01 02:29:54 -05:00
Jonathan Williams
e800d74976 Disabled Double Gems. 2015-05-01 02:29:20 -05:00
libraryaddict
c240a1752f GameType: Update resource pack to use https not http 2015-05-01 19:28:42 +12:00
libraryaddict
f85d27db1a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 19:25:11 +12:00
libraryaddict
cc65830f9b ResourcePack: Ignore ServerGroup's resource pack and set MineStrike to use new ResourcePack code 2015-05-01 19:24:20 +12:00
Mini-Chiss
1b8ab13160 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 00:51:52 -05:00
Mini-Chiss
ba5802cc14 wizards kit availability 2015-05-01 00:47:51 -05:00
Jonathan Williams
fa4466b6a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-05-01 00:13:39 -05:00
libraryaddict
88bd99e11f Wizards: Update UtilTextBottom text for the custom method 2015-05-01 16:57:11 +12:00
Jonathan Williams
af86586d74 Added 'Sloth' to draw my thing list. 2015-04-30 23:57:11 -05:00
Jonathan Williams
d161d62773 Added chat filtering to private messages. 2015-04-30 23:56:08 -05:00
Mini-Chiss
21800d83c6 Build fixes 2015-04-30 23:16:30 -05:00
libraryaddict
319cde5c46 Wizards: Update resource pack url 2015-05-01 16:14:59 +12:00
libraryaddict
fbafeca150 Wizards: Remove block burn flag true 2015-05-01 15:44:11 +12:00
libraryaddict
82cd4208bd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
 2015-05-01 14:22:53 +12:00
libraryaddict
c660e0e3c7 Wizards: Re-sorted spells 2015-05-01 14:19:13 +12:00
libraryaddict
7bd133f704 Wizards: Temporary resource pack 2015-05-01 13:04:05 +12: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
libraryaddict
33bbe96964 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards 2015-04-30 01:33:43 +12:00
libraryaddict
497550549b ResourcePackCode: Fixed the return to hub sender displaying the wrong message. Bad downloads are now sent back to hub. 2015-04-30 01:33:21 +12:00
libraryaddict
c2b7001fcc Wizards: Current progress 2015-04-30 01:32:22 +12:00
Mini-Chiss
45b801ba81 hitbox changes 2015-04-27 19:21:33 -05:00
libraryaddict
1c1ab9bbe3 Throwing TNT: Fixed tnt not being movable from other inventories 2015-04-23 08:30:23 +12:00
libraryaddict
2aaa93e58f ResourcePack: Add constructors to GameType for resource pack urls, sorted the enum's by name 2015-04-22 05:38:32 +12:00
libraryaddict
b29893ff60 Merge branch 'ResourcePack' into Wizards 2015-04-22 03:46:25 +12:00
libraryaddict
9f8fe3bf78 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-04-22 03:45:59 +12:00
libraryaddict
aeff6bf4b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 2015-04-22 00:25:56 +12:00
libraryaddict
0196a5c359 Wizards: Latest changes by Chiss 2015-04-21 13:54:19 +12:00
libraryaddict
cd47da179a Wizards: Added new food Cheese, removed other foods and raised spawn chance of remaining 2015-04-18 06:12:34 +12:00
libraryaddict
9db8aff37a Wizards: Changed spell icons for resource pack 2015-04-18 06:10:23 +12:00
libraryaddict
25dfeacb09 Wizards: Spell levels are now viewable on items in chest as item amount 2015-04-16 16:20:01 +12:00
libraryaddict
8803941bd8 Wizards: More changes as per demand. 2015-04-16 05:51:08 +12:00
libraryaddict
073c7d16c2 Wizards Napalm: Make glazed blocks more common, raise damage 2015-04-13 15:06:52 +12:00
libraryaddict
e0b0975195 Bridge: Prevent hoppers being crafted to prevent abuse 2015-04-13 14:38:32 +12:00
libraryaddict
03fb8c203e Wizards: Balancing 2015-04-12 23:20:15 +12:00
libraryaddict
81aeff86bf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 2015-04-12 20:15:28 +12:00
Cheese
1378dcb815 Properly fixed MS spec bug 2015-04-11 11:45:27 +10:00
Cheese
9b2c4662c3 fixed minestrike bug where newly joined specs could buy/drop items 
removed easter baskets
 2015-04-11 11:25:25 +10:00
libraryaddict
afa372dca7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellButton.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLightningStrike.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSpeedBoost.java
 2015-04-11 12:20:29 +12:00
libraryaddict
fc7c6e5831 Wizards changes 2015-04-11 12:11:50 +12:00
Cheese
3d95a5cfa4 bloock toss fix 2015-04-10 14:09:21 +10:00
Cheese
e0a58ba165 champions exploit fix update 2015-04-06 19:57:33 +10:00
Cheese
cdb86d3ebb champions exploit fixes and balance 2015-04-06 17:17:36 +10:00
Cheese
6c3fc3009b fixed sheep quest bug where players were unable to pick up sheep rapidly 
fixed bug where falling blocks were instantly hitting players
 2015-04-06 13:03:59 +10:00
Cheese
93abca0c01 can no logner break levers and other usables in SG 2015-04-04 16:12:33 +11: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
libraryaddict
23abf92722 IcePathData: Compare Material instead of integers 2015-04-03 19:37:27 +13:00
libraryaddict
6faf5011a8 Wizards: Add spells: Gust, RainbowPath, SpectralArrow, IcePrison. Remove spells: ExplosiveRune, HealingRune, LaunchRune, Launch, TeleportRune. Explosions now launch blocks. Other changes done such as modified spells. 2015-04-03 19:33:49 +13: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
f682bb8f9c fixed kit items not spawning 
horse pet doesnt spawn when dead
 2015-04-03 12:10:02 +11:00
libraryaddict
bb821996b1 Wizard modifications 2015-04-03 09:22:31 +13: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
5737df8d6a final fixes for bacon brawl 2015-04-01 18:07:45 +11:00
Cheese
da9e7892f0 fixed aprilfools bugs 
mamapig debug :(
 2015-04-01 18:01:09 +11:00
Cheese
24ba42cb16 fixed armor stands blocking attacks in bacon brawl 2015-04-01 17:49:49 +11:00
Cheese
8bd883cb26 fixed damage transfer for mama pigglez kit 2015-04-01 17:43:46 +11:00
Cheese
59fce1cd88 adding some mmoooo text 
changed pig kit for baconbrawl
 2015-04-01 17:15:56 +11:00
Cheese
ed35d2a992 April Fools update 2015-04-01 16:56:13 +11:00
libraryaddict
b84756ef7a Revert wizard commits 2015-03-27 22:13:50 +13:00
libraryaddict
a772d4cbf2 BlockHunt: Use new setInvisible method in DisguiseChicken 2015-03-27 22:05:16 +13:00
libraryaddict
a27e6fba5c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
 2015-03-27 06:00:14 +13:00
Cheese
821c7f0cb6 Replaced bebe piggles kit with a new kit 2015-03-26 17:43:22 +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
libraryaddict
db5e6ad745 Wizards: Summoned wolves are one-hittable, and one per spell level 2015-03-25 19:25:32 +13:00
libraryaddict
be5086e2a5 Wizards: Give warning before lightning spell hits 2015-03-25 19:22:08 +13:00
libraryaddict
be542b9ce4 Rebalance wizard spell SpeedBoost 2015-03-25 19:21:38 +13:00
libraryaddict
853e6420dd Add instant-casting to wizards 2015-03-25 19:21:20 +13:00
Cheese
4a25265c7c Added utility methods to check for players within a sight pyramid 2015-03-25 17:13:22 +11:00
libraryaddict
4988b90d0e Prevent TNT from being moved in inventories in PerkBomberHG 2015-03-25 16:56:37 +13:00
libraryaddict
63c55a1449 SurvivalGames: Prevent wood dropping, add mushroom soup to base loot and change bowl to soup. Add throwing tnt to loot. 2015-03-25 16:56:05 +13:00
libraryaddict
ad967a092a Remove TNT from SG placeable and breakable 2015-03-25 16:19:56 +13:00
Cheese
9142227dd4 updates to SG border 
balanced cleave for SG and Champs
 2015-03-25 14:16:09 +11:00
Cheese
5fded981d9 Timings for Visibility 2015-03-23 16:38:17 +11:00
Cheese
46dfb532fb Bridges scoreboard fix 
SG balance
DONT QUIT msg improvement
 2015-03-23 11:50:09 +11:00
Cheese
3f2b7444a3 made SG scoreboard display individual player names once there's less then 8 2015-03-22 10:06:11 +11:00
libraryaddict
f99edecba0 Change deathmatch color to red 2015-03-22 00:05:24 +13:00
Cheese
2bbf035d4c SG borders now have audio and attack nearby players. 2015-03-21 12:22:47 +11:00
libraryaddict
ee7ae77311 Use VisibilityManager instead of hidePlayer showPlayer in SG Deathmatch 2015-03-21 01:38:20 +13:00
Cheese
0a766cd7bb increased food and weapons 2015-03-20 22:23:25 +11:00
Cheese
376824edfc slowly tnt explosion by 0.5s 2015-03-20 20:46:11 +11:00
Cheese
446951d8af balance changes for SG 2015-03-20 20:43:42 +11:00
Cheese
57502c226f changed slasher to barb 2015-03-20 19:39:23 +11:00
Cheese
392a648f8e fixed cleave hurting self 2015-03-20 18:43:44 +11:00
Cheese
810517b142 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-20 18:22:10 +11:00
Cheese
cdd9400ec2 added slasher kit to SG 2015-03-20 18:21:56 +11:00
libraryaddict
f2ffc57ae2 Fix error, allow snowball and egg to do damage 2015-03-20 20:15:10 +13:00
libraryaddict
baaebd3662 Chiss wants a shorter Assassin Description 2015-03-20 19:43:27 +13:00
libraryaddict
11dcc4af8b Fix description of Assassin Kit 2015-03-20 19:41:56 +13:00
libraryaddict
83b18129f2 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
 2015-03-20 19:33:27 +13:00
libraryaddict
7bf9c13fd8 Kit Assassin in SG has nametag visiblity set to 8 blocks, normal set to 24 2015-03-20 19:30:08 +13:00
Cheese
6c78bc6f8f added 10s delay on getting bow in block hunt 2015-03-20 16:51:24 +11:00
Cheese
746fa9e11b stealer kit for SG 2015-03-20 16:20:55 +11:00
libraryaddict
6c257c1e7d Store killed players in a hashmap in SG 2015-03-20 18:17:34 +13:00
libraryaddict
19cc6dc12b Minor bug-fix in the hopes it fixes a major bug for SG 2015-03-20 17:51:03 +13:00
libraryaddict
6e30834565 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-20 17:35:42 +13:00
libraryaddict
03bcb120fc Change border damage from Void to Border Damage 2015-03-20 17:35:27 +13:00
libraryaddict
3e7346618b Change border creep speed, boats only placeable on water 2015-03-20 17:34:44 +13:00
Cheese
e4475eb7b1 allowed mapleads to stop games 
removed nametag (long range) on wolf pet, and lowered damage from 4 to 3
 2015-03-20 12:37:18 +11:00
libraryaddict
7b41649d94 Removed debug logging in SurvivalGames 2015-03-18 22:10:03 +13:00
Cheese
ee237c9f5b re-enabled SG in gamefactory 2015-03-17 22:20:40 +11: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
261b18fcf0 Add GameType options 2015-03-17 23:59:59 +13:00
libraryaddict
52f0941fb9 Add resourcepack options 2015-03-17 23:59:24 +13:00
libraryaddict
733134f709 Update SurvivalGames 2015-03-17 23:53:43 +13:00
libraryaddict
f12d0bf9ef Allow disabling of game start sounds, and changing of the game PrepareTime. 2015-03-17 23:52:58 +13:00
libraryaddict
340441edbe SG kit fletcher no longer can pickup fletched arrows 2015-03-17 18:30:48 +13:00
libraryaddict
06ebbbbc73 Remove SG wolf pet on quit 2015-03-17 18:30:17 +13:00
libraryaddict
41469b198a Change wizards spells to use conditions for potion effects 2015-03-17 18:07:43 +13:00
Cheese
3eba559b01 fixed merge error 2015-03-17 15:02:41 +11: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
e3eb62887d fixed an eventgame bug 2015-03-17 14:50:56 +11:00
Cheese
28c683a37a fixed display for effects 2015-03-16 15:16: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
libraryaddict
bead4a7626 No longer need to constantly set the durability of items in the sheep game 2015-03-15 13:13:06 +13:00
libraryaddict
ba04c5e834 Fixed GameScoreboard demanding strings are shortened to 15 chars when the max is 16 2015-03-15 12:35:39 +13:00
libraryaddict
e9fe1fb423 Formatted SpellType, fixed lightning spell description 2015-03-15 12:34:45 +13:00
Cheese
98960b6ce7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-13 15:40:41 +11:00
Cheese
6762e4b537 Merge branch 'SpecRemoveCreative' of ssh://184.154.0.242:7999/min/Mineplex into SpecRemoveCreative 2015-03-13 11:34:57 +11:00
Cheese
c5d48a82a3 Fixed invisibility bug 2015-03-13 11:34:45 +11:00
Shaun Bennett
b18ea22df4 Fix spectator gui bug 2015-03-12 15:50:46 -04:00
Cheese
3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11:00
Shaun Bennett
f660620e4b Revert "Pre-Frost changes" 
This reverts commit dbeea5bf69.
 2015-03-11 22:18:29 -04:00
Cheese
bf901b2280 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-12 12:15:48 +11:00
Cheese
8e77d1fc21 more event server updates 2015-03-12 12:14:49 +11:00
libraryaddict
9cf0e4d1e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-11 13:17:16 +13:00
libraryaddict
f47447134e Cleanup hologram class, remove witherskull option for 1.8 and fix duplicate nametags and non-invisibility on armorstands 2015-03-11 13:16:00 +13:00
Tim Ziankoski
759db08679 Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex" 
This reverts commit 2e06a272b4, reversing
changes made to e443b41e15.
 2015-03-09 17:24:01 -04:00
Tim Ziankoski
2e06a272b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-09 16:43:00 -04:00
Cheese
e443b41e15 removed unfinished code 2015-03-09 22:16:08 +11:00
Cheese
3a0e597276 more event server stuff 2015-03-09 22:15:24 +11:00
libraryaddict
dbeea5bf69 Pre-Frost changes 2015-03-09 05:17:04 +13:00
Tim Ziankoski
ac4b495301 Created internationalization helper class and began i18n process 2015-03-07 20:50:47 -05:00
Cheese
e0ba667613 old chests drop a little more frequently 2015-03-07 11:53:18 +11:00
Cheese
f2a71b2ea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-07 11:13:30 +11:00
Cheese
683f86bd89 event server fixes and parser gamtypes 2015-03-07 11:13:17 +11:00