Chiss
40ef3317dd
committing necessary files to merge
2015-01-26 11:20:02 +11:00
libraryaddict
76e6b7530f
Meteors now explode everything on contact. Added spellbook for spectators and pregame. Mana cost now obvious when cooling down. Lowered some random item amounts
2015-01-26 09:09:46 +13:00
libraryaddict
b4b8b307b0
Rename Wizard Battles to Wizards
2015-01-25 18:50:45 +13:00
libraryaddict
c19f10aff9
Reduce kit mystic mana regen to 10%
2015-01-25 18:33:22 +13:00
libraryaddict
8262eb9f48
Rebalance explosive rune, fix rank bug and books no longer drop
2015-01-25 18:27:21 +13:00
libraryaddict
7682907478
Wizards modifications - Its amazing how things slip past you
2015-01-25 06:18:07 +13:00
libraryaddict
3525243f9d
Numerous fixes to Wizards
2015-01-24 23:14:23 +13:00
libraryaddict
3ff0592d2d
Mild fix on fireball, fix heal given less cooldown and lower heal spell heals
2015-01-24 13:51:18 +13:00
libraryaddict
31c1be9dd8
Nerf the spell heal
2015-01-23 23:25:03 +13:00
libraryaddict
99c9bfbf33
Left clicking a chest is harmless
2015-01-23 23:18:29 +13:00
libraryaddict
da81d131a7
Don't open wizard spell menu if they right clicked a chest
2015-01-23 23:17:45 +13:00
libraryaddict
b00deb683e
Red overtime
2015-01-23 22:28:07 +13:00
libraryaddict
def2018c8b
Remove center blocks of stone wall wizard spell
2015-01-23 22:15:27 +13:00
libraryaddict
92ef0af39d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2015-01-23 22:01:51 +13:00
libraryaddict
c5b444ae6e
Wizards push
2015-01-23 21:52:03 +13:00
Jonathan Williams
08078c1622
Removed Logger
2015-01-22 23:18:38 -08:00
libraryaddict
0b8babb36d
Spectator menu shouldn't be opened when standing on pressure plates should it..
2015-01-23 02:31:38 +13:00
libraryaddict
74d7c7df2b
More wizard modifications
2015-01-23 02:30:44 +13:00
libraryaddict
29dc598c00
Update the fireball times to 20min
2015-01-22 01:00:57 +13:00
libraryaddict
eb7e68885b
Hunger now takes longer to decrease
2015-01-21 19:00:26 +13:00
libraryaddict
dd2418232c
Wizards progress
2015-01-21 19:00:07 +13:00
libraryaddict
e11e2090ad
Fix up spells somewhat
2015-01-18 21:23:50 +13:00
libraryaddict
9b574de541
Current wizards
2015-01-18 21:23:49 +13:00
libraryaddict
1ea19ee2e7
Add spell HealingRune, deny weapon crafting, use scoreboard for a simply display
2015-01-18 21:23:49 +13:00
libraryaddict
ea452d8fa5
Wizards progress
2015-01-18 21:23:48 +13:00
libraryaddict
72e61a02df
Changes to wizards
2015-01-18 21:23:48 +13:00
libraryaddict
611d184024
Cleanup code, add custom explosion, add lance and traprune spell
2015-01-18 21:23:47 +13:00
libraryaddict
d6d01241cb
Progress on wizards
2015-01-18 21:23:44 +13:00
libraryaddict
d232bab051
Wizards Game Progress. Now workable
2015-01-18 21:23:43 +13:00
libraryaddict
0648276720
Current progress on wizards
2015-01-18 21:23:03 +13:00
libraryaddict
5a5946c0d0
Current progress on wizards - Working on scoreboards in a new branch
2015-01-18 21:23:02 +13:00
libraryaddict
a3e0a6b4fd
Wizards Commit
2015-01-18 21:23:02 +13:00
Jonathan Williams
c83643564b
Fixed scoreboards reading from file.
...
Fixed scoreboard server name length
Changed how we pull server group on startup.
2015-01-13 12:22:47 -08:00
Jonathan Williams
b32259d7f1
Fixed length checking with team prefix in GameScoreboard
2015-01-12 12:58:40 -08:00
libraryaddict
b2fde6c6ca
Do a for(15) loop instead of while true. Don't update scoreboard if its unchanging
2015-01-12 12:22:01 +13:00
libraryaddict
1006d66e0a
Format Scoreboard, fix displaying more than 15 lines
2015-01-12 12:09:45 +13:00
Jonathan Williams
ac709d09ce
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-11 00:42:55 -08:00
Jonathan Williams
8e04a2a5f2
Portal now checks server status and player's rank before sending them to a server to prevent login spam.
...
Refactored portal method names.
2015-01-11 00:42:31 -08:00
libraryaddict
fa59ed52b9
Fixed arrow count not updating on shoot cancel
...
Spectators are now permitted to walk on enemy turf
2015-01-11 09:49:46 +13:00
libraryaddict
6343a00b53
Instead of removing the shot arrow, cancel the event instead. Fixes kit Shredder being usable during buildtime
2015-01-10 09:08:35 +13:00
libraryaddict
9863b701d8
Fixed typos in descriptions of SSM kits Wolf and WitherSkele
2015-01-10 08:54:00 +13:00
Chiss
9daee9733f
Fixed UHC height limit
...
fixed UHC rejoin health bug
2015-01-08 13:08:15 +11:00
Chiss
8ce097d837
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-04 13:21:35 +11:00
Chiss
5f36c8e424
minor scoreboard changes
...
legend loot bonus
2014-12-30 08:50:37 +11:00
Jonathan Williams
97f57b655b
Prevent horses from spawning in Clans
...
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
Jonathan Williams
81e423fa4f
Fixed Server transfer stuff. Portal send works!
2014-12-24 14:35:34 -05:00
Shaun Bennett
043f67f78c
Fix for max players not displaying properly (MPS)
2014-12-23 17:48:38 -06:00
Chiss
35bcf28c83
champions builds will now load in MPS, even if the current game isnt champs.
2014-12-23 23:44:59 +11:00
Chiss
78977788a1
fixed bug
2014-12-23 23:18:29 +11:00
Chiss
f4c5922b05
added messages for when server is expired
2014-12-23 23:17:21 +11:00
Chiss
78d94320a8
fixed reciptient of message
2014-12-23 22:55:07 +11:00
Jonathan Williams
07cca7a1d4
Fixed NPE in GameHostManager
...
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00
Shaun Bennett
21d255fcd1
Merge remote-tracking branch 'origin/master'
2014-12-23 04:15:55 -06:00
Shaun Bennett
c41b5b0cfb
private server gui, i think?
2014-12-23 04:15:33 -06:00
Chiss
6d2bd84b5b
disabled always joinable motd for minestrike
2014-12-23 20:39:49 +11:00
Jonathan Williams
9a767af018
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 03:44:05 -05:00
Jonathan Williams
f00854ee4c
Removed bad code thats bad from the bad birdy.
...
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.
Updated Enjin to handle more versatile inventory purchases.
2014-12-23 03:43:56 -05:00
Chiss
521b61c624
disabled free evolutions
2014-12-23 19:42:13 +11:00
Chiss
a15256da88
update
2014-12-23 19:04:10 +11:00
Jonathan Williams
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
Chiss
07d82b8206
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 18:39:22 +11:00
Chiss
39745913ac
re-enabled roggue
2014-12-23 18:39:05 +11:00
Shaun Bennett
eb0f23318f
Fix my fix for scoreboard - mine broke when new players joined
2014-12-23 00:06:30 -06:00
Shaun Bennett
4b4ebd0e36
Change admin item to sparkling melon
2014-12-23 00:06:04 -06:00
Shaun Bennett
8f9794a5f7
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-12-22 23:56:18 -06:00
Shaun Bennett
706b3e25ef
Fix broken player count when changing max players
2014-12-22 23:54:51 -06:00
Chiss
64d37d1886
minor snd changes
2014-12-23 16:50:31 +11:00
Jonathan Williams
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
Jonathan Williams
0e85b7e6cc
Added HostName to server groups.
...
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
2014-12-23 00:49:52 -05:00
Shaun Bennett
1957db25d9
Add player head button
2014-12-22 23:20:20 -06:00
Chiss
e8953b0c96
fixed merge errors
2014-12-23 15:14:03 +11:00
Chiss
f961fd0233
Merge remote-tracking branch 'remotes/origin/searchanddestroy'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-12-23 15:09:58 +11:00
Chiss
19a7e6d666
time update
2014-12-23 13:01:44 +11:00
Shaun Bennett
8ed7f34ab6
Sorted game pages
2014-12-22 19:20:08 -06:00
Chiss
4797b251b1
YAY Champions enable/disable works.
2014-12-23 11:39:03 +11:00
Chiss
71cf8e8fd2
undid champs stuff :(
2014-12-23 11:22:41 +11:00
Chiss
ec9401506c
Game servers can now run champions/normal on the fly.
2014-12-23 11:18:48 +11:00
Chiss
a197724de8
fixed le bugs.
2014-12-23 10:48:15 +11:00
Shaun Bennett
1396c3395a
Add kill button, rename ban to remove, add some messages for actions, add remove admin
2014-12-22 17:37:02 -06:00
Chiss
fa0a9ac859
fixed exploit on skylands
2014-12-22 21:08:44 +11:00
Chiss
ec8e1f0546
more MPS stuff
...
fixed bridges exploit
2014-12-22 16:31:13 +11:00
Chiss
2472ca95ec
MPS updates
2014-12-22 13:19:45 +11:00
Chiss
98b614848d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:54:31 +11:00
Chiss
0e7dec919d
minor updates
2014-12-22 10:51:19 +11:00
Chiss
9321abdaf5
Merge branch 'searchanddestroy' of ssh://184.154.0.242:7999/min/mineplex into searchanddestroy
2014-12-19 13:59:31 +11:00
Chiss
184c6cb4ba
added func to change attackreason for combatmanager
2014-12-19 13:59:18 +11:00
libraryaddict
93314711e7
Modified snd
2014-12-18 17:56:21 +13:00
Chiss
437c1aeabe
MPS rank todo
2014-12-18 13:06:57 +11:00
Chiss
60f567a3fb
fixed some errors ;o
2014-12-18 12:47:00 +11:00
Chiss
679f7909b0
Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers
2014-12-18 12:45:56 +11:00
Chiss
56d14b7bc0
Particle stuff
2014-12-18 12:45:45 +11:00
Shaun Bennett
604243dfa3
UI improvements - icon changes, whitelist toggle, notify messages
2014-12-17 19:42:11 -06:00
Shaun Bennett
2677d2e557
Fancy icons for 1.8!
2014-12-17 19:15:31 -06:00
Shaun Bennett
a63c48e338
Refactoring private server menu
2014-12-17 18:45:15 -06:00
Shaun Bennett
d19431a47f
Rename Clicked to onClick
2014-12-17 18:40:44 -06:00
Shaun Bennett
6e42894d5c
Refactor button again
2014-12-17 18:33:24 -06:00
Chiss
12973aba7d
Merge branch 'master' into feature/private-servers
2014-12-17 16:47:19 +11:00
libraryaddict
0e7adab3eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-17 18:32:50 +13:00
libraryaddict
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
Shaun Bennett
6eb3efa0b6
More changes
2014-12-16 20:37:14 -06:00
Shaun Bennett
62a621270e
More work on private server gui. Still need to do a bunch of refactoring
2014-12-16 13:43:01 -06:00
Shaun Bennett
83218c9a73
Pushing unfinished code for laptop
2014-12-16 11:42:06 -06:00
libraryaddict
5b1f4f16fb
Modify giveGems for new give gems
2014-12-16 21:58:17 +13:00
Chiss
a433ad764d
Wither Morph
...
Legend Particle
2014-12-16 16:18:09 +11:00
Jonathan Williams
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
libraryaddict
7e6b6bd1b2
Add evolve effect
2014-12-16 15:23:31 +13:00
libraryaddict
6d3a1116b9
Changes to SnD
2014-12-16 15:14:10 +13:00
libraryaddict
913f827ced
Changes to SnD
2014-12-16 15:14:09 +13:00
libraryaddict
da6b4b6a79
Current work for SnD
2014-12-16 15:14:09 +13:00
libraryaddict
0026127647
More work done on SnD
2014-12-16 15:14:08 +13:00
libraryaddict
f5d9d8dcf0
Modify scoreboard to use teams to support duplicate lines and up to 32 in length
2014-12-16 15:14:08 +13:00
libraryaddict
715862b365
Commit current changes
2014-12-16 15:14:07 +13:00
libraryaddict
6d7a71d043
Modifications for SnD test
2014-12-16 15:14:07 +13:00
Chiss
2e7d101850
added material/data for gametypes
2014-12-16 12:26:37 +11:00
Chiss
ee363f55a6
re-enabled gems for CC
2014-12-15 15:50:25 +11:00
Chiss
d7eb01e8f0
fixed CC Bug :D
2014-12-15 15:49:52 +11:00
Chiss
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
Chiss
95081a8ab7
Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)
2014-12-15 14:33:38 +11:00
Jonathan Williams
230c6ede13
Disabled gem reward in ChristmasChaos
2014-12-14 22:14:41 -05:00
Chiss
19dfafe9ed
disabled gems
2014-12-15 13:58:36 +11:00
Chiss
909c0d9be7
christmas no longer rewards gems
2014-12-15 13:56:48 +11:00
Chiss
d0f8a6a063
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-15 12:26:25 +11:00
Chiss
9136165d4f
fixed christmas elf name
...
pet names now have limited range
2014-12-15 12:24:40 +11:00
Jonathan Williams
5b67e2182a
Added disguise to Pet Manager for eventual wither disguised pet.
2014-12-14 02:30:39 -05:00
Chiss
78a34b1517
hopefully fixed a bug where pumpking king despawned.
...
removed 11 disc from loot
2014-12-13 11:55:12 +11:00
Chiss
3f24325c3c
removed +50% player limit for CC
2014-12-12 21:23:01 +11:00
Chiss
4fd6ed80c4
final xmas Updates
...
xmas hub
2014-12-12 19:44:04 +11:00
libraryaddict
9a16616e6c
Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas
2014-12-12 12:40:23 +13:00
Chiss
adafc95d3f
boss weaker
2014-12-12 10:26:32 +11:00
Chiss
2be4d7d6d2
XMAS UPDATE
2014-12-12 10:03:25 +11:00
Chiss
3af8a90d3b
near final xmas push :D
2014-12-11 15:23:01 +11:00
libraryaddict
3a8ab0afb0
Uncomment SleighHorse
2014-12-11 15:24:10 +13:00
Chiss
6b1fa91565
Xmas Updates
2014-12-11 12:42:06 +11:00
Chiss
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
libraryaddict
ee8d699bd1
Minor text cleanup in the sleighhorse code because you guys seem to like that
2014-12-11 07:25:40 +13:00
libraryaddict
2a13255af3
Turn christmas chaos game horses into reindeer
2014-12-11 07:23:47 +13:00
Chiss
068a0901f9
xmas updatre
2014-12-11 00:16:15 +11:00
Chiss
358d5fde44
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-10 22:38:19 +11:00
Chiss
450d3eb923
merge
2014-12-10 22:38:08 +11:00
Jonathan Williams
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
Jonathan Williams
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
Chiss
db8e0484ab
missing files + new pet
2014-12-10 18:23:22 +11:00
Chiss
0aba82eee6
fixed some eclipse java6 stuff with mail
...
Christmas game update
2014-12-10 15:38:57 +11:00
Chiss
bee81ff455
lowered coin rewards
2014-12-09 20:23:56 +11:00
Chiss
828fabb80a
Initial Christmas Chaos update
2014-12-09 20:04:59 +11:00
Chiss
50358c0c30
removed EULA breach in bridges private blocks
2014-12-08 18:23:47 +11:00
Chiss
ef8e5104f1
SnD Kits
...
minor bug fixes
2014-12-08 17:28:18 +11:00
Chiss
64c8edc292
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-08 17:25:03 +11:00
libraryaddict
048aa40590
Remove comments and add comments
2014-12-06 03:25:53 +13:00
libraryaddict
307d280534
Read merge message
2014-12-06 02:22:52 +13:00
