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

3607 Commits

Author SHA1 Message Date
Mini-Chiss e10d26dae1 reduced respawn time in OITQ 
removed respawn msg for short respawn times
 2015-08-03 16:18:59 +02:00
Mini-Chiss ccdb859f11 lowered mythical change a little :) 2015-08-03 16:11:11 +02:00
Jonathan Williams 90ea3d4cff Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-03 08:14:20 -05:00
Jonathan Williams ab20d35917 Wipe personal server groups on restart of monitor. 
Cleanup of unused code.
 2015-08-03 08:08:51 -05:00
Mini-Chiss 5e06f16c0d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-03 15:08:40 +02:00
William Burns 817b8b03f6 Whitelist fixes etc. 2015-08-03 13:40:13 +01:00
Sarah fc412b0782 Reverting old Server Menus with Team sub-menu dor SSM, Skywars and SG. 2015-08-03 14:36:51 +02:00
William Burns 0c5cc25634 Stuff 2015-08-03 12:48:17 +01:00
Jonathan Williams eb16cd755a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-03 05:55:57 -05:00
Jonathan Williams 37b779f108 Fixes for servers. 2015-08-03 05:55:33 -05:00
William Burns 5b598009b9 Merge branch 'master' into MPS-Maps 2015-08-03 11:53:03 +01:00
William Burns bf292ecd39 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Plugins/.idea/encodings.xml
#	Plugins/.idea/modules.xml
 2015-08-03 11:51:46 +01:00
Shaun Bennett bd9d222cff Fix IntellIJ Files 2015-08-03 05:50:02 -05:00
William Burns 44ee735f4a Merge branch 'master' into MPS-Maps 2015-08-03 11:46:38 +01:00
William Burns 4ad19e4579 Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps 2015-08-03 10:52:00 +01:00
Mini-Chiss 7c028ae936 fixed skywars teams icon in MPS 2015-08-03 11:44:13 +02:00
Mini-Chiss bb2e15c4fd made it so games can set another game as its 'kit source' so games can share kit unlocks 2015-08-03 11:38:16 +02:00
William Burns 1ca3c8527a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-03 10:01:06 +01:00
Mini-Chiss 8d7b7f8c8b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-03 10:56:54 +02:00
Mini-Chiss 1d0bfbdf2d fixed team sheep displaying in UHC lobby 2015-08-03 10:56:23 +02:00
Jonathan Williams 6c0666c59b Fix for server groups / teams. 2015-08-03 03:20:27 -05:00
Mini-Chiss b26e01649b removed requirement for ach kit 2015-08-03 10:13:46 +02:00
Mini-Chiss eac8a3cd1c fixed OITQ kit being unobtainable 2015-08-03 10:12:37 +02:00
Mini-Chiss a87b3a9284 fixed kits not sharing for team vers 2015-08-03 10:10:29 +02:00
Mini-Chiss 8ec271bd82 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-03 10:06:30 +02:00
Mini-Chiss 472409dc4b fixed broadcast formatting 2015-08-03 10:06:15 +02:00
Jonathan Williams 302252f193 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-03 02:56:31 -05:00
Jonathan Williams af0d769d3d Fixed skywars quick shop. 
Fixed issue with skywars not opening.
Fixed chest size for MPS
 2015-08-03 02:56:24 -05:00
Mini-Chiss 5bb2f80b8e fixed text 2015-08-03 09:54:34 +02:00
William Burns 6ccc897841 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-03 08:53:38 +01:00
Mini-Chiss 72c473ad6b removed annoying mineplex thing from subtext in news 2015-08-03 09:51:10 +02:00
Jonathan Williams 530c40ad0c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-03 02:07:31 -05:00
Jonathan Williams adcd91bf61 Servers with more than 40 max slots always send to largest server. 
Fixed space in Solo lore.
 2015-08-03 02:07:23 -05:00
