Cheese
dc535ff861
art
2015-10-30 12:59:58 +11:00
AlexTheCoder
0be51d5629
- Even more bugfixes
2015-10-29 16:48:51 -04: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
libraryaddict
7fca42b0e0
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/turfforts/TurfForts.java
2015-10-29 21:41:59 +13:00
libraryaddict
14df456b3d
Progres
2015-10-29 21:39:38 +13: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
AlexTheCoder
cf26541461
- More Bugfixes
2015-10-28 18:16:52 -04: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
libraryaddict
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
libraryaddict
5ec932d1ca
Fixing bugs
2015-10-28 14:36:48 +13: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
NewGarbo
b4897e91fa
Fixed bug where an NPC's hologram would still stick around after the NPC is killed, since death and regular removal over time are handled separately.
2015-10-27 08:56:41 +00:00
NewGarbo
234799e55e
Fixed infinite recursion in AlligatorsTooth.
...
Fixed a NullPointer exception in the Gear UI when you don't select an item type and you continue on.
Made a way to visually see the task you are on in the getting started tutorial, by making it dark cyan.
2015-10-27 08:32:21 +00:00
AlexTheCoder
0ab3213b7b
- Fixed permanent dwarf toss bug
...
- Fixed skills being active while player is editing class
2015-10-27 01:38:41 -04:00
AlexTheCoder
9d6a361602
- Fixed emerald jump for Relyh
2015-10-26 23:42:52 -04:00
NewGarbo
c30ece9d8b
Improved SafeLog to use the title system and holograms! Also removed knockback for NPCS
2015-10-26 19:48:20 +00:00
NewGarbo
da058881f8
Some bug fixes in the gear ui, added the shine to rare item factory (I FORGOT TO COMMIT THE CLASS LAST COMMIT ARGH)
...
added alligators tooth particles & sound
added wind blade power feature
2015-10-26 15:37:44 +00:00
NewGarbo
eb350a79c3
Added RareItemFactory (will add shine when lib helps me with it) and other small little fixes. Added a way to specify the amount of items in a single line in GearPage, so that armor and weapon type listings look more aesthetically pleasing.
2015-10-26 12:21:33 +00:00
AlexTheCoder
7770fa0284
- Added system to ensure banned players are removed from the network
2015-10-26 07:09:01 -04:00
NewGarbo
63406e9ce1
Moved GearManager back to it's original package, and stopped using it in GearPage. Removed commented code from GearCommand, as the gui is now finished and it is not needed anymore.
2015-10-26 07:57:00 +00:00
NewGarbo
7eab57c5dd
As per Chiss' request, made the gear ui go to next page when you choose an attribute.
2015-10-26 07:49:03 +00:00
AlexTheCoder
f5b4f28848
- Fixed achievements
...
- Various balance patches/audio changes
2015-10-26 00:25:33 -04:00
NewGarbo
cc2aae9726
Final touches to the gear gui, making it now completely finished. hooray!
2015-10-26 00:08:03 +00:00
NewGarbo
327c129f46
Fixed the rest of merge conflicts (? [I hope {shaun help me ;-;}])
2015-10-25 12:28:12 +00: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
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
NewGarbo
63bc492f2c
Almost completely finished the /gear ui, still a few bugs and missing features, but it's getting there. Logging off now, don't want to lose code.
2015-10-24 20:36:53 +01:00
Shaun Bennett
0d56eefd44
Titan/Rewards adjustments
2015-10-24 13:40:17 -04:00
NewGarbo
089c4420b2
Lots of progress towards a /gear gui, not finished though. commiting now because I'm leaving and don't want to lose the code.
2015-10-24 07:16:13 +01:00
libraryaddict
e3c824c512
Fix minor skywars error
2015-10-24 13:32:55 +13:00
libraryaddict
4d2b359aad
Fix wolf cub strike
2015-10-24 08:41:10 +13:00
libraryaddict
43cd0f86a9
Fix players unable to break blocks at spawn
2015-10-24 08:40:57 +13:00
libraryaddict
7f025ad029
Fix CustomExplosion
2015-10-24 08:40:43 +13:00
Shaun Bennett
40afcaf26b
Global Packet Commands
2015-10-23 15:07:53 -04:00
NewGarbo
0c29805756
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-10-23 19:27:13 +01:00
NewGarbo
11b836da8b
Added Join/Quit messages.
...
Removed periods from attribute descriptions.
Fixed legendary item lore having incorrect formatting.
2015-10-23 16:59:30 +01:00
