Commit Graph

3753 Commits

Author SHA1 Message Date
Morten 7838ad2bce For Bisko to pull 2015-09-22 16:12:51 +02:00
Morten a5398cb773 Added new challenges and fixed a lot of bugs. 2015-09-19 19:01:13 +02:00
Morten 6ea9a15e6d Added a bunch of games 2015-09-07 11:46:08 +02:00
Morten f9fecebeec Minor update ;) 2015-08-22 11:01:37 +02:00
Mini-Chiss b974fcf838 map parser fixes 2015-08-09 00:09:26 +02:00
Mini-Chiss cbb0cb96c8 ensured white 2015-08-08 13:54:35 +02:00
Mini-Chiss e030331565 fixed some bugs 2015-08-08 13:51:37 +02:00
Mini-Chiss fa7f19bde5 removed debug 2015-08-08 13:47:30 +02:00
Mini-Chiss 328c31de88 hub Update
fixed bad gameid
2015-08-08 13:47:09 +02:00
Mini-Chiss eab7aa59f2 hub update! 2015-08-08 09:27:49 +02:00
Mini-Chiss 47cb98066d Hub fixes 2015-08-08 08:19:07 +02:00
Mini-Chiss 33c96f51ae fixed some stuff 2015-08-07 22:59:50 +02:00
Mini-Chiss 090c1f135d Merge branch 'SarahsAwesomeBugFixes'
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
2015-08-07 21:48:35 +02:00
Mini-Chiss b22706e649 hub update part 1 2015-08-07 21:45:38 +02:00
Jonathan Williams fcfb63c47d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-07 02:23:10 -05:00
Jonathan Williams 320a3efe5b Remove some debug code. 2015-08-07 02:22:58 -05:00
Jonathan Williams e8c60e6e84 Added storage of pets in mysql. Going to have live while backend process is copying data over.
Updated ServerTypePage to resolve clicking issues with solo/team pages.
2015-08-07 02:22:13 -05:00
Sarah 181b778a9c Fixing some bugs and disallow MPS while disguised. 2015-08-07 07:39:40 +02:00
Morten f37e25e9d7 Finish push for today <3 2015-08-07 07:03:15 +02:00
Morten 608e8bf693 For Sarah <3 2015-08-07 05:40:16 +02:00
Morten 1680b652db Added Hat layer skin
Added Sneak animation

With love from Morten <3
2015-08-07 03:10:17 +02:00
Sarah d8041ba582 Fixing Players can disguise as disguised Players. 2015-08-06 20:57:56 +02:00
Mini-Chiss ebbc13c0a4 lowered headshot damage 2015-08-06 17:07:52 +02:00
Sarah 4a10f8d71a fixing very last bugs. Ready to push!!! 2015-08-06 13:23:38 +02:00
Sarah 6947b54e66 16 char limit and Steve Skin. 2015-08-06 09:45:02 +02:00
Sarah 5809359449 Random Player disguises. 2015-08-06 09:19:19 +02:00
Sarah 208ce95c97 No youtuber Disguise. 2015-08-06 09:11:39 +02:00
Sarah b52a9477fe No Staff disguises! 2015-08-06 09:07:30 +02:00
Sarah abf12dbbfa Merge branch 'SarahsAwesomeBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes 2015-08-06 08:44:36 +02:00
Sarah 6a3d888f5b fix git 2015-08-06 08:44:16 +02:00
Sarah 16a8164030 Fixing last bugs and disabling coin bombs while diguised. 2015-08-06 08:42:09 +02:00
Mini-Chiss fbaec460dc removed debug 2015-08-05 20:26:50 +02:00
Mini-Chiss 7fbe29d0af Merge branch 'SarahsAwesomeBugFixes' of ssh://184.154.0.242:7999/min/mineplex into SarahsAwesomeBugFixes 2015-08-05 20:25:38 +02:00
Mini-Chiss ea0c6075f2 rank sifx 2015-08-05 20:25:23 +02:00
Sarah a15e8e1b95 Fixing more /disguise bugs. 2015-08-05 15:23:16 +02:00
Sarah 83da6b7a9a Improving the /disguise command even more. ;D 2015-08-05 13:32:05 +02:00
Mini-Chiss e86e7b624e remnvoed special case for me 2015-08-05 10:28:05 +02:00
Mini-Chiss cba1c3bcca disallowed negative stats completely 2015-08-05 09:03:22 +02:00
Mini-Chiss fa2a585dac Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-05 08:57:47 +02:00
Mini-Chiss 5d7cc59909 fixed cases where negative stats were being uploaded 2015-08-05 08:56:52 +02:00
Sarah 91de6a1852 last fix... 2015-08-05 08:40:09 +02:00
Jonathan Williams da5387c54f Fixed ConcurrentModification for ServerManager cooldowns. 2015-08-05 01:33:09 -05:00
Sarah 511c61611a fixing earlier commit. 2015-08-05 08:32:52 +02:00
Sarah e55557e1fd Improving the /disguise command. 2015-08-05 07:57:52 +02:00
Jonathan Williams 95bb4ab04b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-04 13:56:41 -05:00
Jonathan Williams b2116cc7e8 Merge branch 'OldServerSelector' 2015-08-04 13:56:23 -05:00
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