Commit Graph

2768 Commits

Author SHA1 Message Date
Thanos paravantis
1f22883c13 Refactoring challenge selection and updating. 2016-01-31 16:57:54 +02:00
Thanos paravantis
0e1a14a0c3 Countdown modifications, refactoring, dogs vs cats challenge changes. 2016-01-30 21:52:18 +02:00
Thanos paravantis
69dc888657 Refactoring. 2016-01-30 21:07:00 +02:00
Thanos paravantis
215fe68575 Start code refactoring. 2016-01-30 17:19:33 +02:00
Thanos paravantis
e3a9f4f2f7 Chicken attack changes, refactoring, update map crumble variable access. 2016-01-30 14:14:55 +02:00
Thanos paravantis
c5a9f0c42c Chicken attack bug fixes, death effect improvements. 2016-01-30 00:13:41 +02:00
Thanos paravantis
0530ea28e7 Improve chicken attack, fix mini oitq arrow damage. 2016-01-29 19:15:37 +02:00
Thanos paravantis
72fb2317b9 Update team creation and winner placement, fix NPE on Veteran Tracker. 2016-01-23 14:31:36 +02:00
Thanos paravantis
a74d4fa960 Working on chicken attack when a player looses all of his lives. 2016-01-22 23:59:29 +02:00
Thanos paravantis
44de231c7d Start implementing chicken attack on player death. 2016-01-21 21:35:14 +02:00
Thanos paravantis
821ff58ab0 Merge branch 'master' into thanos-mineware
Conflicts:
	.gitignore
2016-01-17 14:03:00 +02:00
Thanos paravantis
2ffaf61135 Rename methods starting with a capital letter, change several event method names and refactor classes and cleanup imports. 2016-01-13 18:40:37 +02:00
Thanos paravantis
2795c858d7 Don't allow air blocks to be added to the block modification list. Add /skip without the need to use the async chat event. 2016-01-12 18:31:05 +02:00
Shaun Bennett
2df626b35e Fix CustomDataManager crash 2016-01-08 18:06:33 -05:00
Shaun Bennett
511b39caa7 Merge branch 'master' into develop 2016-01-08 17:05:54 -05:00
Thanos paravantis
a1759a9fe3 Fix anvils not spawning from start and make the wave harder on anvil dance challenge. 2016-01-08 21:36:54 +02:00
Thanos paravantis
c1d65ed382 Do not allow score to increment above the max number on dogs vs cats challenge. 2016-01-08 17:51:00 +02:00
Thanos paravantis
45c40f5568 Fix map generation on mine a diamond challenge. 2016-01-08 17:35:17 +02:00
Thanos paravantis
e114b623bd Update water horror challenge to the latest version. Fix NPE on player quit. 2016-01-08 15:03:58 +02:00
Thanos paravantis
7d79a47093 Update water horror challenge to the latest version. Change death effect skull, hologram and particle height. 2016-01-08 13:21:20 +02:00
Sarah
5482d1dc40 Fixing "kicked for Flying" 2016-01-08 12:17:28 +01:00
Shaun Bennett
6096fcad42 Fix hotbar issues 2016-01-08 04:06:11 -05:00
Shaun Bennett
504d9d508c Slightly reduce Squid's Ink Blast damage in SSM 2016-01-08 03:15:30 -05:00
Shaun Bennett
d361ce948e Merge branch 'develop' into william-gladiators
# Conflicts:
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
2016-01-08 02:21:32 -05:00
Shaun Bennett
19bb44cb9a Disable HolidayManager and HolidayGiftManager 2016-01-08 01:41:02 -05:00
Shaun Bennett
003af1b87c Disable Holiday Words in DMT and Build 2016-01-08 01:38:49 -05:00
Shaun Bennett
b6b455c1c0 Merge pull request #117 in MIN/mineplex from clans/alpha to develop
* commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits)
  Added C.Mod rank, and started on rank info.
  changed outpost forcefields to be a bit larger to surround the outpost more.
  made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
  added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
  fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
  fixed outpost being built instantly on output block place.
  holograms above outpost block should be centered in the block and made them despawn on outpost death
  legendary pickkup message fix (FINALLY FIXED NOW )
  quick modification to outposts, and fixed the legendary announcements being weird
  updated clans version
  quikc change
  outpost changes, and some other things
  lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".
  fixes (?)
  lots of changes that i can't remember at this point
  Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players.
  player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
  a couple more prettificatons to pvp timer messages.
  one more quick message change/fix
  qa changes to pvp safety
  ...
