Thanos paravantis
|
d93c2c7108
|
Merge branch 'master' into thanos-mineware
Conflicts:
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java
|
2015-11-11 13:55:28 +02:00 |
|
Thanos paravantis
|
ba9d468619
|
Update Evolution of Combat challenge.
|
2015-11-11 13:49:35 +02:00 |
|
Cheese
|
b3125e40ff
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-11 07:43:01 +11:00 |
|
libraryaddict
|
1a2c163ce2
|
Fix scoreboard out of bounds error
|
2015-11-11 00:03:08 +13:00 |
|
Cheese
|
0a9c97c32a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-10 18:05:01 +11:00 |
|
Shaun Bennett
|
2707173a8b
|
Merge with 1.8 Branch
|
2015-11-10 01:48:33 -05:00 |
|
Cheese
|
83248a8fec
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-10 09:11:27 +11:00 |
|
Cheese
|
0ae5330634
|
squid changes
|
2015-11-10 09:11:10 +11:00 |
|
Jonathan Williams
|
ba7d5bbcdc
|
Fixed Arcade!
|
2015-11-09 03:24:20 -06:00 |
|
libraryaddict
|
79d0466355
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
|
2015-11-07 21:36:36 +13:00 |
|
Cheese
|
f4bf685e96
|
removed halloween hub
removed titan giveaway and pumpkins
|
2015-11-07 13:20:29 +11:00 |
|
Shaun Bennett
|
4add7449eb
|
Merge remote-tracking branch 'origin/master'
|
2015-11-06 21:15:45 -05:00 |
|
Shaun Bennett
|
3893617d58
|
Logitech Giveaway (still needs testing)
|
2015-11-06 21:15:37 -05:00 |
|
Thanos paravantis
|
7009e46693
|
Several updates and bug fixes. Evolution of Combat rework (See ChallengeNewEvolutionOfCombat).
|
2015-11-06 20:25:38 +02:00 |
|
libraryaddict
|
d3d448ccfe
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
|
2015-11-07 04:47:37 +13:00 |
|
libraryaddict
|
cc0f12f6c8
|
Fix player interactions packets not working properly on armorstand and when clicking block behind entity
|
2015-11-07 04:45:02 +13:00 |
|
libraryaddict
|
77125b3a24
|
Don't re-set scoreboard lines
|
2015-11-05 01:10:08 +13:00 |
|
libraryaddict
|
31b4fbec15
|
Fix a null
|
2015-11-05 00:49:26 +13:00 |
|
libraryaddict
|
0352e52a68
|
Tentative beginnings of wider scoreboards
|
2015-11-05 00:42:45 +13:00 |
|
libraryaddict
|
a0676b7bcf
|
Fix tnt in SG being usable during DM invul
|
2015-11-04 21:44:10 +13:00 |
|
libraryaddict
|
21d10e4bec
|
Fix typo
|
2015-11-04 19:15:06 +13:00 |
|
libraryaddict
|
b3f86ba638
|
Fixing bugs
|
2015-11-04 18:34:22 +13:00 |
|
libraryaddict
|
c25b1969de
|
More progress
|
2015-11-04 04:00:53 +13:00 |
|
AlexTheCoder
|
c41d01e213
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-bugfixes
Conflicts:
Plugins/Mineplex.StaffServer/.classpath
|
2015-11-02 22:09:18 -05:00 |
|
AlexTheCoder
|
89c9f19c69
|
- Fixed MPS Whitelist
|
2015-11-02 22:08:02 -05:00 |
|
libraryaddict
|
975ad9e6ea
|
Update to master
|
2015-11-03 15:05:56 +13:00 |
|
libraryaddict
|
3de906ab19
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
|
2015-11-03 14:57:25 +13:00 |
|
libraryaddict
|
7496ed763a
|
Fix wither and dead bodies bug
|
2015-11-03 14:41:34 +13:00 |
|
Jonathan Williams
|
18bdcbec62
|
Fixed some NPEs with TrickDialogue
Added debug messages for Tricks.
Cleanup of monster targets in HubManager.
|
2015-11-01 22:09:36 -06:00 |
|
Cheese
|
92a2c2ebaa
|
fixed npe in kit npc creation
|
2015-10-31 19:55:58 +11:00 |
|
Cheese
|
5d58c56c27
|
fixed kit bug
|
2015-10-31 18:31:13 +11:00 |
|
Cheese
|
225f067ab3
|
fixed some projectile stuff
|
2015-10-31 18:22:53 +11:00 |
|
Cheese
|
b9d7c80f80
|
cow kit
|
2015-10-31 13:25:57 +11:00 |
|
Thanos paravantis
|
5c2c5ab280
|
Fast Food: Core functionality, workspace update.
|
2015-10-30 20:56:04 +02:00 |
|
Thanos paravantis
|
3ae333a15e
|
Setting up Fast Food Challenge.
|
2015-10-30 17:43:43 +02:00 |
|
Thanos paravantis
|
dca5e06eb9
|
Merge branch 'master' into thanos-mineware
|
2015-10-30 17:14:03 +02:00 |
|
libraryaddict
|
ea1e4b79f7
|
Changes from SnD branch
|
2015-10-30 19:25:02 +13:00 |
|
libraryaddict
|
ed18588a6a
|
Fix missing code and stuff
|
2015-10-30 19:12:04 +13:00 |
|
libraryaddict
|
da0a99d662
|
Spawn facing fixes
|
2015-10-30 16:06:47 +13:00 |
|
libraryaddict
|
50edf557ab
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
|
2015-10-30 15:57:36 +13:00 |
|
libraryaddict
|
388aa1611c
|
Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate
|
2015-10-30 15:44:37 +13:00 |
|
Cheese
|
c4e93180fa
|
Merge branch 'master' into smash-champs-balance
|
2015-10-30 13:00:30 +11:00 |
|
libraryaddict
|
7fca42b0e0
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java
|
2015-10-29 21:41:59 +13:00 |
|
libraryaddict
|
14df456b3d
|
Progres
|
2015-10-29 21:39:38 +13:00 |
|
Aaron Brock
|
acc915c34e
|
Re-added my TurfForts patch, as well as fixed the "Game Changes to build time while spectating so you don't get your blocks" glitch.
|
2015-10-29 01:12:12 -04:00 |
|
Aaron Brock
|
8dd80094b4
|
Fixed a little boolean derp that stopped people from breaking blocks.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 1f0accd )
|
2015-10-28 23:26:18 -04:00 |
|
Aaron Brock
|
9df297fc11
|
Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 76e4dc6 )
|
2015-10-28 23:25:56 -04:00 |
|
libraryaddict
|
0486404c4b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
|
2015-10-28 14:38:34 +13:00 |
|
libraryaddict
|
5ec932d1ca
|
Fixing bugs
|
2015-10-28 14:36:48 +13:00 |
|
Thanos paravantis
|
0d406f1992
|
Evolution of Combat: Removed hunger, added 60 second peace time, several gameplay changes.
|
2015-10-25 13:45:35 +02:00 |
|