JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,125 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

661 Commits

Author SHA1 Message Date
Shaun Bennett 2c020d10a6 Merge remote-tracking branch 'origin/master' 2015-05-13 22:52:22 -05:00
Shaun Bennett 84c53347f8 [Hub] Add UHC to Quick server menu. Better formatting coming soon! 2015-05-13 22:52:14 -05:00
Mini-Chiss 2c3116a7a6 removed firework and sound from legend join 2015-05-13 15:45:29 -05:00
Jonathan Williams 1c6a12528c Added ability for LT to modify Admin ranks. 
Added Twithc rank to the updateRank list.

Fixed server sorting issues with UHC Generating servers.
 2015-05-13 00:58:45 -07:00
Jonathan Williams 98dcb9747a Added UHC support to server sorter. 2015-05-13 00:10:17 -07:00
Mini-Chiss f9735006b8 removed hub uhc hourly announcements 2015-05-13 00:05:00 -05:00
Shaun Bennett 53555a42cd [Core] Add MB Stats in gui, Add MB Achievement, Update stat gui layout, add ability to display combined stats 2015-05-12 17:14:50 -05:00
Mini-Chiss 643ed2c047 Fixed most enchants not working 
added commands to event
minor update to snowfight to make it more fun
 2015-05-11 19:55:26 -05:00
libraryaddict a558995e12 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-12 09:52:21 +12:00
Shaun Bennett 46c07665e1 Merge remote-tracking branch 'origin/master' 2015-05-11 00:44:34 -05:00
Shaun Bennett 800ce68637 Add Beta Games and Player Servers to Quick game menu (text probably needs tweaking) 2015-05-10 16:58:04 -05:00
libraryaddict 241935ef63 SurvivalGames: Removed description of deep freeze and updated to beware of borders 2015-05-11 09:13:04 +12:00
Mini-Chiss 822718095d cannot PM from spawn 
first push of cards game
 2015-05-09 12:23:07 -05:00
Jonathan Williams a7407d8b8c Added all minigames standalones into mixed arcade player count. 2015-05-04 22:51:21 -05:00
Jonathan Williams 4252bf70df Fix Master Builder game button in quick menu. 2015-05-04 01:40:57 -05:00
Jonathan Williams c8b5c84aa6 Added Master Builder quick game menu option. 
Added player counts to quick game menu
 2015-05-04 00:42:49 -05:00
Mini-Chiss 4f4aeac12c fixed typo 2015-05-03 23:34:09 -05:00
Mini-Chiss e013f8af8a sky text for hub change 2015-05-03 19:49:16 -05:00
Mini-Chiss 40d56c3500 Converted all code to updated UtilParticle methods 
/suicide
 2015-05-03 16:37:00 -05:00
Jonathan Williams 283d550903 Added Wizards to quick game menu. 2015-05-01 01:24:01 -05:00
Jonathan Williams fa4466b6a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-05-01 00:13:39 -05:00
Jonathan Williams d161d62773 Added chat filtering to private messages. 2015-04-30 23:56:08 -05:00
libraryaddict 9f8fe3bf78 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-04-22 03:45:59 +12:00
Cheese c79432c8b9 Fixed projectile hitboxes and specific values 2015-04-04 10:54:03 +11:00
Cheese ff0883e7d7 fixed easter egg duration 
parser list improvement
 2015-04-03 21:47:43 +11:00
Cheese ed35d2a992 April Fools update 2015-04-01 16:56:13 +11:00
Shaun Bennett 50c38dc467 April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA 2015-03-31 17:22:50 -04:00
Jonathan Williams f4061854cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-25 15:11:17 -07:00
Jonathan Williams 6472194d44 Optimized queries to retrieve and update player information by removing inner join calls on the account. 
Added account id retrieval on login.
Added account id caching in redis.
 2015-03-25 15:10:59 -07:00
Jonathan Williams 09fe3ad6a8 NewsManager : Reduced dynamic string generation every time news changes 2015-03-25 15:04:00 -07:00
Cheese 5fded981d9 Timings for Visibility 2015-03-23 16:38:17 +11:00
Cheese 28b3828007 slowed hub invis update 2015-03-20 23:48:17 +11:00
libraryaddict 52f0941fb9 Add resourcepack options 2015-03-17 23:59:24 +13:00
Cheese 73c66fa93f Merge branch 'SpecRemoveCreative' 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
 2015-03-17 14:57:17 +11:00
Cheese 4581f49948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-16 13:39:54 +11:00
Cheese 420c4e7229 More work on Event game 2015-03-16 13:39:33 +11:00
Jonathan Williams cb93769e03 Converted Bungee to redis. 
Increased DBPool maximum connections to 5.
 2015-03-13 17:53:36 -07:00
Cheese c5d48a82a3 Fixed invisibility bug 2015-03-13 11:34:45 +11:00
Jonathan Williams bf87cfd0cd Merge remote-tracking branch 'remotes/origin/sql_pooling' 2015-03-11 18:30:52 -07:00
Jonathan Williams 626bfc35fc Revert "Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections."" 
This reverts commit 215ec7b00d.

Enabled multi-queries on db pool.
Cleaned up some code using new pooling getConnection inappropriately
 2015-03-11 18:05:13 -07:00
Jonathan Williams 0b2ce48b3e Fix dead lobbies bug. 2015-03-11 17:27:21 -07:00
Ty Sayers 215ec7b00d Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections." 
This reverts commit adfe5fb74e.
 2015-03-07 19:38:06 -05:00
Ty Sayers adfe5fb74e Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections. 2015-03-07 19:36:54 -05:00
Jonathan Williams 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
Jonathan Williams 5e78b43860 Added StaffOnly code to ServerConfiguration 2015-03-02 12:33:04 -08:00
Shaun Bennett 90ebbd9962 More refactors 2015-02-27 22:53:55 -05:00
Shaun Bennett efce714375 DEVP-66 Refactor commonly used classes to Java conventions 
Refactoring + testing jira
 2015-02-26 00:07:07 -05:00
libraryaddict bfb0c157a2 Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths 2015-02-25 13:56:32 +13:00
libraryaddict 56e03221ad Improve party system 2015-02-24 13:03:51 +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