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 |
|
AlexTheCoder
|
c518221f6b
|
- Fix Merge Error
|
2015-11-02 22:14:48 -05: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 |
|
Jonathan Williams
|
8838ea75e4
|
Some code cleanup for tasks.
|
2015-11-02 09:37:11 -06:00 |
|
Jonathan Williams
|
3b38302429
|
Optimized TaskManager task locks and calls.
Run all player messages on the main thread.
|
2015-11-02 09:35:35 -06:00 |
|
Jonathan Williams
|
55d028d706
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-01 22:09:58 -06:00 |
|
Jonathan Williams
|
3a0b8d75a2
|
Added new support member.
|
2015-11-01 22:09:50 -06: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 |
|
Shaun Bennett
|
9cf62cfe7f
|
Don't use player skulls until caching is setup and working properly
|
2015-11-01 22:58:22 -05:00 |
|
Cheese
|
cdb0fcae75
|
modified hideme a little :)
|
2015-11-02 14:37:12 +11:00 |
|
Sarah
|
da6bf27c77
|
Staff with a higher rank can see lower rank and same ranked vanished staff.
|
2015-11-02 04:32:07 +01:00 |
|
Jonathan Williams
|
cb96124feb
|
Added extra cleanup for FriendsGUI and AddFriendPage
|
2015-11-01 17:42:23 -06:00 |
|
Jonathan Williams
|
5c2ade8270
|
Updated staff list.
|
2015-10-31 14:55:34 -05:00 |
|
Jonathan Williams
|
f16eee220d
|
Removed Debug messages.
|
2015-10-31 14:55:18 -05:00 |
|
Jonathan Williams
|
073321fb14
|
Refactored TrickOrTreat Stuff.
|
2015-10-31 14:45:42 -05:00 |
|
Cheese
|
92a2c2ebaa
|
fixed npe in kit npc creation
|
2015-10-31 19:55:58 +11:00 |
|
Cheese
|
b8b260bca1
|
fixed expire time on projectiles
|
2015-10-31 19:01:49 +11:00 |
|
Cheese
|
c463b80fe0
|
fixed insta-expire
|
2015-10-31 19:00:28 +11:00 |
|
Cheese
|
5d58c56c27
|
fixed kit bug
|
2015-10-31 18:31:13 +11:00 |
|
Cheese
|
3636fdfba0
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-31 18:23:06 +11:00 |
|
Cheese
|
225f067ab3
|
fixed some projectile stuff
|
2015-10-31 18:22:53 +11:00 |
|
Shaun Bennett
|
cd15df0238
|
Merge remote-tracking branch 'origin/master'
|
2015-10-31 02:13:24 -04:00 |
|
Shaun Bennett
|
71e49854db
|
Add halloween hats
|
2015-10-31 02:10:15 -04:00 |
|
Mysticate
|
1a6617bce1
|
Changes.
|
2015-10-31 02:05:03 -04:00 |
|
Cheese
|
23be8aa1dd
|
removed unncessary stuff
balanced rewards
|
2015-10-31 14:33:41 +11:00 |
|
Cheese
|
a92a52f009
|
Merge branch 'Myst_TRICKORTREAT'
|
2015-10-31 14:27:06 +11:00 |
|
Mysticate
|
4884032a1a
|
Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3
|
2015-10-30 23:24:32 -04: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 |
|
Shaun Bennett
|
e2947718fe
|
Remove code that wasnt meant to be commited
|
2015-10-29 13:10:10 -04: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 |
|
AlexTheCoder
|
57da1d195a
|
- Resolved randomly using java 8 in this one plugin
|
2015-10-24 20:50:47 -04:00 |
|
AlexTheCoder
|
08fd1b5790
|
- Fixed MPS Whitelist for usernames with non-lowercase characters
|
2015-10-24 20:49:09 -04:00 |
|
Shaun Bennett
|
556d5adcd9
|
Change /global to /globalpacket (fixes conflict with announcement command)
|
2015-10-24 17:46:25 -04:00 |
|
Shaun Bennett
|
0d56eefd44
|
Titan/Rewards adjustments
|
2015-10-24 13:40:17 -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 |
|
Jonathan Williams
|
c719d693dd
|
Added delete benefit call for repository.
Added failsafe in case inventory update didn't apply
Removed 43k benefit.
|
2015-10-21 01:15:09 -05:00 |
|
Cheese
|
768ef4eb97
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-21 13:00:16 +11:00 |
|
Jonathan Williams
|
3ef33bd9c5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-19 01:32:23 -05:00 |
|
Jonathan Williams
|
5e307da15a
|
Fix for inventory failure.
|
2015-10-19 01:32:12 -05:00 |
|
Shaun Bennett
|
6d7f15cd6d
|
Fix hub time after light flicker
|
2015-10-18 18:52:16 -04:00 |
|