Commit Graph

4931 Commits

Author SHA1 Message Date
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
fooify
db521668a9 more changes! it's getting pretty cool now x) 2015-08-07 14:20:15 -07: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
Mysticate
858e57bb0d edited a few things 2015-08-07 14:39:29 -04:00
fooify
f70b1231ab AI fixes and such for Monster Maze 2015-08-07 10:32:31 -07:00
Mysticate
a9350bfacd Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-07 11:58:53 -04:00
Shaun Bennett
f76d9b0d37 Replace Consumers with Callbacks 2015-08-07 04:20:54 -05:00
Shaun Bennett
5ebc7080ee Push fixes 2015-08-07 04:13:09 -05:00
Mini-Chiss
5f8e80a55f art 2015-08-07 11:10:50 +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
Shaun Bennett
5f435a079e Update vote button 2015-08-06 21:59:21 -05:00
Shaun Bennett
be18dc1bf5 Add experience rewards to reward manager 2015-08-06 21:41:56 -05:00
Shaun Bennett
6311ceaa0f Reward work for new Game reward rarity and setup for carl, work on carl spinner 2015-08-06 21:15:17 -05:00
Morten
1680b652db Added Hat layer skin
Added Sneak animation

With love from Morten <3
2015-08-07 03:10:17 +02:00
Shaun Bennett
44e30a0903 SimpleGui Improvements, Change daily timer to 20 hours, Add Carl Spin button, Starter code for Spin Gui 2015-08-06 15:34:56 -05:00
Sarah
d8041ba582 Fixing Players can disguise as disguised Players. 2015-08-06 20:57:56 +02:00
fooify
67bbd3a605 kk did merge 2015-08-06 10:16:37 -07:00
fooify
0a9f7cc888 Merge remote-tracking branch 'origin/master' into monster-maze 2015-08-06 10:13:54 -07:00
fooify
f27ca9ba71 still working on merge 2015-08-06 10:13:34 -07:00
fooify
42868b2a0a trying to merge... 2015-08-06 10:09:13 -07:00
fooify
9e92a3a68d more changes (not really ready for testing yet though...) 2015-08-06 09:44:00 -07:00
Mini-Chiss
ebbc13c0a4 lowered headshot damage 2015-08-06 17:07:52 +02:00
Shaun Bennett
c67f4fa7e6 Votifier fixes 2015-08-06 06:45:47 -05:00
Sarah
4a10f8d71a fixing very last bugs. Ready to push!!! 2015-08-06 13:23:38 +02:00
Shaun Bennett
35d999d747 Remove some debug messages 2015-08-06 05:56:31 -05:00
Shaun Bennett
9e9f9862d0 Bonus bonus bonus! 2015-08-06 05:47:32 -05: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
Shaun Bennett
4cad99eb76 Lots of bonus work, start adding Votifier plugin 2015-08-06 00:45:39 -05:00
fooify
b5d1202674 YET MORE WORK ON MM 2015-08-05 13:09:26 -07: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
fooify
551451c533 moar changes 2015-08-05 10:30:27 -07: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