2e06a272b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-09 16:43:00 -04:00
e443b41e15
removed unfinished code
2015-03-09 22:16:08 +11:00
3a0e597276
more event server stuff
2015-03-09 22:15:24 +11:00
dbeea5bf69
Pre-Frost changes
2015-03-09 05:17:04 +13:00
ac4b495301
Created internationalization helper class and began i18n process
2015-03-07 20:50:47 -05:00
e0ba667613
old chests drop a little more frequently
2015-03-07 11:53:18 +11:00
f2a71b2ea9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-07 11:13:30 +11:00
683f86bd89
event server fixes and parser gamtypes
2015-03-07 11:13:17 +11:00
2d7f65588c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-06 01:36:38 -08:00
09ecb994f6
Pooled Friend/Ignore/Preferences/Poll/Elo repositories.
...
Removed ArcadeRepository as its unused.
Removed target server check for RedisCommand because it breaks other commands.
2015-03-06 01:36:25 -08:00
0336df55aa
Event update
2015-03-06 19:43:17 +11:00
e62d9774a9
Initial Event Game push
2015-03-06 19:11:26 +11:00
5e78b43860
Added StaffOnly code to ServerConfiguration
2015-03-02 12:33:04 -08:00
1fbadfa4f4
Don't compare player world to a plugin fetched world, instead compare the name.
2015-03-01 18:18:53 +13:00
90ebbd9962
More refactors
2015-02-27 22:53:55 -05:00
efce714375
DEVP-66 Refactor commonly used classes to Java conventions
...
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
cf7e2eed69
Merge with MPS Update
2015-02-24 21:11:16 -05:00
ad5481ef9c
Revert "Remove arcade repository stuff"
...
This reverts commit a5f7050e40
2015-02-24 21:04:19 -05:00
bfb0c157a2
Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths
2015-02-25 13:56:32 +13:00
be591c7d09
Disallow start/stop/kick/setgame while a game is in progress for Donor ranks
2015-02-24 17:22:47 -05:00
857052992d
Increase max player cap to 100 for SnrMod+/Youtube
2015-02-24 14:47:10 -05:00
570374fbb4
Add Wither Assault and Wizards gametypes to legend+ private servers
2015-02-24 14:45:31 -05:00
48dd5639d2
Kick banned players from games
2015-02-24 14:38:12 -05:00
0bf6866ad7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-23 20:56:34 -05:00
fc5771b33c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-24 13:04:06 +13:00
56e03221ad
Improve party system
2015-02-24 13:03:51 +13:00
87558eb01a
Merge pull request #10 in MIN/mineplex from leaderboards_dev to master
...
* commit 'e1f7e2dbcc91bb79d393b09ea5b250fe895cfe11':
Remove old lines of debug code.
Add in hooks to update statistical events log for leaderboards. Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-21 01:55:59 -06:00
53bb67ec4f
Magic missile nerfed to no cooldown decrease, nerfed rumble dmg, nerfed lance multihits
2015-02-21 20:41:07 +13:00
def101cc8d
Add in hooks to update statistical events log for leaderboards.
...
Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-19 18:53:46 -05:00
44f453c56e
Updated jOOQ and database tables
2015-02-18 18:51:36 -05:00
d29b43d645
Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages.
2015-02-17 15:17:14 +13:00
cdbf6c450e
fixed mis-named gameloot chests
2015-02-15 17:35:58 +13:00
a5f7050e40
Remove arcade repository stuff
2015-02-13 07:33:50 -05:00
9bdf248643
Add cross-server message and adminmessage commands. Fixed casing on messagecommands package.
2015-02-12 04:08:06 +13:00
e21e27f07f
Merge remote-tracking branch 'origin/master'
2015-02-10 13:33:59 -05:00
6b3f2114f2
Holy debug code!
2015-02-10 13:27:29 -05:00
884df48695
disguise command (not yet working fully)
2015-02-10 19:08:54 +13:00
29f3241098
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-10 02:32:13 +13:00
ce7db289a7
Add commands /ignore and /unignore. Fixed mutes not working with private messaging
2015-02-10 02:31:33 +13:00
ed8638ae9f
Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it
2015-02-06 23:39:22 -05:00
417122b7a7
reduced rate that smash crystal spawns
2015-02-06 14:47:34 +11:00
09b78fccd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-06 14:16:26 +11:00
14fc6f2145
Chest Update
2015-02-06 14:16:10 +11:00
f549402712
Modify wizards to use | for bossbar displays
2015-02-05 23:42:26 +13:00
6f8d39b630
Fixed spiders climbing liquids
2015-02-05 22:34:06 +13:00
939c6189a7
Merge energy and war with master
2015-02-03 14:16:07 -05:00
6cefeb1b74
More work on War
2015-02-03 14:02:45 -05:00
9118aef60f
Even if death is not the end, refuse players re-entry if they were in the lobby when they quit.
2015-02-01 16:03:29 +13:00
f9cbab6fd8
SuperSmash no longer restores hunger unless you damage a player, not a entity
2015-02-01 09:47:00 +13:00
6f369cbcdb
Sort players in spectator menu by name
2015-02-01 08:25:38 +13:00
f03c9d5bab
Fixed damage rate on barrage
2015-01-30 20:48:46 +11:00
115f9b58ab
Spider nest :)
2015-01-30 17:02:28 +11:00
5b112caa4a
Bone Storm buff
2015-01-30 16:10:03 +11:00
c066cb5185
Fixed Bugs
2015-01-30 16:08:22 +11:00
3fdf914d63
Smash Wolf Update!
2015-01-30 15:18:50 +11:00
76b76cd38c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 14:42:51 +11:00
c8afa151d9
SSM Zombie + Spider Update
2015-01-30 14:42:39 +11:00
505dcc1e8e
Add friends gui, deprecate the old chatbased friends display
2015-01-30 13:46:07 +13:00
e18107a82f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 11:08:37 +11:00
6a269cc03b
More SSM Changes
2015-01-30 11:08:23 +11:00
ebc74e5565
Fireball still too fast
2015-01-29 15:01:00 +13:00
7f4bcd1210
Smash Update
...
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
2dfdde4457
Kit mage will now start with two spells
2015-01-28 03:01:44 +13:00
1da873ab8f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-27 21:09:31 +13:00
94f79990e4
Kit changes to wizards
2015-01-27 21:09:15 +13:00
f80e640d34
Map Parser voxel update
...
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11:00
10ab390bd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-26 11:20:12 +11:00
40ef3317dd
committing necessary files to merge
2015-01-26 11:20:02 +11:00
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
b4b8b307b0
Rename Wizard Battles to Wizards
2015-01-25 18:50:45 +13:00
c19f10aff9
Reduce kit mystic mana regen to 10%
2015-01-25 18:33:22 +13:00
8262eb9f48
Rebalance explosive rune, fix rank bug and books no longer drop
2015-01-25 18:27:21 +13:00
7682907478
Wizards modifications - Its amazing how things slip past you
2015-01-25 06:18:07 +13:00
3525243f9d
Numerous fixes to Wizards
2015-01-24 23:14:23 +13:00
3ff0592d2d
Mild fix on fireball, fix heal given less cooldown and lower heal spell heals
2015-01-24 13:51:18 +13:00
31c1be9dd8
Nerf the spell heal
2015-01-23 23:25:03 +13:00
99c9bfbf33
Left clicking a chest is harmless
2015-01-23 23:18:29 +13:00
da81d131a7
Don't open wizard spell menu if they right clicked a chest
2015-01-23 23:17:45 +13:00
b00deb683e
Red overtime
2015-01-23 22:28:07 +13:00
def2018c8b
Remove center blocks of stone wall wizard spell
2015-01-23 22:15:27 +13:00
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
c5b444ae6e
Wizards push
2015-01-23 21:52:03 +13:00
08078c1622
Removed Logger
2015-01-22 23:18:38 -08:00
0b8babb36d
Spectator menu shouldn't be opened when standing on pressure plates should it..
2015-01-23 02:31:38 +13:00
74d7c7df2b
More wizard modifications
2015-01-23 02:30:44 +13:00
29dc598c00
Update the fireball times to 20min
2015-01-22 01:00:57 +13:00
eb7e68885b
Hunger now takes longer to decrease
2015-01-21 19:00:26 +13:00
dd2418232c
Wizards progress
2015-01-21 19:00:07 +13:00
e11e2090ad
Fix up spells somewhat
2015-01-18 21:23:50 +13:00
9b574de541
Current wizards
2015-01-18 21:23:49 +13:00
1ea19ee2e7
Add spell HealingRune, deny weapon crafting, use scoreboard for a simply display
2015-01-18 21:23:49 +13:00
ea452d8fa5
Wizards progress
2015-01-18 21:23:48 +13:00
72e61a02df
Changes to wizards
2015-01-18 21:23:48 +13:00
611d184024
Cleanup code, add custom explosion, add lance and traprune spell
2015-01-18 21:23:47 +13:00
d6d01241cb
Progress on wizards
2015-01-18 21:23:44 +13:00
d232bab051
Wizards Game Progress. Now workable
2015-01-18 21:23:43 +13:00
0648276720
Current progress on wizards
2015-01-18 21:23:03 +13:00
5a5946c0d0
Current progress on wizards - Working on scoreboards in a new branch
2015-01-18 21:23:02 +13:00
a3e0a6b4fd
Wizards Commit
2015-01-18 21:23:02 +13:00
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
b32259d7f1
Fixed length checking with team prefix in GameScoreboard
2015-01-12 12:58:40 -08:00
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
1006d66e0a
Format Scoreboard, fix displaying more than 15 lines
2015-01-12 12:09:45 +13:00
ac709d09ce
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-11 00:42:55 -08:00
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
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
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
9863b701d8
Fixed typos in descriptions of SSM kits Wolf and WitherSkele
2015-01-10 08:54:00 +13:00
9daee9733f
Fixed UHC height limit
...
fixed UHC rejoin health bug
2015-01-08 13:08:15 +11:00
8ce097d837
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-04 13:21:35 +11:00
5f36c8e424
minor scoreboard changes
...
legend loot bonus
2014-12-30 08:50:37 +11:00
97f57b655b
Prevent horses from spawning in Clans
...
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
81e423fa4f
Fixed Server transfer stuff. Portal send works!
2014-12-24 14:35:34 -05:00
043f67f78c
Fix for max players not displaying properly (MPS)
2014-12-23 17:48:38 -06:00
35bcf28c83
champions builds will now load in MPS, even if the current game isnt champs.
2014-12-23 23:44:59 +11:00
78977788a1
fixed bug
2014-12-23 23:18:29 +11:00
f4c5922b05
added messages for when server is expired
2014-12-23 23:17:21 +11:00
78d94320a8
fixed reciptient of message
2014-12-23 22:55:07 +11:00
07cca7a1d4
Fixed NPE in GameHostManager
...
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00
21d255fcd1
Merge remote-tracking branch 'origin/master'
2014-12-23 04:15:55 -06:00
c41b5b0cfb
private server gui, i think?
2014-12-23 04:15:33 -06:00
6d2bd84b5b
disabled always joinable motd for minestrike
2014-12-23 20:39:49 +11:00
9a767af018
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 03:44:05 -05:00
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
521b61c624
disabled free evolutions
2014-12-23 19:42:13 +11:00
a15256da88
update
2014-12-23 19:04:10 +11:00
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
07d82b8206
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 18:39:22 +11:00
39745913ac
re-enabled roggue
2014-12-23 18:39:05 +11:00
eb0f23318f
Fix my fix for scoreboard - mine broke when new players joined
2014-12-23 00:06:30 -06:00
4b4ebd0e36
Change admin item to sparkling melon
2014-12-23 00:06:04 -06:00
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
706b3e25ef
Fix broken player count when changing max players
2014-12-22 23:54:51 -06:00
64d37d1886
minor snd changes
2014-12-23 16:50:31 +11:00
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
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
1957db25d9
Add player head button
2014-12-22 23:20:20 -06:00
e8953b0c96
fixed merge errors
2014-12-23 15:14:03 +11:00
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
19a7e6d666
time update
2014-12-23 13:01:44 +11:00
8ed7f34ab6
Sorted game pages
2014-12-22 19:20:08 -06:00
4797b251b1
YAY Champions enable/disable works.
2014-12-23 11:39:03 +11:00
71cf8e8fd2
undid champs stuff :(
2014-12-23 11:22:41 +11:00
ec9401506c
Game servers can now run champions/normal on the fly.
2014-12-23 11:18:48 +11:00
a197724de8
fixed le bugs.
2014-12-23 10:48:15 +11:00
1396c3395a
Add kill button, rename ban to remove, add some messages for actions, add remove admin
2014-12-22 17:37:02 -06:00
fa0a9ac859
fixed exploit on skylands
2014-12-22 21:08:44 +11:00
ec8e1f0546
more MPS stuff
...
fixed bridges exploit
2014-12-22 16:31:13 +11:00
2472ca95ec
MPS updates
2014-12-22 13:19:45 +11:00
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
Tim Ziankoski
Cheese
libraryaddict
Jonathan Williams
Shaun Bennett
Ty Sayers
Mini-Chiss