Mini-Chiss 2e1bccb3ad DUN ALLOW overful 2015-08-03 09:02:28 +02:00
Mini-Chiss 6a1e5d6bfc changed item text 2015-08-03 08:23:49 +02:00
Jonathan Williams c32074e733 Fixed MPS/Event server guis so they open up like old. 
Changed sticks to player heads in solo/team selection.
 2015-08-03 00:53:06 -05:00
Jonathan Williams bfaa0e6849 Fixed event/mps hardcode. 2015-08-02 23:51:43 -05:00
Ty Sayers 58933fc855 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 21:19:00 -04:00
Ty Sayers 944a4a9535 Fix accidental double-queueing bug when left clicking server NPCs and add two second cooldown before attempting to auto-join servers. Fix bug with server groups not properly loading server NPC names into shops. Fix bug with server key/name/npc name not being properly interchangeable during server selection and auto-joining process. 2015-08-02 21:18:24 -04:00
Jonathan Williams 3b090d369d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-02 19:41:49 -05:00
Jonathan Williams a561bbbf12 Added hardcode for EVENT/MPS :D 2015-08-02 19:41:42 -05:00
Shaun Bennett 38cc318387 Update JOOQ, downcast BigInteger to Long in stats for now 2015-08-02 19:36:24 -05:00
Ty Sayers 32a2687991 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 20:00:15 -04:00
Jonathan Williams d9a641fd92 Updated ServerManager to read server npc stuff from redis. 
Updated ServerGroup to have NPC name in it.
 2015-08-02 18:59:43 -05:00
Jonathan Williams a2250ea343 Fix for blocking logins if redis can't add account cache. 2015-08-02 18:59:13 -05:00
Ty Sayers 4852e69991 Temporary un-finished changes for adding in team/solo UI pages and allowing players to select. 2015-08-02 19:19:40 -04:00
Jonathan Williams f520908f8d Added team and portal location info to server group. 2015-08-02 17:52:51 -05:00
Jonathan Williams 41189b9838 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-02 17:23:17 -05:00
Ty Sayers fa2bcf7f69 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 18:21:01 -04:00
Ty Sayers 70c1b883db Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups. 2015-08-02 18:20:52 -04:00
Jonathan Williams d3ba621e86 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-02 17:00:49 -05:00
Mini-Chiss 0a84bd69d8 fixed some OITQ stuff 2015-08-02 23:17:23 +02:00
Ty Sayers c2f6c402da Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 13:25:09 -04:00
Ty Sayers 612d967aa0 Add ability for auto-joining of gametypes to bypass manual server selection by player. 2015-08-02 13:24:59 -04:00
Mini-Chiss 4cc810f1c0 Merge branch 'Myst_KITS' 2015-08-02 17:55:53 +02:00
Mini-Chiss 8ea967b37e fixed possible NPE 2015-08-02 12:35:25 +02:00
Mini-Chiss 638406254b refactored a little so theres no data stored in the util 2015-08-02 12:07:00 +02:00
Mini-Chiss afc41c8831 converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity 2015-08-02 11:50:26 +02:00
Mini-Chiss ac4755a5a9 Fixed incorrect velocity 2015-08-02 11:24:34 +02:00
Mini-Chiss 7910170327 fixed achievemnt amount 2015-08-01 18:39:18 +02:00
William Burns f361ae94dc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
# Conflicts:
#	Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml
#	Plugins/.idea/compiler.xml
#	Plugins/.idea/encodings.xml
#	Plugins/.idea/misc.xml
#	Plugins/.idea/modules.xml
 2015-08-01 16:09:15 +01:00
William Burns a964f343c7 xml files are ew 2015-08-01 14:55:01 +01:00
Jonathan Williams 992c0fc36f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-01 01:12:24 -05:00
Jonathan Williams d3c5d0cbe6 Only store account cache stuff for 6 hours. 
Update MOtd.
 2015-08-01 01:12:01 -05:00
