d19431a47f
Rename Clicked to onClick
2014-12-17 18:40:44 -06:00
6e42894d5c
Refactor button again
2014-12-17 18:33:24 -06:00
12973aba7d
Merge branch 'master' into feature/private-servers
2014-12-17 16:47:19 +11:00
0e7adab3eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-17 18:32:50 +13:00
17ac36d9ae
Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub
2014-12-17 18:31:51 +13:00
6eb3efa0b6
More changes
2014-12-16 20:37:14 -06:00
62a621270e
More work on private server gui. Still need to do a bunch of refactoring
2014-12-16 13:43:01 -06:00
83218c9a73
Pushing unfinished code for laptop
2014-12-16 11:42:06 -06:00
5b1f4f16fb
Modify giveGems for new give gems
2014-12-16 21:58:17 +13:00
a433ad764d
Wither Morph
...
Legend Particle
2014-12-16 16:18:09 +11:00
c43ee95c55
Added 1.8 hooks for disguise setName and getName
...
Refactored method names in some disguise classes.
2014-12-15 21:46:14 -05:00
7e6b6bd1b2
Add evolve effect
2014-12-16 15:23:31 +13:00
6d3a1116b9
Changes to SnD
2014-12-16 15:14:10 +13:00
913f827ced
Changes to SnD
2014-12-16 15:14:09 +13:00
da6b4b6a79
Current work for SnD
2014-12-16 15:14:09 +13:00
0026127647
More work done on SnD
2014-12-16 15:14:08 +13:00
f5d9d8dcf0
Modify scoreboard to use teams to support duplicate lines and up to 32 in length
2014-12-16 15:14:08 +13:00
715862b365
Commit current changes
2014-12-16 15:14:07 +13:00
6d7a71d043
Modifications for SnD test
2014-12-16 15:14:07 +13:00
2e7d101850
added material/data for gametypes
2014-12-16 12:26:37 +11:00
ee363f55a6
re-enabled gems for CC
2014-12-15 15:50:25 +11:00
d7eb01e8f0
fixed CC Bug :D
2014-12-15 15:49:52 +11:00
d1be64d7e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
2014-12-15 14:56:09 +11:00
95081a8ab7
Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)
2014-12-15 14:33:38 +11:00
230c6ede13
Disabled gem reward in ChristmasChaos
2014-12-14 22:14:41 -05:00
19dfafe9ed
disabled gems
2014-12-15 13:58:36 +11:00
909c0d9be7
christmas no longer rewards gems
2014-12-15 13:56:48 +11:00
d0f8a6a063
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-15 12:26:25 +11:00
9136165d4f
fixed christmas elf name
...
pet names now have limited range
2014-12-15 12:24:40 +11:00
5b67e2182a
Added disguise to Pet Manager for eventual wither disguised pet.
2014-12-14 02:30:39 -05:00
78a34b1517
hopefully fixed a bug where pumpking king despawned.
...
removed 11 disc from loot
2014-12-13 11:55:12 +11:00
3f24325c3c
removed +50% player limit for CC
2014-12-12 21:23:01 +11:00
4fd6ed80c4
final xmas Updates
...
xmas hub
2014-12-12 19:44:04 +11:00
9a16616e6c
Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas
2014-12-12 12:40:23 +13:00
adafc95d3f
boss weaker
2014-12-12 10:26:32 +11:00
2be4d7d6d2
XMAS UPDATE
2014-12-12 10:03:25 +11:00
3af8a90d3b
near final xmas push :D
2014-12-11 15:23:01 +11:00
3a8ab0afb0
Uncomment SleighHorse
2014-12-11 15:24:10 +13:00
6b1fa91565
Xmas Updates
2014-12-11 12:42:06 +11:00
86b9d8342f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java
2014-12-11 11:27:47 +11:00
ee8d699bd1
Minor text cleanup in the sleighhorse code because you guys seem to like that
2014-12-11 07:25:40 +13:00
2a13255af3
Turn christmas chaos game horses into reindeer
2014-12-11 07:23:47 +13:00
068a0901f9
xmas updatre
2014-12-11 00:16:15 +11:00
358d5fde44
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-10 22:38:19 +11:00
450d3eb923
merge
2014-12-10 22:38:08 +11:00
c4fee8e681
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/.classpath
2014-12-10 03:34:53 -08:00
ea034812b9
Fixed path finder crap in UtilEnt
...
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
2014-12-10 03:32:35 -08:00
db8e0484ab
missing files + new pet
2014-12-10 18:23:22 +11:00
0aba82eee6
fixed some eclipse java6 stuff with mail
...
Christmas game update
2014-12-10 15:38:57 +11:00
bee81ff455
lowered coin rewards
2014-12-09 20:23:56 +11:00
828fabb80a
Initial Christmas Chaos update
2014-12-09 20:04:59 +11:00
50358c0c30
removed EULA breach in bridges private blocks
2014-12-08 18:23:47 +11:00
ef8e5104f1
SnD Kits
...
minor bug fixes
2014-12-08 17:28:18 +11:00
64c8edc292
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-08 17:25:03 +11:00
048aa40590
Remove comments and add comments
2014-12-06 03:25:53 +13:00
307d280534
Read merge message
2014-12-06 02:22:52 +13:00
4430efd7be
minor updates
2014-12-05 16:25:34 +11:00
38639fb58f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java
2014-12-04 13:34:08 +11:00
6cc4ec034b
Champs Updates
...
UHC Y Limit in middle
2014-12-04 13:33:31 +11:00
abaf9f4693
Refactored IRelation method names
...
Added support for negative amounts in Support server.
Clans in core testing state.
2014-12-03 13:06:50 -08:00
a8deee5292
fixed a spelling error
2014-12-02 18:04:48 +11:00
6319bffd42
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-02 09:50:47 +11:00
185b182061
fixed teleports removing you from the game
2014-12-02 09:50:30 +11:00
e7cf4eb51d
Removed use of Gem Boosters
...
Cleaned up some unused imports.
2014-12-01 02:27:39 -08:00
9d39cb922c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-01 01:22:51 -08:00
433483dcca
Fixed error in GameLootManager
2014-12-01 01:22:43 -08:00
cee48f1978
made it so you can use fireworks without aiming against block in blockhunt
...
removed fire from magma blast
private blocks are no longer private if owner is dead
2014-12-01 19:33:36 +11:00
9ddd0bd9cc
Player now sees theirselves disguised as the same block they are disguised as.
2014-11-30 16:39:27 +13:00
e654b23a50
We don't need that debug output
2014-11-30 15:06:50 +13:00
5157c2bf37
Disable hiders from seeing their own block
2014-11-30 15:06:18 +13:00
54fe312251
Untested fix I'm 99% sure will fix hide and seek players being blinded
2014-11-30 13:47:07 +13:00
f8869a84ba
Don't send the player himself the block change..
2014-11-30 13:22:01 +13:00
751731a1ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-30 12:14:51 +13:00
00d3e66ac4
Commit my current work on SnD kits
2014-11-30 12:12:02 +13:00
8afb803d5d
Modify the bow kits a little
2014-11-30 10:26:12 +13:00
f507db7664
Reworked spawn to save to database.
...
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
2014-11-29 03:16:37 -08:00
e57bd8b473
Finish making the bow kit tree
2014-11-29 16:39:09 +13:00
e3b0843b2c
Modify Barrage perk to support setting levels to indicate arrows
2014-11-29 16:38:54 +13:00
b3beadf8b5
made recharge look nicer for 1.7
...
added missing files
2014-11-29 09:14:33 +11:00
ca34ac4e02
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-29 09:09:23 +11:00
b0e62bfedf
Cleanup imports and rename fields to your _ and non _
2014-11-29 10:51:34 +13:00
24bc581f35
Add the kits I have
2014-11-29 10:36:34 +13:00
e587fca8f1
Move KitBow to its own package
2014-11-29 07:53:33 +13:00
5544bbb440
Add KitEvolve inventory
2014-11-29 07:22:18 +13:00
e6fac6de39
Small typo in UpgradeKit stuff
2014-11-29 07:22:02 +13:00
8f9f88987b
mods can no longer use /tp Here
...
only disqualifies on tp in live games.
2014-11-28 10:09:18 +11:00
fdc67e021c
Staff using /tp commands will take them out of the game (Mod to Admin only)
...
Changed spec /tp command to /spec
2014-11-28 10:00:31 +11:00
d5d9e2eb14
Don't bother with these checks in ItemLayout
2014-11-28 09:30:57 +13:00
d731b6ee69
Registering of KitManager
2014-11-27 09:47:43 +13:00
1bb4d902c6
Start on a kit manager
2014-11-27 06:44:46 +13:00
9350aeb89a
Use holograms in game
2014-11-27 03:18:52 +13:00
f5533dbce2
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy
2014-11-27 01:13:14 +13:00
52411a188f
Fixed entityId not using UtilEnt
2014-11-27 01:08:43 +13:00
b68c95c6a2
Finish up adding bombs and turn this into a working game. Add demo kit Bow
2014-11-27 01:08:42 +13:00
3ae27ccc55
Store PacketHandler so that games can use it
2014-11-27 01:08:41 +13:00
5bf185e588
Register Search and Destroy in GameFactory
2014-11-27 01:08:40 +13:00
60fd6b01cc
Add Search and Destroy code
2014-11-27 01:08:40 +13:00
aa0659828a
Register game SearchAndDestroy
2014-11-27 01:08:39 +13:00
9928811a71
Merge pull request #2 from Better-Holograms to master
...
* commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89':
Remove the 'Made by Shaun'
Fix up mistakes in the previous modifications
You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly
Ignore wither skulls for CustomTagFix
Remove old holograms and add new holograms
2014-11-26 06:07:57 -06:00
ef59cb7a9d
Merging changes from master to Better-Holograms
...
* master:
Antistack replacement
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-27 01:01:19 +13:00
Shaun Bennett
Chiss
libraryaddict
Jonathan Williams
libraryaddict