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
cf26541461
- More Bugfixes
2015-10-28 18:16:52 -04:00
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
5ec932d1ca
Fixing bugs
2015-10-28 14:36:48 +13:00
0ab3213b7b
- Fixed permanent dwarf toss bug
...
- Fixed skills being active while player is editing class
2015-10-27 01:38:41 -04:00
9d6a361602
- Fixed emerald jump for Relyh
2015-10-26 23:42:52 -04:00
f5b4f28848
- Fixed achievements
...
- Various balance patches/audio changes
2015-10-26 00:25:33 -04:00
08fd1b5790
- Fixed MPS Whitelist for usernames with non-lowercase characters
2015-10-24 20:49:09 -04:00
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
e3c824c512
Fix minor skywars error
2015-10-24 13:32:55 +13:00
4d2b359aad
Fix wolf cub strike
2015-10-24 08:41:10 +13:00
43cd0f86a9
Fix players unable to break blocks at spawn
2015-10-24 08:40:57 +13:00
40afcaf26b
Global Packet Commands
2015-10-23 15:07:53 -04:00
d51b23849a
- Fixed bugs and added features
2015-10-23 03:24:01 -04:00
f7dab72e8c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-10-23 03:23:35 -04:00
af208da953
Merge branch 'alex-testrank'
2015-10-23 18:10:59 +11:00
d9d0254e46
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-23 17:30:59 +11:00
e3e7dd4694
Titan rewards from mythical chests
2015-10-23 02:08:31 -04:00
9ceb4eee94
- Take will and QA's suggestion about making the gameplay modifier a proper feature
2015-10-23 00:48:31 -04:00
1512d87f9e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-23 00:28:32 -04:00
91ddcdb149
- Testing setup
2015-10-23 00:25:38 -04:00
5a94e33d5e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-10-23 00:24:52 -04:00
53aa1b655b
Remove custom formatter because it trims too short, don't need to commit it. Cleaned up CustomTagFix
2015-10-23 09:20:24 +13:00
8cde506a2c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-10-23 05:25:36 +13:00
ddb8d592f8
Remove all is1_8 checks
2015-10-22 18:37:14 +13:00
e6bec41ca8
Fix "code too large" error.
2015-10-21 20:29:44 +01:00
07f032a5d2
Fix wither pet making sounds, fixed worldtime.
2015-10-21 04:22:31 +13:00
5d671d3300
Fix borders
2015-10-20 04:37:42 +13:00
55f97ef984
More fixes, along with a fix for Block Hunt
2015-10-19 06:21:16 +13:00
547c8ca726
- Bugfixes
2015-10-18 06:14:54 -04:00
12319169a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java
2015-10-18 00:54:18 -04:00
d901cfa12c
buildies can join full
2015-10-18 10:54:34 +11:00
6f91827d57
Vector to Vector3f, updated Maze to 1.8
2015-10-18 12:40:01 +13:00
3a0781b3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
2015-10-17 00:10:32 +13:00
14a524cf54
Stuff
2015-10-17 00:08:30 +13:00
41b6fdc74e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-16 21:47:35 +11:00
32489388c6
removed bug fix that caused SG break
2015-10-16 21:47:22 +11:00
f71cb80bd0
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/minestrike/MineStrike.java
2015-10-16 22:26:07 +13:00
70c76d976f
More changes
2015-10-16 22:10:13 +13:00
62b209fede
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-16 01:57:30 -05:00
d00fa856f3
Fixed Pets so they work correctly.
...
Also fixed legend benefits.
Fixed chest pet rewards.
2015-10-16 01:57:19 -05:00
016cea15f3
Merge branch 'Myst_HALLOWEEN'
2015-10-16 15:01:59 +11:00
b8eb924ffa
Fixed timing out. Yay. I'm done. G'night
2015-10-16 00:00:08 -04:00
577c67cacd
Merge branch 'Myst_HALLOWEEN'
2015-10-16 14:18:35 +11:00
f0a22d5c36
Fixed hammer throw
2015-10-15 23:02:51 -04:00
f0e0d41c42
Fixed two things.
2015-10-15 22:23:49 -04:00
6cc33fd6c6
Merge branch 'thanos-bug-fixes'
2015-10-16 12:53:43 +11:00
3dda9352e7
Progress
2015-10-16 13:32:23 +13:00
4205dc6c25
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/halloween/Halloween.java
2015-10-15 12:34:34 +13:00
f683e932ae
Clans merge fixes
2015-10-13 22:24:15 -04:00
a049d7666f
Merge remote-tracking branch 'origin/master' into monster-maze
2015-10-13 22:14:19 -04:00
88709f85b6
Merge with master
2015-10-13 18:13:01 -04:00
58a86c5abb
That's the easy stuff done..
2015-10-13 19:49:15 +13:00
0bd026f506
- Fixed merge issues
2015-10-12 18:04:35 -04:00
f497eab633
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-10-12 17:54:11 -04:00
dceba51060
- Fix random blockhunt bug with mounts and infestor
2015-10-12 03:09:40 -04:00
2b9a66e7b2
more ssm update
2015-10-12 16:32:23 +11:00
6a173073a4
added flag to projectiles
...
work on cow kit
2015-10-12 14:39:14 +11:00
3eb36a6581
Prevented farming
2015-10-11 22:43:21 -04:00
b6d573a4d5
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-11 22:25:25 -04:00
7a4ccdf680
Bug fixes
2015-10-11 22:17:34 -04:00
dda65b4c77
Fixed tnt exploding lobbies
2015-10-11 19:56:36 -04:00
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
606937d227
Fixed flashbang glitch
2015-10-11 09:42:36 -04:00
cb9e8f8e0b
pumpkin smasher achievement
2015-10-11 14:48:02 +11:00
435e74225a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-10 23:35:33 -04:00
83d1e011fc
Changes.
2015-10-10 23:33:54 -04:00
8b75664627
queued holiday transactions
2015-10-11 12:54:35 +11:00
6860fa608a
titan placeholder perks
...
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
5a8e500ec0
Fixed another thing
2015-10-10 16:15:10 -04:00
5e7ddb968e
Changes and bug fixes.
2015-10-10 15:54:18 -04:00
da6b1316d3
removed pumpkins from MPS
2015-10-10 22:47:19 +11:00
6f14c75f70
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 19:28:26 +11:00
6cf786eb8c
Merge branch 'Myst_HALLOWEEN'
2015-10-10 19:28:08 +11:00
1026a2ae22
fixed explosions
2015-10-10 19:27:54 +11:00
a242c6b592
Halloween Update finishes
2015-10-10 03:23:37 -04:00
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
88b4ac96e5
- Achievement stuff
2015-10-09 23:15:19 -04:00
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
aa9fd1abf3
Titan giveaway work
2015-10-09 22:14:10 -04:00
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
7dbd9da582
dragon sale Bar
2015-10-10 10:35:48 +11:00
97ef4a4252
Pushing titan giveaway stuff for laptop
2015-10-09 18:23:47 -04:00
ff1431b652
Fixed players glitching to chests before game starts.
2015-10-09 10:21:35 -04:00
c03c8163c5
fixed exploision stuff
2015-10-09 14:01:58 +11:00
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
598ea84e7a
Fixed explosions and cleaned up.
2015-10-08 22:52:57 -04:00
d18353e592
Merge branch 'Myst_HALLOWEEN' of ssh://184.154.0.242:7999/min/Mineplex into Myst_HALLOWEEN
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-09 13:44:41 +11:00
41678eaf35
fixed scoreboard bug
2015-10-09 13:42:37 +11:00
1011c36c43
Fixed lobby being destroyed.
2015-10-08 22:41:45 -04:00
96f14f4fda
Fixed kit item names.
2015-10-08 22:31:20 -04:00
3802d47a37
Made the thing bold.
2015-10-08 22:29:22 -04:00
082b16fe0d
Stuff and things to help make mounts be cool.
2015-10-08 22:28:07 -04:00
a234fbce1e
Merge branch 'Myst_HALLOWEEN'
2015-10-09 12:17:57 +11:00
ed31bf9886
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-08 21:16:24 -04:00
9254ca9162
K reverted + fixed bug
2015-10-08 21:12:38 -04:00
483ab13c2b
workaround for error where accountid is never set
2015-10-09 12:04:35 +11:00
2cace7419f
Made Destructor sexi
2015-10-08 20:42:29 -04:00
92bab25a3f
Fixed Gust void stealing.
2015-10-08 20:38:33 -04:00
b8597d7161
Paintball stats.
2015-10-08 20:37:26 -04:00
97d6f8fb42
Fixed placing walls in water.
2015-10-08 19:10:19 -04:00
8f826f6e83
Fixed blocks falling into floor in Build.
2015-10-08 19:04:51 -04:00
30e3c56635
Fixed ground issues in BUILD.
2015-10-08 18:58:30 -04:00
46bf963d44
Fixes not being able to reload dropped guns w/ 0 ammo.
2015-10-08 18:56:23 -04:00
979e68dcc7
Fixed the Minestrike multiple grenades bug.
2015-10-08 18:41:40 -04:00
ef62fb5adf
Made it so that when played on an MPS, HH won't give items. Yay!
2015-10-07 22:57:30 -04:00
8a8591ae7f
Merge branch 'master' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
Myst_HALLOWEEN
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java
2015-10-07 22:19:10 -04:00
e864e0867a
Adds mount spider and fixes a BH bug.
2015-10-07 21:47:10 -04:00
3c437925f1
halloween prep
2015-10-08 12:36:00 +11:00
191392825f
Merge branch 'Myst_EVO'
2015-10-08 12:07:21 +11:00
c94184c5ae
reduced number of falling blocks in skywars by 80%
...
added halloween horror mount
2015-10-08 12:04:28 +11:00
5378ece214
Fixed chicken being able to fly..
2015-10-06 21:09:53 -04:00
a0d0590777
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-10-06 21:04:49 -04:00
643f47763e
Improved consistency with the F5 message
2015-10-04 20:28:21 -04:00
0de34c15ab
NO more endercrystal go boom boom yay
2015-10-04 20:23:41 -04:00
9c1ba5f3d1
Changes on bomb error messages after QA recommendations.
2015-10-04 21:23:50 +03:00
c2518bc6c4
Some additional bug fixes were applied on the previous commit.
...
Water damage by TNT on game lobbies is now patched.
2015-10-04 16:32:34 +03:00
026c596de2
Minestrike bug fixes and minor changes
...
- Added a right-click message tip when the player with a bomb tries to place by left clicking.
- Changes in one of the tip messages while in game lobby.
- Moltovs and Incendiaries were not triggered once thrown to the ground.
- Players were able to extinguish grenade fire with a knife.
- The bomb was able to be planted after a round was over.
- On sniper rifles, scope was not removed if the match was ended.
2015-10-04 13:22:12 +03:00
2504493ebc
Fixed four super paintball bugs.
...
- Projectiles could paint wool in the waiting lobby.
- When players fell in the void, they didn't got killed.
- Players that were painted could take off their armor.
- Players that were painted could logout and the skeleton would still stay there.
2015-10-04 00:34:00 +03:00
a7ab0cd723
ADDED MORE KITS I'M DONE HOORAY LOVE ME @CHISS
2015-10-02 22:43:29 -04:00
c9ff420a79
Now chooses a different maze every game.
2015-10-02 20:43:57 -04:00
3f6490f14a
Gave health on safe pad <<<<<3
2015-10-01 10:47:37 -04:00
a6d7cccbe5
Fixes
2015-09-30 22:31:03 -04:00
4a023c4644
Tweaks - I THINK I'M DONE HOORAY
2015-09-30 21:21:29 -04:00
05b735ba40
Fixed jump system
2015-09-30 20:28:35 -04:00
c39806a4e3
Kewl stuff. Yay
2015-09-30 20:01:51 -04:00
09ef2d73ae
Grammar <3
2015-09-30 19:45:29 -04:00
68c6ba595e
Visual enhancements.
2015-09-30 19:31:36 -04:00
d089ffeb30
Added a firework when a mob gets rekt
2015-09-30 18:48:45 -04:00
250e9cff13
Fixed a possible NPE
2015-09-30 18:43:52 -04:00
a25e2c575d
Peace of mind stuff.
2015-09-30 18:35:56 -04:00
86cdd7a30e
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-10-01 04:39:26 +13:00
c3b2c10934
FINALLY FIXED THIS MONSTER MAZE BUG :D
2015-09-29 19:14:18 -07:00
b4c9bfbb57
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
Plugins/Mineplex.Hub/.classpath
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
2015-09-29 18:09:52 -04:00
2d173a5be4
Fixed a jumper perk.
2015-09-28 21:03:58 -04:00
bcfd8fcec7
bug fixes:
...
- fixed bugs
- fixed more bugs
- after that, more bugs were fixed
2015-09-28 17:54:56 -07:00
8a9cc9ff14
Food Dupe Fix
2015-09-28 20:42:14 -04:00
00eecc0325
Fixes
2015-09-28 20:33:38 -04:00
3a10677b10
AI bug should be fixed, I need Mysticate to test though
2015-09-28 15:15:51 -07:00
92436c8f9d
Merge pull request #60 in MIN/mineplex from alex-bugfixes to master
...
* commit '8a94602aefc1e4ea3490da434f14205f99ba1d8e':
Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text
Made rank unlock lore colored based on rank required for item (QA Requested)
Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for.
Marked the Bunny Morph to reflect its no longer available status
Fixed previous ownership not being transferred
Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts
Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui
2015-09-27 22:39:50 -05:00
5a5dbcfe67
- Assorted bugfixes
2015-09-27 23:36:51 -04:00
00a8cf769b
Swag
2015-09-27 14:55:37 -04:00
7e40d0d4bb
Lots of cool stuff
2015-09-27 12:10:52 -04:00
eea7ef8350
Swag
2015-09-27 02:11:28 -04:00
54eca7fa9e
Lots of work.
2015-09-26 23:18:05 -04:00
cddc6674a5
- Fixed bug with Dwarf Toss
2015-09-26 19:22:17 -04:00
9350386361
Lots of things. :D
2015-09-26 15:08:43 -04:00
8e9a3e90a7
Merge branch 'monster-maze' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
2015-09-26 00:00:46 -04:00
30d2281785
Lots of things
2015-09-25 23:59:31 -04:00
1e018cf74a
Improved Smasher
2015-09-25 20:21:06 -07:00
2de409c2f2
Made the mazes do things.
2015-09-25 20:14:46 -04:00
a0ec656bc1
Fixed another tracker.
2015-09-25 12:49:21 -04:00
b2f1f7d2ae
Fixed the tracker for pilot.
2015-09-25 11:38:32 -04:00
1cc503bd3b
- Added resupply points [requested]
2015-09-25 04:37:54 -04:00
03d1d85388
- Testing improvements
2015-09-25 04:23:24 -04:00
7c04e5608d
- Added new achievement 'Clutch'
...
- Made new achievements needed for achievement skills
2015-09-25 04:17:20 -04:00
218aa8c584
- Fixed all formatting
2015-09-25 03:52:34 -04:00
f23ef8eea0
- Returned to temporary placeholder block system to prepare for 1.8 update
2015-09-25 03:41:29 -04:00
88a48277c0
Flags, change to packets
2015-09-25 17:15:09 +12:00
5f45e8c1d3
- Misc changes [increased game time, captures required]
2015-09-25 00:44:28 -04:00
1394df03e0
For now, set all boss battles games to spider
2015-09-25 16:43:53 +12:00
5b42d25bff
- Added achievement and stat stuff
...
- Fixed banner bugs
2015-09-24 23:16:44 -04:00
e66d8765e7
Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze
2015-09-24 23:02:27 -04:00
60c4e5812a
Fixed trackers
2015-09-24 23:02:19 -04:00
69ed764483
Added another maze.
2015-09-24 19:55:43 -07:00
e8725b38ab
Colorize the messages for when a /game start fails
2015-09-25 14:06:35 +12:00
a9f20a573c
Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze
2015-09-24 21:10:31 -04:00
9a70d4997a
Fix
2015-09-24 21:10:12 -04:00
d9b6d8f0e3
Changes
2015-09-24 21:01:18 -04:00
7445fda922
Made the thing a lot better. Yay! :D
2015-09-24 11:04:05 -04:00
4663aa3eaa
updated mazes
2015-09-24 07:29:48 -07:00
5de016c077
Merge branch 'monster-maze' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 23:46:21 -04:00
842da3d6fb
Tons of changes.
2015-09-23 23:44:10 -04:00
a301c87efc
workstuffchanges on monster maze
2015-09-23 19:23:21 -07:00
125b823a65
Fixed achievement arcade page size.
2015-09-23 15:43:14 -04:00
71408fabd2
One thing.
2015-09-23 15:24:34 -04:00
81e780d400
Merge branch 'monster-maze' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MMMazes.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 15:23:08 -04:00
84331901d4
Added achievements and final polish.
2015-09-23 15:18:44 -04:00
d5ef15cd6d
- Trying to fix errors
2015-09-23 14:00:19 -04:00
09e44d3372
- Fixed version stuff
2015-09-23 13:47:49 -04:00
3ee6c5c7c8
- Fix Merge Error
2015-09-23 13:25:41 -04:00
c709980db3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-09-23 13:08:25 -04:00
512714219b
- Visual edits
2015-09-23 13:04:30 -04:00
0ad91a6b0b
more changes! :D
2015-09-23 07:10:48 -07:00
4519f2dda1
Merge branch 'EventGameUpdates'
2015-09-22 14:59:17 +10:00
1f84907309
more changes to monstermaze
2015-09-20 07:40:24 -07:00
05f47be864
- Some fixes
2015-09-19 16:38:07 -04:00
3a1acb9f37
- Code Cleanup
...
- Transitioning to banners fully
- Preparation to remove banner bugs
2015-09-19 00:41:23 -04:00
52a5c63166
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-09-18 20:08:43 -04:00
d4b8cb253c
- Edited messages as per owner request
2015-09-18 20:08:22 -04:00
8015f5428d
Flags stuff
2015-09-19 08:36:23 +12:00
0581474a16
lots of work on Monster Maze
2015-09-18 08:25:11 -07:00
aa30c866fd
flurrry
2015-09-18 10:22:16 +10:00
5e8fc77164
Add pages to spectator and in-progress server menu
2015-09-17 04:34:45 +12:00
e6ecd2d5e1
- Fix for stolen message
2015-09-15 18:38:02 -04:00
362d99a819
Fixing up Gem signs, Effects etc.
2015-09-15 07:10:39 +02:00
6c5c2f4c4e
- Added slowness to flag carriers and removed any active potion effects they had
2015-09-14 20:38:32 -04:00
0035f3abb0
- Added requested flag location updating
...
- Added sudden death mode when the timer runs out and the game is tied, respawning is turned off and the first to capture a flag wins
2015-09-14 18:54:40 -04:00
2018374b06
- Fixed a color bug
2015-09-14 18:53:10 -04:00
abaf94618c
- Increase flag respawn time
...
- Fix flag timer being black
2015-09-14 18:42:08 -04:00
ac269839c5
squid skill
2015-09-14 14:14:06 +10:00
d9142ac33f
smash balance
2015-09-14 12:34:55 +10:00
2de7fff267
Merge remote-tracking branch 'origin/master' into monster-maze
2015-09-13 08:45:34 -07:00
aa8cb8943e
more work on monster maze
2015-09-13 08:42:26 -07:00
7ca6f58108
Adding Gem signs.
2015-09-13 10:25:44 +02:00
a46cb2c274
last fix in the listAreaInfo method.
2015-09-13 00:35:22 +02:00
53d5c2fd0e
adding area info command.
2015-09-13 00:30:55 +02:00
112f94a842
forgot to add command to remove potion effects.
2015-09-13 00:00:47 +02:00
fcec6253cd
fixing @p on signs, adding potioneffects and gadgets to areas.
2015-09-12 23:56:38 +02:00
b6ffee73f5
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates
2015-09-12 21:17:45 +02:00
55ac104e2c
took forever to get it working, but the maze parsing works! :)
2015-09-12 09:50:06 -07:00
119dc8ab52
changed name of method
2015-09-12 15:01:18 +10:00
5c0ada3df6
Implementing RequiredRank file and command.
2015-09-12 06:39:40 +02:00
b56813deef
Improving /e commands (/e kick, /e area, etc)
2015-09-12 04:33:10 +02:00
5824ec6df0
lots of changes to monster maze, check trello for list
2015-09-07 07:08:00 -07:00
4240026024
Adding Areas and a few more commands like /e kick and /e tempgadget to the event game.
2015-09-06 18:55:00 +02:00
5712af8ddc
Adding Redstone function signs for events.
2015-09-05 20:38:51 +02:00
c648d7c186
stuff, things...things, stuff (Monster Maze)
2015-09-05 09:30:51 -07:00
9e3f87b71e
more edits to MM
...
- displaying more information
- permanent safezones around the map
- spawn now does not deteriorate, is permanent
2015-09-05 06:41:10 -07:00
271b86dabd
Fixed spectators slowing evolution times.
2015-09-04 11:45:42 -04:00
21d9f5767e
CustomTagFix support changing and removing of names.
2015-09-04 19:23:33 +12:00
03537e4650
fixed a spacing issue
2015-09-04 12:18:02 +10:00
0ec3a8dc10
added radar for ctf and dom
2015-09-04 12:09:26 +10:00
0c58de3c19
Glitches. Fixed the things.
2015-09-01 02:35:06 -04:00
b4ce33a916
Fixed things.
...
• Added a cancelled check to No Ability
• Removed tokens on quit.
• Checked if players are alive before giving them places.
2015-09-01 01:59:36 -04:00
bff9c99e2c
Added system to mount flags on carrier's head for easier identification and disabling of abilities as per Chiss' request
2015-08-31 21:48:25 -04:00
32a257fa55
Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts
2015-08-31 15:11:57 -04:00
58ae09ebd4
saving Project for pulling.
2015-08-31 11:32:18 +02:00
129464a845
Added CTF to MPS menus
2015-08-31 04:42:36 -04:00
cbf8b575c6
Changed data for certain types of spawning
2015-08-31 03:28:22 -04:00
39a79eb818
Fixed a nullpointer
2015-08-31 03:05:43 -04:00
474f1bd0b8
Made CTF follow Chiss' specifications and also added more advanced features
2015-08-31 03:04:18 -04:00
becfbe1f13
Fixed possible game breaking bug :S
2015-08-30 20:09:47 -04:00
33d78a5efd
Fixed eating spider eye. Yay!
2015-08-30 18:39:07 -04:00
6fefcbd953
Kit Changes/Fixes:
...
- Fixed Kit Mobs not opening guis in Champions games
- Fixed Abilities not working in CTF
- Added new event when a player attempts to choose a kit
- Cancelled changing kit while holding a flag
2015-08-30 17:13:08 -04:00
149d37caad
Forgot to commit with actual game
2015-08-30 04:01:01 -04:00
eca69a8ae2
Made new branch up to date and including previous branch's code
2015-08-30 03:58:58 -04:00
47331658ac
Merge remote-tracking branch 'remotes/origin/Myst_EVO'
2015-08-30 00:14:53 -07:00
d944d2e5c4
Merge branch 'Myst_EVO'
2015-08-29 23:54:28 -07:00
64b9cd201c
snake crap
2015-08-29 16:02:14 -07:00
6ae801314c
Fix spawning
2015-08-29 15:07:51 -07:00
5030ae7d57
For Chiss, may the code never break.
2015-08-29 15:03:22 -07:00
f0f9a4c674
Push it like a pushy pushy lady.
2015-08-29 13:46:09 -07:00
b7b81ecaaa
snake
2015-08-29 13:38:40 -07:00
046fa4f8b6
Fixed possible NPE
2015-08-29 14:30:22 -06:00
736d88c82f
All achievements fixed. ^_^
2015-08-29 14:13:15 -06:00
d2bc4b8cb4
SNAAAKE
2015-08-29 13:13:04 -07:00
5d28509474
Snakes tail final location instead of rel movement
2015-08-29 12:38:19 -07:00
e7f861a6c2
Push golem changes, snakes code and rename bossability thingy
2015-08-29 12:04:53 -07:00
97c7980bbc
Fixed evolving into walls.
2015-08-29 10:54:04 -06:00
Aaron Brock
AlexTheCoder
libraryaddict
NewGarbo
Shaun Bennett
Cheese
Shaun Bennett
William Burns
Jonathan Williams
Mysticate
Thanos paravantis
fooify
Ty Sayers
Sarah
Mini-Chiss