Mini-Chiss ae8d351145 Merge branch 'SSM2PlayerTeams' 2015-07-31 14:09:55 +02:00
Sarah fba10e4cbd fixing the long term "Kit" bug ;D 2015-07-31 14:08:08 +02:00
Sarah b2c538b189 little tag fix. 2015-07-31 13:40:39 +02:00
Sarah 60a1768821 Fixing Team display bug on disbanding. 2015-07-31 13:05:28 +02:00
Mini-Chiss b2a567673c disabled sale msg 
added double gem weekend
 2015-07-31 09:53:52 +02:00
Mini-Chiss a3d768af6b added res pack for HH 2015-07-30 15:07:40 +02:00
Mini-Chiss 31fd19aab5 added res pack for CC 2015-07-30 15:07:05 +02:00
Mini-Chiss 8d7c42134b fixed mounts having nametags 2015-07-30 14:54:23 +02:00
Mini-Chiss 8a5088e181 fixed SGT deathmatch not working 2015-07-30 14:47:59 +02:00
Mini-Chiss 45d117a95a added armor hotbar to smash 
fixed scoreboard in snowfight
 2015-07-30 14:45:28 +02:00
Mini-Chiss 0cf333ec00 lowered win req 2015-07-30 14:12:17 +02:00
Mini-Chiss 8ef93c0b33 Merge branch 'SSM2PlayerTeams' 2015-07-30 08:42:50 +02:00
Sarah 30fa3b3309 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-30 03:07:41 +02:00
Sarah 37e432f0b2 Git fix. 2015-07-30 03:07:21 +02:00
Sarah bf75594853 Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-30 02:33:51 +02:00
Sarah de4d0a7dc3 Fixing needler, projectiles in SW and "Banannas...". 2015-07-30 02:33:06 +02:00
Mini-Chiss 97a144150b fixed an NPE that was causing games not to end in MS 2015-07-29 21:51:18 +02:00
Mini-Chiss be910cced9 gamemode color change 2015-07-29 17:00:36 +02:00
Mini-Chiss 0e55ce1879 removed old hint 2015-07-29 16:54:30 +02:00
Mini-Chiss 1004203b34 fixed up some merge issues 2015-07-29 16:48:49 +02:00
William Burns 13af2cec74 Pick highest voting button 2015-07-29 15:44:29 +01:00
Mini-Chiss 52844d7b80 Merge branch 'EventGameUpdates' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
 2015-07-29 16:41:35 +02:00
Mini-Chiss 71bedbe0fc Merge branch 'WitherAssaultUpdate' 2015-07-29 16:37:29 +02:00
Mini-Chiss c32e959f61 Merge branch 'SnowFightUpdate' 2015-07-29 16:36:33 +02:00
Morten 1a27dea32c Why was these not added... 2015-07-29 16:35:57 +02:00
Mini-Chiss d570cce1b0 Merge branch 'WitherAssaultUpdate' 2015-07-29 16:33:06 +02:00
Mini-Chiss 862cdae14f team modes 2015-07-29 16:32:11 +02:00
Mini-Chiss e47a343e2e added mode for team games 2015-07-29 16:20:49 +02:00
Morten f714bfbb0f Adding testing achievement lol 2015-07-29 16:06:43 +02:00
Morten b5d3ad0e0d Adding perks 2015-07-29 16:05:43 +02:00
Sarah 9c5ca750cf Improving /e mob command and implementing other commands. 2015-07-29 15:53:45 +02:00
Mini-Chiss ab2c865ab3 better colors 2015-07-29 15:48:12 +02:00
Mini-Chiss 51cef64554 improved text 2015-07-29 15:29:12 +02:00
Mini-Chiss deba3f23fa Merge branch 'MPS-Maps' 2015-07-29 15:27:11 +02:00
William Burns 2b3fec754f Colour change cause colour! 2015-07-29 14:25:38 +01:00
William Burns 3bc66f16b6 Woo a push 2015-07-29 14:22:49 +01:00