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
libraryaddict
2eb8b3e234
Catch PacketHandler exceptions
2015-10-24 02:17:19 +13:00
libraryaddict
5ec4203fd9
More changes to disguise
2015-10-24 01:36:42 +13:00
libraryaddict
a450b828b7
Fix disguises custom name
2015-10-24 00:48:54 +13:00
libraryaddict
de9678a20f
Modify Craftbukkit
2015-10-23 21:28:01 +13:00
AlexTheCoder
d51b23849a
- Fixed bugs and added features
2015-10-23 03:24:01 -04:00
AlexTheCoder
f7dab72e8c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-10-23 03:23:35 -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
fd1638a572
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-10-23 02:17:57 -04:00
Shaun Bennett
5944b734be
More war fixes - still needs tweaking
2015-10-23 02:17:47 -04:00
Shaun Bennett
e3e7dd4694
Titan rewards from mythical chests
2015-10-23 02:08:31 -04:00
NewGarbo
4c381d41fe
Fixed second tutorial task misspelling, and added the first tutorial, which is /c help, as I completely forgot about it in the first place.
2015-10-23 06:10:09 +01:00
NewGarbo
18d998fc04
Fixed colors cutting out in the middle of the message in task information, moar fireworks!
2015-10-23 05:56:53 +01:00
AlexTheCoder
9ceb4eee94
- Take will and QA's suggestion about making the gameplay modifier a proper feature
2015-10-23 00:48: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
AlexTheCoder
91ddcdb149
- Testing setup
2015-10-23 00:25:38 -04:00
AlexTheCoder
5a94e33d5e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-10-23 00:24:52 -04:00
libraryaddict
aedf04b3e3
Fix renaming pet not opening proper window
2015-10-23 09:26:21 +13:00
libraryaddict
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
libraryaddict
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
libraryaddict
ddb8d592f8
Remove all is1_8 checks
2015-10-22 18:37:14 +13:00
NewGarbo
825b519890
Finalization of tutorials, made my code more consistent, and renamed any parts of code that referred to tasks as parts refer to them as "tasks."
...
Removed unused imports, and other code cleanup stuff.
Renamed EndTutorialCommand to SkipTutorialCommand as the actual command is "/skiptutorial" instaed of "/endtutorial"
2015-10-21 21:50:46 +01:00
William Burns
e6bec41ca8
Fix "code too large" error.
2015-10-21 20:29:44 +01:00
NewGarbo
bf406493e3
Fixed tutorial tasks that rely on territory entrances not working because formatting...
2015-10-21 20:14:35 +01:00
libraryaddict
3cd803cda0
Update patch files and cb
2015-10-22 08:07:10 +13:00
Shaun Bennett
00a689ea03
War work
2015-10-21 14:48:27 -04:00
NewGarbo
112f34c77f
Fixed NullPointerException when clicking outside of inventory GUI.
2015-10-21 08:10:53 +01:00
libraryaddict
5c010af8c4
Add updatehealth packet
2015-10-21 19:56:52 +13: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
NewGarbo
a5df50de92
On going map tutorials started and finished.
2015-10-21 06:55:06 +01:00
NewGarbo
eb203131a7
Fixed import errors since I moved the getting started tutorial to a different package.
2015-10-21 06:19:23 +01:00
NewGarbo
bd5266251b
Finalized the getting started tutorial.
...
Added the last 5 tasks, and added a nice big ending (fireworks)
Added an ugly fix to the QAResetCommand, which I am really unhappy about, but can't find any other way about it. It's only a test command though, so it'll be removed in the final releases.
2015-10-21 06:17:18 +01:00
NewGarbo
c6cf47ee4e
I did not mean to commit that one line... Oh gosh that would have been bad... (addCoins onEnterTerritory). Was just for testing shops.
2015-10-21 04:36:47 +01:00
NewGarbo
227e9f7bfc
Pretty much finished with tutorials, not fully though, but I am simply pushing so I don't lose all my work.
...
CHANGES----
Added a little hack to ScoreboardElement.java that allows for a single element to clear the currently existing scoreboard lines output, or modify it.
Coded in the functionality of 7 tasks, will do the rest now.
2015-10-21 04:27:14 +01:00
Cheese
768ef4eb97
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-21 13:00:16 +11:00
libraryaddict
8ceb69513a
Update patches and cb.jar
2015-10-21 05:05:27 +13:00
libraryaddict
07f032a5d2
Fix wither pet making sounds, fixed worldtime.
2015-10-21 04:22:31 +13:00
libraryaddict
ddd674e371
Packets implement Pcaket right
2015-10-20 17:19:46 +13:00
NewGarbo
a2278297de
Created the base for tutorials, and created the getting started tutorial.
...
Have all the commands and most of the functionality in here now, but still need to do the scoreboard and some tweaking.
2015-10-19 17:16:48 +01:00
