Commit Graph

6990 Commits

Author SHA1 Message Date
William Burns
790ed4f993 Fix tools for block type/colour selections. 2016-02-11 08:11:40 +00:00
NewGarbo
67b12f3ae2 loads of progress 2016-02-10 19:24:57 +00:00
William Burns
b3045d38e7 Add colour selection for multiple block types. 2016-02-10 16:34:00 +00:00
NewGarbo
b308d1759f renamed stuff to more sensible stuff. :} 2016-02-10 13:02:55 +00:00
NewGarbo
2be917e623 give enemy info about time before siege and after outpost is built, the health of the outpost 2016-02-10 13:01:31 +00:00
NewGarbo
69bdbdde70 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-02-10 11:54:36 +00:00
NewGarbo
35f0162882 make catapults rideableeeeeee 2016-02-10 11:09:17 +00:00
Cheese
eebe25040e cleaned the particle effects a bit 2016-02-10 16:31:25 +11:00
Shaun Bennett
00f7880dd2 Fix compile error 2016-02-09 21:15:15 -06:00
Shaun Bennett
e3ff25526b Merge pull request #164 in MIN/mineplex from valentines/game to develop
* commit '6800e4ef478e2d1eea5c19ec52a8368ec0bd520a':
  valentines final push
  bug fixes
  more valentines :)
  many valentine, such wow
  val1
2016-02-09 20:28:58 -06:00
Shaun Bennett
f6e091f029 Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop
* commit '57638ff68496b6f10012f8782633066b52a8a715':
  More work on valentines
  Valentines gifts
  Added love potion and hub sheep thing.
  Started on Love Potion system. Switching branches.
  Varius tweaks and changes.
  Added sheep mount to index.
  Added various cosmetic items for Valentines day.
2016-02-09 20:28:37 -06:00
Shaun Bennett
57638ff684 More work on valentines 2016-02-09 16:26:17 -06:00
NewGarbo
43cf4d38ef give player arrow back after failed territory siege declaration arrow thingy fire thingy ehh grammar is not needed at night :} 2016-02-09 21:36:58 +00:00
NewGarbo
e74cefeee8 increased siege weapon placement area, and made outposts handle siege weapons that are placed within them 2016-02-09 19:59:01 +00:00
NewGarbo
e782097563 shouldn't be able to fire weapons whilst in siege wait time 2016-02-09 19:49:25 +00:00
NewGarbo
2b44b88ea2 not being able to fire bow without the correct class and changed arrow to actually be an arrow 2016-02-09 19:48:48 +00:00
NewGarbo
67d1bffe82 npe and clan minimum players set for siege 2016-02-09 19:47:42 +00:00
NewGarbo
9342bee371 das ist gut 2016-02-09 17:05:59 +00:00
Cheese
6800e4ef47 valentines final push 2016-02-09 20:43:24 +11:00
NewGarbo
99ece6eaea add chest with arrwos to outpost. test for clans in area 2016-02-09 05:53:37 +00:00
Shaun Bennett
a868b8b2b8 Valentines gifts 2016-02-08 22:26:33 -06:00
NewGarbo
dd2fe36a3d added "Borderlands" to Clan name blacklist 2016-02-08 22:23:26 +00:00
NewGarbo
052d3c3380 siege system updates 2016-02-08 21:33:12 +00:00
NewGarbo
2c13824f9b possesive method in UtilText 2016-02-08 20:46:45 +00:00
NewGarbo
b8471d7a8e getter for crater size 2016-02-08 20:46:15 +00:00
NewGarbo
3ee3059bc7 against clan needs to have a getter 2016-02-08 18:38:30 +00:00
NewGarbo
9379c4190a add against clan to outpsots and also renamed "clan" to "owner" to make it more obvious 2016-02-08 18:31:03 +00:00
Virizion
51d152d484 Perfect build all fix 2016-02-07 19:05:53 -05:00
Virizion
aaf1fd42f3 Only eliminated players are guardians. Broken blocks/mobs go directly into inventory. 2016-02-07 18:16:36 -05:00
Virizion
b40f018ee2 Stop mid game joiners from getting participation gems. 2016-02-07 17:20:58 -05:00
Virizion
e96b4c4a7f Mob egg baby fix. Also fixed non build entities from being "broken" 2016-02-07 15:59:59 -05:00
Virizion
008fc587b0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-02-07 15:33:37 -05:00
Virizion
7e9ff95ae3 spec command add guardian 2016-02-07 15:27:39 -05:00
Shaun Bennett
a5c5a7c536 Merge pull request #157 in MIN/mineplex from bugfix/bridges-ore-mining to develop
* commit '465f12e210120e316e9252dc4e5b7207b4ae0279':
  Fixed NPE
  Made sure that a valid tool is used before dropping any items.
2016-02-07 14:00:46 -06:00
Shaun Bennett
c059425e9d Remove GiveawayManager (not used anymore) 2016-02-07 13:18:29 -06:00
Mysticate
465f12e210 Fixed NPE 2016-02-07 13:27:38 -05:00
Shaun Bennett
f502c2a693 Fix filtermessage sync calls 2016-02-07 12:15:08 -06:00
Mysticate
a8ff714ee4 Added love potion and hub sheep thing. 2016-02-07 10:19:40 -05:00
md_5
9ea32d0725 Use ERROR for Spigot to ensure we don't blow past our plan limits. 2016-02-07 22:02:48 +11:00
md_5
f7b8dada6d Add Sentry to BungeeCord too. 2016-02-07 21:40:51 +11:00
md_5
2eb365c189 Implement Sentry for exception monitoring. 2016-02-07 20:29:56 +11:00
Cheese
2ab1b51401 bug fixes 2016-02-07 14:09:02 +11:00
Cheese
a35a9ea31f more valentines :) 2016-02-07 13:27:53 +11:00
Mysticate
c1393697f8 Started on Love Potion system. Switching branches. 2016-02-06 14:08:17 -05:00
Shaun Bennett
4f5625d63e Clans Alpha 1.0 changes 2016-02-05 18:42:22 -05:00
phobia
27e4ef784c WP Evade 2016-02-06 08:44:37 +11:00
NewGarbo
9dc34b5a60 better damage calculation and fixed messages for siege weapon damaging 2016-02-05 19:12:12 +00:00
phobia
b0888208d1 More alphs bug fixes 2016-02-05 23:55:38 +11:00
NewGarbo
e448046e4f made inv get cleared on fire 2016-02-05 10:40:53 +00:00
Virizion
2ac7840d71 The infamous look direction bounce bug 2016-02-04 23:54:54 -05:00