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
NewGarbo
27c6ef4e9d
Success! Finished all events woohoo!
2015-11-02 10:16:13 +00:00
NewGarbo
0bc8413430
test
2015-11-02 10:11:54 +00:00
NewGarbo
74c0eac141
Bunch of fixes and new stuff:
...
Cleaned up code everywhere.
Added a ClanCreatedEvent (accidentally formatted ClansDataAccessLayer ooooops)
Removed the tutorialManager access from ClansManager, as it is unneeded now.
Added Lapis Lazuli block particles to Alligator's Tooth (Sammy's request.)
Fixed NPE in TutorialTask#onFinish(Player);
2015-11-02 08:04:38 +00: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
NewGarbo
baa4a744fb
Fixed a whole load of bugs:
...
Fixed the next button occasionally displaying a blank page in the gear GUI.
Fixed not being able to click the back button when selecting a bow in the gear GUI.
Made selectable items glowing in the gear GUI.
2015-10-31 23:11:12 +00: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
Shaun Bennett
bce439d0cf
Merge pull request #70 in MIN/mineplex from Myst_TRICKORTREAT2 to master
...
* commit '1a6617bce1af68b0665323d59b956daf290ca91f':
Changes.
2015-10-31 01:07:55 -05: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
NewGarbo
878f7aeafd
Potentially fixed the problem where your NPC skeleton sticks around after you log in, and attacks you.
2015-10-30 22:48:40 +00:00
NewGarbo
f54da4ee78
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-10-30 22:20:33 +00:00
NewGarbo
396ce75087
Bug fixes/Additions:
...
- Being able to kill clan mates/create mode players who combat log.
- Added a notice that the player was killed, when a player logs back in after being killed when combat logging.
- Fixed Fall Damage making a player unsafe in safe territories.
- Fixed Alligator's Tooth damage.
- Fixed Alligator's Tooth working in lava.
- Added a UtilFile to Mineplex.Core.Common, for all stuff files!
2015-10-30 22:13:19 +00:00
Cheese
c4e93180fa
Merge branch 'master' into smash-champs-balance
2015-10-30 13:00:30 +11:00
Cheese
dc535ff861
art
2015-10-30 12:59:58 +11:00
Shaun Bennett
401350e85d
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-10-29 13:14:33 -04:00
Shaun Bennett
364d8b05af
Fix war invasion
2015-10-29 13:14:27 -04:00
Shaun Bennett
e2947718fe
Remove code that wasnt meant to be commited
2015-10-29 13:10:10 -04:00
NewGarbo
66a4b148e1
Fixed put on armour task being inconsistent.
2015-10-29 13:44:11 +00:00
NewGarbo
0c5e34ad84
Finished the tutorial changes that I wanted to add. Added a few more events for shop stuff, to make the code a bit cleaner. Might continue the idea of more events in Clans. Added an optional argument to QAResetCommand which will allow you to reset to a specific task number. Quite useful when testing tasks that are one of the last ones!
2015-10-29 12:56:00 +00:00
NewGarbo
d0bfb2e2e9
Finishing touches with UtilItem. Lots of changes to tutorials, and added a PlayerEnterTerritory event.
2015-10-29 08:35:24 +00: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
NewGarbo
a063da4cae
Renamed some things to comply with standards. Also moved some of the bit flags around, and moved them into seperate parts.
2015-10-28 22:55:10 +00:00
NewGarbo
afadd61431
Added a few new item categories into UtilItem, and added the bitmasks to the materials belonging to said categories. Changed from using the 32bit int data type, to using the 64bit long data type, this should give me a bit more free space for more categories to put items in to, as I already ran out of space using a regular int.
2015-10-28 22:47:30 +00:00
NewGarbo
cffcf245e9
UtilItem.java overhaul, complete item attribute system added.
2015-10-28 22:14:08 +00:00
NewGarbo
8ce50d1fc7
Done most of the tutorial ghost mechanic, and also switched from using task's indexes for referencing the tasks, instead using names now. This should allow for much more flexibility, and adding/removing tasks will not be such a pain! (Having to switch all of the task indexes around for any code referencing tasks.)
2015-10-28 17:08:48 +00:00
NewGarbo
765fb4ce11
Created the ClansShopItem enumeration, which has every item that can be sold in shops, with their buy and sell prices. All shops have been updated to reference this enumeration to get the prices for items.
...
Made it so that players that are "weaklings" will be stripped of their weakling title, if the sell value of their inventory is greater than 2000 Gold.
This mechanic uses the ClansShopItem enumeration, and is the main reason why it was created, since all prices were normally hardcoded into the shop page classes.
2015-10-28 07:34:13 +00:00
NewGarbo
8d5b6e6d90
Don't show weakling particles above players that are not alive. Also removed debug message.
2015-10-27 10:18:14 +00:00
NewGarbo
1938bcf799
Fixed the "weakling" status not updating correctly.
2015-10-27 10:01:33 +00:00
