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

7659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlexTheCoder
16c03ebb48 - Silly skeletons! Swimming is for players! 2016-02-15 21:54:18 -05:00
md_5
8893db60d7 Fix highly annoying exception in Reindeer mount. 2016-02-16 12:46:39 +11:00
Shaun Bennett
37757ad7de Add TypeWars to MPS 2016-02-15 18:55:13 -06:00
AlexTheCoder
53ac1827bc Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-15 19:13:20 -05:00
AlexTheCoder
8d1b270089 - Balancing and bugs 2016-02-15 19:12:25 -05:00
Shaun Bennett
904798ec22 Delete libraries directory/old craftbukkit jar (now in Patches folder) 2016-02-15 18:10:44 -06:00
md_5
6d7dbf6c67 Fix Sentry when running from shaded jar. 2016-02-16 10:51:16 +11:00
Shaun Bennett
95c22a59fd Use DNS for chat filter 2016-02-15 16:30:57 -06:00
Shaun Bennett
d1e098ca13 Merge remote-tracking branch 'origin/develop' into develop 2016-02-15 20:44:52 -06:00
Shaun Bennett
15ed2570e2 Valentines final changes, Change Gift Giver achievement 2016-02-15 20:43:46 -06:00
xGamingDudex
85b8937801 Hats, supposed to go in the previous one 2016-02-15 16:39:04 +01:00
xGamingDudex
7d8ffa1311 Small stuff 2016-02-15 16:38:18 +01:00
NewGarbo
a5de88e6ee accidentally added those ifles 2016-02-15 11:25:33 +00:00
NewGarbo
e25accfba4 outpost saving and loadi9ng 2016-02-15 11:24:29 +00:00
md_5
7b36892328 Store craftbukkit jar in repo for ease of use. 2016-02-15 10:06:47 +11:00
md_5
bc3002134f Update + Rebuild Patches. 2016-02-15 10:01:14 +11:00
md_5
305973198c Merge remote-tracking branch 'origin/md_5/sentry' into develop 2016-02-15 09:20:34 +11:00
AlexTheCoder
f0d59755d2 - Update 2016-02-14 03:31:36 -05:00
phobia
d7ad2cdc58 moar undead fixes 2016-02-14 12:37:37 +11:00
NewGarbo
93a5ca6777 weapons need to be centered 2016-02-14 00:45:54 +00:00
phobia
24254635a8 Fixes to observer settings 2016-02-14 09:51:59 +11:00
AlexTheCoder
f6c38903f2 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-13 14:34:11 -05:00
AlexTheCoder
6385aacbac - Updates 2016-02-13 14:28:39 -05:00
AlexTheCoder
138c900484 - Fixed up for more universal damage switching 2016-02-13 12:46:57 -05:00
AlexTheCoder
8b39d7ba43 - Void damage fix 2016-02-12 23:16:56 -05:00
AlexTheCoder
ea893bfa48 - Fixed update 2016-02-12 23:03:38 -05:00
AlexTheCoder
197bcc9dbf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
 2016-02-12 21:23:58 -05:00
AlexTheCoder
9595a0ffae - Lot of stuff 2016-02-12 21:22:00 -05:00
NewGarbo
e6eb43ada8 PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK 2016-02-12 19:58:40 +00:00
Shaun Bennett
0d19a8017f Update Featured arcade game, various bug fixes 2016-02-12 06:51:30 -06:00
Shaun Bennett
e8559d423a Add Valentines Vendetta to quick server menu 2016-02-12 05:27:50 -06:00
Shaun Bennett
960a0cdabb Fix constructor error, add ValentinesGiftManager to Arcade 2016-02-12 05:06:13 -06:00
Shaun Bennett
eca400278c Support server update 2016-02-12 05:00:09 -06:00
Shaun Bennett
1e596a6969 Valentines rewards 2016-02-12 04:54:09 -06:00
Shaun Bennett
66aa89b5e0 Fix sheep look bug, valentines gift effects, valentines achievements 2016-02-12 04:32:26 -06:00
Shaun Bennett
dfd61833b7 Valentines changes 2016-02-12 03:03:47 -06:00
Shaun Bennett
4f0f81c8df Update Courtship messages 2016-02-12 01:47:20 -06:00
Shaun Bennett
d51e26a5a4 Valentines game adjustments 2016-02-12 01:34:29 -06:00
NewGarbo
90570c1185 progress on saving outposts/wepaons so far. not finished. probably going to change it to a different format 2016-02-12 07:00:21 +00:00
Shaun Bennett
d8965179f7 More valentines adjustments/fix gladiators tutorial being enabled 2016-02-11 23:01:59 -06:00
Shaun Bennett
2eeddb828b Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop 
* commit '51d152d48473f820ab6d03586fb41f890750f645':
  Perfect build all fix
  Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
  Stop mid game joiners from getting participation gems.
  Mob egg baby fix. Also fixed non build entities from being "broken"
  spec command add guardian
  The infamous look direction bounce bug
  Chiss' double jump mechanic
  Moar fixes
  Hopper item pickup fix.
 2016-02-11 22:59:35 -06:00
William Burns
790ed4f993 Fix tools for block type/colour selections. 2016-02-11 08:11:40 +00:00
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