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

3705 Commits

Author SHA1 Message Date
Shaun Bennett adb76b0681 Fix giving out gold 2015-08-10 04:51:46 -05:00
Shaun Bennett 8745884153 Various fixes 2015-08-10 04:51:11 -05:00
Shaun Bennett b8b19ed4a5 Merge remote-tracking branch 'remotes/origin/master' into Bonus 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-08-10 03:24:59 -05:00
Shaun Bennett 6f8d6f8a40 Move Bonus and Poll to core 2015-08-10 01:55:50 -05:00
Shaun Bennett a0be3fa964 Use atomic mysql operations for modifying tickets 2015-08-10 01:19:10 -05:00
Shaun Bennett 511cc76bef Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working) 2015-08-10 00:47:36 -05:00
Shaun Bennett 28806aaf0a Update Bonus amounts, Attempting to fix Votifier plugin for EU/US 2015-08-10 00:33:54 -05:00
Shaun Bennett d20fe54010 Disable carl features when carl can't be found 2015-08-09 16:36:48 -05:00
Mini-Chiss c2d066a576 ui fixes 2015-08-09 19:31:24 +02:00
Mini-Chiss 41dcc564c9 polish polish polish 
MAKE IT SHINE!
 2015-08-09 19:02:07 +02:00
Mini-Chiss ee65c72e86 and wizards! 2015-08-09 18:46:02 +02:00
Sarah 8c66ef7f15 changing Hub items and adding Profile GUI. 2015-08-09 18:33:44 +02:00
Mini-Chiss fdfc9ae99d longer games wont announce stay msgs 2015-08-09 18:17:29 +02:00
Sarah ac5ff08fad Git fix 2015-08-09 17:23:38 +02:00
Mini-Chiss 5a7de8ef3d hub fixes 2015-08-09 17:21:56 +02:00
Sarah 0d70fb6b96 removing deop of Admins and adding OP condition to setHost. 2015-08-09 16:55:10 +02:00
Sarah 941e746ca9 Finalizing Poll GUI in Carl's GUI. 2015-08-09 16:47:03 +02:00
Sarah 85c8e42f53 Finalizing and improving the Carl spinner and adding creeper explosion animations. 2015-08-09 15:00:54 +02:00
Mini-Chiss b974fcf838 map parser fixes 2015-08-09 00:09:26 +02:00
Shaun Bennett e6519206af Add event to be called when a player tries to buy a carl spin 2015-08-08 16:29:03 -05: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
Shaun Bennett 4f6dfdb856 Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes 2015-08-08 06:35:25 -05: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
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
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
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
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
Shaun Bennett bcd4f4f9e2 Open gui through npc 2015-08-05 00:41:50 -05: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
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