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

3622 Commits

Author SHA1 Message Date
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
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
Mini-Chiss b2db2e988f Merge branch 'WitherAssaultUpdate' 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
 2015-07-29 15:13:28 +02:00
Mini-Chiss 1c2bd988f9 fixed spawns for team gameds 2015-07-29 15:10:21 +02:00
William Burns f6e64d25a2 Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps 2015-07-29 13:27:45 +01:00
William Burns f82defb1db Whitelist 2015-07-29 13:27:26 +01:00
Mini-Chiss 30f0b3cb60 fixed close spawn stuff 2015-07-29 14:25:15 +02:00
Mini-Chiss c9c3db70f3 Merge branch 'SSM2PlayerTeams' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-07-29 14:08:17 +02:00
Mini-Chiss 932fe197b4 Merge branch 'perm-changes' 
Conflicts:
	Plugins/.idea/encodings.xml
reverted it.
 2015-07-29 14:06:21 +02:00
Mini-Chiss ef89b96144 fixed game page bug 2015-07-29 14:02:56 +02:00
Mini-Chiss b42be044ae whtielisted MPS will be hidden from GUI 2015-07-29 13:20:20 +02:00
Mini-Chiss e0ab853e57 Merge branch 'MPS-Maps' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
	Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
 2015-07-29 13:03:05 +02:00
Mini-Chiss c3e07522b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-29 12:22:11 +02:00
Ben Sihota 5af68e5628 Fulfill Shaun's request 2015-07-28 23:55:27 -07:00
Jonathan Williams 10549601f8 Merge pull request #21 in MIN/mineplex from Myst_LOBBERS to master 
* commit 'd0a45461d07904f70b5e42dee391f69843fb3978':
  Fixed bug with direct hit
  Final tweaks. this is as good as it's goign to get! ;d
  Tweaks
  Fixed waller achievement thing
  Fixed waller kit bc I was stupid before ;c
  Added an exception for a map to make it night.
  Various improvements.
  Added an achievement, removed team one, touched up another. Swag.
 2015-07-29 00:15:41 -05:00
Mysticate d0a45461d0 Fixed bug with direct hit 2015-07-28 21:25:29 -06:00
Mysticate 3e0eb03112 Final tweaks. this is as good as it's goign to get! ;d 2015-07-28 20:39:55 -06:00