Commit Graph

2697 Commits

Author SHA1 Message Date
Jonathan Williams
0a2e11e8bc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-20 23:56:24 -08:00
Jonathan Williams
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
libraryaddict
53bb67ec4f Magic missile nerfed to no cooldown decrease, nerfed rumble dmg, nerfed lance multihits 2015-02-21 20:41:07 +13:00
Jonathan Williams
c02adc0232 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-20 23:29:44 -08:00
Jonathan Williams
e6eb938b96 Delayed whitelist additions. 2015-02-20 23:29:19 -08:00
Ty Sayers
e1f7e2dbcc Remove old lines of debug code. 2015-02-19 18:55:21 -05:00
Ty Sayers
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
CoderTim
6a368454ec Clans database refactoring 2015-02-18 21:31:38 -05:00
CoderTim
aebe390c3c Refactored ClanRole enum 2015-02-18 19:56:29 -05:00
CoderTim
44f453c56e Updated jOOQ and database tables 2015-02-18 18:51:36 -05:00
libraryaddict
0aee8042b5 Changed /locate to return the located players name, not fed target 2015-02-18 09:27:58 +13:00
libraryaddict
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
libraryaddict
3b0a131ca2 If private messaging is turned off, deny messages, even from friends. 2015-02-15 22:10:15 +13:00
libraryaddict
3ef3689e6d Fixed RedisMessageCallback not being registered 2015-02-15 22:01:10 +13:00
Jonathan Williams
fd0547d9d3 Added connection re-establishment to database calls if error occurs. 2015-02-14 22:50:52 -08:00
Jonathan Williams
c129deb201 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-14 22:05:24 -08:00
Mini-Chiss
cdbf6c450e fixed mis-named gameloot chests 2015-02-15 17:35:58 +13:00
Jonathan Williams
17543910b5 Added Chest packages to support server.
Fixed Punish not loading.
2015-02-14 15:09:42 -08:00
Jonathan Williams
c50e79355f Added proper logging to BungeeRotator 2015-02-14 13:49:09 -08:00
Mini-Chiss
e33fd3f249 disallow people from talking about hacks in chat. 2015-02-15 09:01:55 +13:00
libraryaddict
0071d6220d Change locate command to moderators and up 2015-02-14 22:22:15 +13:00
Jonathan Williams
6ff0928fbd Fixed RB with exemption in NCP hooks. 2015-02-14 00:48:07 -08:00
Jonathan Williams
beac0b4828 Added try catch in BungeeRotator and ServerMonitor so they don't crash out. 2015-02-14 00:47:03 -08:00
Shaun Bennett
61b1e3f48b Move clans database calls to a seperate thread 2015-02-13 07:34:09 -05:00
Shaun Bennett
a5f7050e40 Remove arcade repository stuff 2015-02-13 07:33:50 -05:00
libraryaddict
0cd0c61200 Add /locate|where|find command to find other players in other servers 2015-02-13 20:57:46 +13:00
Shaun Bennett
db3f2989c0 Update JOOQ files, update IntelliJ config file for JIRA 2015-02-12 14:17:04 -05:00
libraryaddict
876005b3e3 Fixed sending admin cross-server messages not setting last admin to 2015-02-12 22:27:09 +13:00
libraryaddict
858a6fb674 Fixed FriendsGUI not removing ghost items when redrawing page 2015-02-12 04:08:43 +13:00
libraryaddict
9bdf248643 Add cross-server message and adminmessage commands. Fixed casing on messagecommands package. 2015-02-12 04:08:06 +13:00
libraryaddict
1b11c5dbbf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-12 04:06:19 +13:00
libraryaddict
f41473da8f Add message to unignore when no parameters are given 2015-02-11 23:11:21 +13:00
Jonathan Williams
6383cf7ce6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-02-10 18:17:13 -08:00
Shaun Bennett
1b4d1d94e9 Merge remote-tracking branch 'origin/master' 2015-02-10 21:15:53 -05:00
Shaun Bennett
58eaaaa2ee Treasure fixes 2015-02-10 21:15:44 -05:00
Jonathan Williams
86b0a578ba Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 18:13:49 -08:00
Mini-Chiss
264ecfc362 lowered legendary chance on old chest slightly 2015-02-11 15:13:33 +13:00
Jonathan Williams
f0d2ff1c9d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 17:44:36 -08:00
Mini-Chiss
500e37a618 fixed ender chest shop item 2015-02-11 14:44:14 +13:00
Mini-Chiss
92d3a7dab8 all chests purchasable by coins 2015-02-11 14:42:41 +13:00
Mini-Chiss
e03c65769d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-11 14:16:58 +13:00
Mini-Chiss
cafa59d7e8 adjusted reward rarities 2015-02-11 14:16:08 +13:00
Jonathan Williams
594f0c6045 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 17:15:06 -08:00
Shaun Bennett
e21e27f07f Merge remote-tracking branch 'origin/master' 2015-02-10 13:33:59 -05:00
Shaun Bennett
6b3f2114f2 Holy debug code! 2015-02-10 13:27:29 -05:00
Jonathan Williams
80a5acd9f2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 04:18:05 -08:00
libraryaddict
5a516e4c78 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-11 00:59:45 +13:00
libraryaddict
77350e51de Using the wrong servername in PlayerTracker 2015-02-11 00:58:21 +13:00
Jonathan Williams
258c1ca7fc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 02:27:05 -08:00
Mini-Chiss
d9521bd05a lowered gameloot chances 2015-02-10 23:26:37 +13:00