NewGarbo
|
1e4b3442fa
|
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
|
2015-10-24 20:45:39 +01: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 |
|
Shaun Bennett
|
f683e932ae
|
Clans merge fixes
|
2015-10-13 22:24:15 -04:00 |
|
Mysticate
|
a049d7666f
|
Merge remote-tracking branch 'origin/master' into monster-maze
|
2015-10-13 22:14:19 -04:00 |
|
Shaun Bennett
|
88709f85b6
|
Merge with master
|
2015-10-13 18:13:01 -04:00 |
|
AlexTheCoder
|
dceba51060
|
- Fix random blockhunt bug with mounts and infestor
|
2015-10-12 03:09:40 -04: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 |
|
Shaun Bennett
|
aa9fd1abf3
|
Titan giveaway work
|
2015-10-09 22:14:10 -04:00 |
|
Cheese
|
02c6eccfda
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
|
2015-10-10 10:36:42 +11:00 |
|
Cheese
|
7dbd9da582
|
dragon sale Bar
|
2015-10-10 10:35:48 +11:00 |
|
Shaun Bennett
|
97ef4a4252
|
Pushing titan giveaway stuff for laptop
|
2015-10-09 18:23:47 -04:00 |
|
Mysticate
|
ff1431b652
|
Fixed players glitching to chests before game starts.
|
2015-10-09 10:21:35 -04:00 |
|
Cheese
|
c03c8163c5
|
fixed exploision stuff
|
2015-10-09 14:01:58 +11:00 |
|
Mysticate
|
90d0fcb36d
|
Merge branch 'Myst_HALLOWEEN' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN
|
2015-10-08 22:53:45 -04:00 |
|
Mysticate
|
598ea84e7a
|
Fixed explosions and cleaned up.
|
2015-10-08 22:52:57 -04:00 |
|