Commit Graph

5674 Commits

Author SHA1 Message Date
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
Thanos paravantis
f6df946ea9 Evolution of Combat: General bug fixes, improved hunger, added protection so players can't get off the island. 2015-10-21 18:05:18 +03: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
Thanos paravantis
1360988366 Evolution of Combat, implementing hunger damage when player is idle. 2015-10-20 22:39:11 +03: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
Thanos paravantis
89953396b2 Evolution of Combat minor changes to the "first weapon crafted" title functionality. 2015-10-20 17:59:56 +03:00
Thanos paravantis
33baf90d51 New Mineware challenge, first version of Evolution of Combat. Still work in progress. 2015-10-20 17:38:47 +03: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
libraryaddict
b3caf7c2d4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-20 04:38:12 +13:00
libraryaddict
5d671d3300 Fix borders 2015-10-20 04:37:42 +13: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
Cheese
c7a5be9570 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-19 09:03:46 +11:00
libraryaddict
55f97ef984 More fixes, along with a fix for Block Hunt 2015-10-19 06:21:16 +13:00
Shaun Bennett
0a3f942575 Fix compile issue 2015-10-18 12:42:56 -04:00
Shaun Bennett
177e482dbc Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2015-10-18 12:35:31 -04:00
AlexTheCoder
0094fa31f0 - Accidentally edited classpath - oops 2015-10-18 06:17:44 -04:00
AlexTheCoder
547c8ca726 - Bugfixes 2015-10-18 06:14:54 -04:00
Jonathan Williams
9e7629b1fe Added 43k player chest benefit.
Updated MOTD.
2015-10-18 00:21:01 -05:00
AlexTheCoder
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
Shaun Bennett
523378aae7 Clans War updates 2015-10-17 22:55:21 -04:00
Cheese
d901cfa12c buildies can join full 2015-10-18 10:54:34 +11:00
libraryaddict
6f91827d57 Vector to Vector3f, updated Maze to 1.8 2015-10-18 12:40:01 +13:00
Thanos paravantis
a247150b4c Removing debug information, minor improvements on Block Runner. 2015-10-17 13:00:53 +03:00
libraryaddict
02bf202d52 1.8 update 2015-10-17 13:21:03 +13:00
Thanos paravantis
e4a1d81d8d Pushing latest bug fixes, will make more improvements tomorrow on Block Runner. 2015-10-16 23:27:23 +03:00
Shaun Bennett
589c05f8c0 Merge remote-tracking branch 'origin/clans-beta' into clans-beta
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
2015-10-16 14:25:31 -04:00
Thanos paravantis
fde6617c6b Block Runner (renamed from Heavy Blocks) bug fixes. Added additional checks on the block place event. 2015-10-16 20:34:50 +03:00
Thanos paravantis
c5dcf5d45a Mineware Challenge Updates (see description below)
- Added Block Runner challenge, may apply changes.
- Minor updates to Anvil Dance and Falling Block challenges.
2015-10-16 19:34:09 +03:00
libraryaddict
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
libraryaddict
14a524cf54 Stuff 2015-10-17 00:08:30 +13:00
Cheese
41b6fdc74e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-16 21:47:35 +11:00
Cheese
32489388c6 removed bug fix that caused SG break 2015-10-16 21:47:22 +11:00
libraryaddict
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
Jonathan Williams
172bd65c57 Monster Maze motd. 2015-10-16 04:22:54 -05:00
libraryaddict
70c76d976f More changes 2015-10-16 22:10:13 +13:00
Jonathan Williams
62b209fede Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-16 01:57:30 -05:00