Commit Graph

8192 Commits

Author SHA1 Message Date
Ben
48cfe4d91c fixed & inv see? 2016-03-08 00:27:06 +00:00
git
280d03daa7 Fix names 2016-03-08 09:52:30 +13:00
Thanos paravantis
1ee7a42b9c Challenge refactoring, modify challenge ending and chat messages, add generateGrass helper method. 2016-03-07 18:32:33 +02:00
git
496983ee04 Untested bugfixes 2016-03-07 22:29:14 +13:00
NewGarbo
ae42aaaab1 Sammy changes + cleanup 2016-03-07 03:25:22 +00:00
NewGarbo
7e2086df1c flash fix, rares update, and outpost fixes 2016-03-06 19:55:58 +00:00
Thanos paravantis
4e6ba4ebd1 Challenge refactoring. 2016-03-06 16:45:25 +02:00
NewGarbo
ae2da31544 Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-05 23:14:32 +00:00
NewGarbo
8cfbe20a08 re-added delay to /spawn 2016-03-05 23:09:57 +00:00
Thanos paravantis
c2d5699aa8 Challenge refactoring, bug fixes, add additional helper methods. 2016-03-06 00:59:13 +02:00
NewGarbo
d92f817efc fixed some teleportation bugs and a bit of cleanup 2016-03-05 22:50:06 +00:00
NewGarbo
e88736c1aa changes to scepter, NPE fix 2016-03-05 20:46:24 +00:00
Thanos paravantis
0f58c1378c Challenge refactoring. 2016-03-05 17:51:30 +02:00
Thanos paravantis
c30f6b0f96 Main class and challenge refactoring. 2016-03-05 17:06:07 +02:00
NewGarbo
d79107eaaa new legendary weapons and nether finzlizations 2016-03-05 03:07:25 +00:00
Shaun Bennett
d108679d43 Fix compile error 2016-03-04 14:09:20 -06:00
Thanos paravantis
51d4db5e46 Implement game settings and challenge list. Add isChallengeValid and isPlayerValid for event checks. 2016-03-04 20:01:08 +02:00
NewGarbo
7b9ff288f3 nether progresssisiannsnsssss 2016-03-03 23:23:20 +00:00
git
6d0ca4f813 Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-03-03 13:49:31 +13:00
git
0ffa67dfb8 Ring game 2016-03-03 13:48:22 +13:00
Thanos paravantis
9e09d8c477 Challenge refactoring. 2016-03-02 22:54:47 +02:00
Keir Nellyer
b18f2d8682 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-03-02 20:02:09 +00:00
NewGarbo
73d8870daf nether work (forgot to commit days ago oops) 2016-03-02 19:42:53 +00:00
Shaun Bennett
28486c8d65 Merge pull request #10 from Mineplex-LLC/Dual_1.9
Dual 1.9 Build
2016-03-02 13:00:09 -06:00
Shaun Bennett
3447354814 Dual 1.9 Fixes 2016-03-02 12:58:30 -06:00
Thanos paravantis
9a4f4dbd7c Merge branch 'master' into thanos-mineware 2016-03-02 18:47:30 +02:00
Thanos paravantis
60dfce4612 Challenge refactoring, move challenges to new package. 2016-03-02 18:45:27 +02:00
Shaun Bennett
a3b7a3269c Merge branch 'develop' into Dual_1.9 2016-03-01 15:14:59 -06:00
Thanos paravantis
cb8b180c2f Start challenge refactoring, implement helper methods. 2016-03-01 18:50:41 +02:00
Thanos paravantis
77871e3195 Implement challenge settings and data. 2016-03-01 17:09:43 +02:00
git
2062ca7efc Updated patch 2016-03-01 13:05:12 +13:00
Thanos paravantis
6570adc4af Improve zombie on infestation challenge. 2016-02-29 22:40:09 +02:00
Thanos paravantis
dd538dedd5 Fix Lava Run challenge map generation. 2016-02-29 20:19:26 +02:00
Thanos paravantis
6a2f66f722 Challenge bug fixes and refactoring. 2016-02-29 15:07:33 +02:00
Thanos paravantis
2bc396dc17 General bug fixes and improvements, add map height preference. 2016-02-28 18:15:37 +02:00
Shaun Bennett
e8d5165634 Merge pull request #9 from Mineplex-LLC/develop
Merge v1.2.0 into Master
2016-02-27 20:06:55 -06:00
git
0284fed2a9 Update patch 2016-02-28 13:12:59 +13:00
Keir Nellyer
ffc678cc3d Small tidy-up of code. 2016-02-27 00:25:48 +00:00
Keir Nellyer
bafd34f9ac Add "Show All" link. 2016-02-27 00:08:48 +00:00
Keir Nellyer
c9b343a1fb Pro-tip: Always make sure you read Trello before adding a feature (un-doing pagination). 2016-02-26 22:55:33 +00:00
Thanos paravantis
bcb489f13d Map support and parse locations. Minor changes and bug fixes. 2016-02-27 00:13:02 +02:00
Thanos paravantis
1e08e1a5db Update player death handling, add aggressive chicken behavior, minor changes and refactoring. 2016-02-26 18:17:03 +02:00
Shaun Bennett
775b6eeffa Merge pull request #7 from Mineplex-LLC/feature/dmt-update
Draw My Thing Update
2016-02-26 04:38:10 -06:00
Shaun Bennett
b0301bbf24 Merge pull request #4 from Mineplex-LLC/feature/parser-commands
Add extra commands to the map parser
2016-02-26 04:34:18 -06:00
Shaun Bennett
923e51483c Remove fill line 2016-02-26 04:29:27 -06:00
Shaun Bennett
4472c52432 Fix bucket 2016-02-26 04:21:26 -06:00
William Burns
268536ce68 push 4 shaun 2016-02-26 08:13:28 +00:00
Thanos paravantis
0e697e279b Player death handling and chicken attack changes. 2016-02-25 23:35:38 +02:00
William Burns
e4ba5d9723 Fix colour targeting FINALLY! 2016-02-25 19:48:15 +00:00
Keir Nellyer
af8ad218be Separate previous, pages and next buttons. 2016-02-25 18:29:38 +00:00