2016-01-08 00:35:15 -06:00
NewGarbo
fff6d8e03f added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around. 2016-01-07 19:36:52 +00:00
NewGarbo
d88b14d9d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-07 09:35:07 +00:00
Thanos paravantis
dafd336526 Add water horror challenge idea, fix death effect hologram height. 2016-01-07 00:06:32 +02:00
libraryaddict
de6f6cf5f0 Add a IsLive check in Spleef 2016-01-07 08:49:26 +13:00
Thanos paravantis
71a0cd44a2 Format anti hack fix class. 2016-01-06 14:47:34 +02:00
Morten
82163e376b Minor stuffs. Waiting for the build team to make us a chicken c: 2016-01-05 23:42:42 +01:00
Sarah
db2cddc443 Fixing Join/Quit messages 2016-01-05 19:10:40 +01:00
Shaun Bennett
10eb65a8d6 Merge pull request #114 in MIN/mineplex from bugfix/disguise-command to develop
* commit 'dd6d7b1b96947a400911bc5fa310039ab147c159':
  updating denial message
  Love you Sarah <3
  Fixing Disguise File
  update /Disguise for Hub as well
  updating /disguise
2016-01-04 15:58:43 -06:00
Shaun Bennett
652084d071 Merge pull request #115 in MIN/mineplex from bugfix/thanos to develop
* commit '3770211e66b41e16440609a0a79b3999b9b6cca7':
  Turf Wars: Include Teddy's border fix.
  Turf Wars: Undo bracket formatting.
  Turf Wars: Apply knockback on all players when there are only two in the match.
  Turf Wars: Add comment on block physics event.
  Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
2016-01-04 15:56:32 -06:00
Thanos paravantis
3770211e66 Turf Wars: Include Teddy's border fix. 2016-01-04 22:58:11 +02:00
Morten
f24cc35ef8 Made some bugfixes and made a challenge harder 2016-01-04 21:13:12 +01:00
Thanos paravantis
982e684a45 Turf Wars: Undo bracket formatting. 2016-01-04 21:42:58 +02:00
Thanos paravantis
47c78bcba1 Turf Wars: Apply knockback on all players when there are only two in the match. 2016-01-04 17:19:40 +02:00
Thanos paravantis
f6ce98f65b Turf Wars: Add comment on block physics event. 2016-01-02 23:33:08 +02:00
Thanos paravantis
03c6395a30 Turf Wars: Fix sneaking near turf edge and wool placement near ladders. 2016-01-02 23:30:27 +02:00
Sarah
dd6d7b1b96 updating denial message 2016-01-02 16:45:15 +01:00
Thanos paravantis
5ac841dbf1 Merge branch 'master' into thanos-mineware 2016-01-02 16:34:30 +02:00
Thanos paravantis
a0d5a8229f Change /restrict command, update death effect. 2016-01-02 16:33:21 +02:00
Thanos paravantis
b3e2d67152 Change death effect skull and item spawn height, add /restrict <challenge> command. 2016-01-02 15:27:44 +02:00
Morten
7e1b0b9110 Love you Sarah <3 2016-01-02 03:19:39 +01:00
Thanos paravantis
c0a397b9fb Add particles on death effect, started working on chicken attack. 2016-01-01 17:39:16 +02:00
Thanos paravantis
e89785963a Change kit helmet to skull. 2016-01-01 15:35:45 +02:00
Thanos paravantis
bd63ff84e7 Add missing DeathEffectData and DeathText. 2016-01-01 15:30:16 +02:00