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 |
|
Cheese
|
c4e93180fa
|
Merge branch 'master' into smash-champs-balance
|
2015-10-30 13:00:30 +11: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 |
|
Shaun Bennett
|
40afcaf26b
|
Global Packet Commands
|
2015-10-23 15:07:53 -04:00 |
|
Cheese
|
af208da953
|
Merge branch 'alex-testrank'
|
2015-10-23 18:10:59 +11:00 |
|
Cheese
|
d9d0254e46
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-23 17:30:59 +11:00 |
|
Shaun Bennett
|
e3e7dd4694
|
Titan rewards from mythical chests
|
2015-10-23 02:08:31 -04:00 |
|
AlexTheCoder
|
1512d87f9e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
|
2015-10-23 00:28:32 -04:00 |
|
William Burns
|
e6bec41ca8
|
Fix "code too large" error.
|
2015-10-21 20:29:44 +01:00 |
|
Cheese
|
d901cfa12c
|
buildies can join full
|
2015-10-18 10:54:34 +11:00 |
|
Cheese
|
41b6fdc74e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-16 21:47:35 +11:00 |
|
Cheese
|
32489388c6
|
removed bug fix that caused SG break
|
2015-10-16 21:47:22 +11:00 |
|
Jonathan Williams
|
62b209fede
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-16 01:57:30 -05:00 |
|
Jonathan Williams
|
d00fa856f3
|
Fixed Pets so they work correctly.
Also fixed legend benefits.
Fixed chest pet rewards.
|
2015-10-16 01:57:19 -05:00 |
|
Cheese
|
016cea15f3
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-16 15:01:59 +11:00 |
|
Mysticate
|
b8eb924ffa
|
Fixed timing out. Yay. I'm done. G'night
|
2015-10-16 00:00:08 -04:00 |
|
Cheese
|
577c67cacd
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-16 14:18:35 +11:00 |
|
Mysticate
|
f0a22d5c36
|
Fixed hammer throw
|
2015-10-15 23:02:51 -04:00 |
|
Mysticate
|
f0e0d41c42
|
Fixed two things.
|
2015-10-15 22:23:49 -04:00 |
|
Cheese
|
6cc33fd6c6
|
Merge branch 'thanos-bug-fixes'
|
2015-10-16 12:53:43 +11:00 |
|
Mysticate
|
a049d7666f
|
Merge remote-tracking branch 'origin/master' into monster-maze
|
2015-10-13 22:14:19 -04:00 |
|
AlexTheCoder
|
dceba51060
|
- Fix random blockhunt bug with mounts and infestor
|
2015-10-12 03:09:40 -04:00 |
|
Cheese
|
2b9a66e7b2
|
more ssm update
|
2015-10-12 16:32:23 +11:00 |
|
Cheese
|
6a173073a4
|
added flag to projectiles
work on cow kit
|
2015-10-12 14:39:14 +11:00 |
|
Mysticate
|
3eb36a6581
|
Prevented farming
|
2015-10-11 22:43:21 -04:00 |
|
Mysticate
|
b6d573a4d5
|
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
|
2015-10-11 22:25:25 -04:00 |
|
Mysticate
|
7a4ccdf680
|
Bug fixes
|
2015-10-11 22:17:34 -04:00 |
|
Mysticate
|
dda65b4c77
|
Fixed tnt exploding lobbies
|
2015-10-11 19:56:36 -04:00 |
|
Mysticate
|
20dd9c683b
|
Merge remote-tracking branch 'origin/master' into monster-maze
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
Changed the scoreboard a bit, added it to MPS.
|
2015-10-11 10:52:45 -04:00 |
|
Mysticate
|
606937d227
|
Fixed flashbang glitch
|
2015-10-11 09:42:36 -04:00 |
|
Cheese
|
cb9e8f8e0b
|
pumpkin smasher achievement
|
2015-10-11 14:48:02 +11:00 |
|
Mysticate
|
435e74225a
|
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
|
2015-10-10 23:35:33 -04:00 |
|
Mysticate
|
83d1e011fc
|
Changes.
|
2015-10-10 23:33:54 -04:00 |
|
Cheese
|
8b75664627
|
queued holiday transactions
|
2015-10-11 12:54:35 +11:00 |
|
Cheese
|
6860fa608a
|
titan placeholder perks
art
fixed pumpkin gem count
|
2015-10-11 11:26:09 +11:00 |
|
Mysticate
|
5a8e500ec0
|
Fixed another thing
|
2015-10-10 16:15:10 -04:00 |
|
Mysticate
|
5e7ddb968e
|
Changes and bug fixes.
|
2015-10-10 15:54:18 -04:00 |
|
Cheese
|
da6b1316d3
|
removed pumpkins from MPS
|
2015-10-10 22:47:19 +11:00 |
|
Cheese
|
6f14c75f70
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-10 19:28:26 +11:00 |
|
Cheese
|
6cf786eb8c
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-10 19:28:08 +11:00 |
|
Cheese
|
1026a2ae22
|
fixed explosions
|
2015-10-10 19:27:54 +11:00 |
|
Shaun Bennett
|
a242c6b592
|
Halloween Update finishes
|
2015-10-10 03:23:37 -04:00 |
|
Cheese
|
7bc3b4970b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
|
2015-10-10 17:34:17 +11:00 |
|
Mysticate
|
7851cb451a
|
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
|
2015-10-09 22:34:05 -04:00 |
|