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

3868 Commits

Author SHA1 Message Date
Jonathan Williams 813dfb26b3 Finalized revert to old server menus. 
Tied in solo/team buttons to use old server menu as well.
 2015-08-04 13:54:06 -05:00
Jonathan Williams e5dd4d1ebf Updated MOTD 2015-08-04 13:13:31 -05:00
Mini-Chiss 88fe5b3ec6 Merge branch 'MPS-Maps' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
 2015-08-04 17:37:32 +02:00
Mini-Chiss 1fd5c51f03 DINGO ATE MY BABY 2015-08-04 17:33:23 +02:00
Sarah ec3bc7cc38 Try fixing the map selection. 2015-08-04 17:04:49 +02:00
William Burns 644d6c9914 Whitelist fixes. Implemented MapSource. 2015-08-04 11:21:58 +01:00
Shaun Bennett b33b0ac935 More bonus work 2015-08-04 04:00:51 -05:00
Mini-Chiss 13d139d197 team kills/deaths only store for 3 games now 2015-08-04 08:46:00 +02:00
Mini-Chiss 2d07cc571c reduced invis in OITQ 2015-08-03 18:53:00 +02:00
Mini-Chiss 2f571aed25 fixed bugs from my vel fixes, WHOOPS. normalisation :( 2015-08-03 18:19:31 +02:00
Jonathan Williams a623cc16ce Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-03 09:37:12 -05:00
Mini-Chiss 40e2b6216e oops, was right before, reverting change. 2015-08-03 16:30:38 +02:00
Mini-Chiss f350e4efe5 further fixed gem stuff! 2015-08-03 16:25:31 +02:00
Mini-Chiss 67fd0e2c1d fixed MPS awards formatting 2015-08-03 16:24:43 +02:00
Mini-Chiss ab670a03fb fixed logic error that was displaying gems wrong 2015-08-03 16:23:50 +02:00
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
Shaun Bennett e200ddd777 Merge branch 'master' into Bonus 
# Conflicts:
#	Plugins/.idea/misc.xml
 2015-08-03 08:32:45 -05: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