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

882 Commits

Author SHA1 Message Date
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
Sarah 8c66ef7f15 changing Hub items and adding Profile GUI. 2015-08-09 18:33:44 +02:00
Mini-Chiss 5a7de8ef3d hub fixes 2015-08-09 17:21:56 +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
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
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
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
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 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
Jonathan Williams da5387c54f Fixed ConcurrentModification for ServerManager cooldowns. 2015-08-05 01:33:09 -05:00
Shaun Bennett bcd4f4f9e2 Open gui through npc 2015-08-05 00:41:50 -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
Shaun Bennett b33b0ac935 More bonus work 2015-08-04 04:00:51 -05:00
Mini-Chiss 2f571aed25 fixed bugs from my vel fixes, WHOOPS. normalisation :( 2015-08-03 18:19:31 +02:00
Shaun Bennett e200ddd777 Merge branch 'master' into Bonus 
# Conflicts:
#	Plugins/.idea/misc.xml
 2015-08-03 08:32:45 -05:00
Sarah fc412b0782 Reverting old Server Menus with Team sub-menu dor SSM, Skywars and SG. 2015-08-03 14:36:51 +02:00
Jonathan Williams 37b779f108 Fixes for servers. 2015-08-03 05:55:33 -05:00
Jonathan Williams 6c0666c59b Fix for server groups / teams. 2015-08-03 03:20:27 -05: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
Mini-Chiss 72c473ad6b removed annoying mineplex thing from subtext in news 2015-08-03 09:51:10 +02: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 6a1e5d6bfc changed item text 2015-08-03 08:23:49 +02:00
Jonathan Williams c32074e733 Fixed MPS/Event server guis so they open up like old. 
Changed sticks to player heads in solo/team selection.
 2015-08-03 00:53:06 -05:00
Jonathan Williams bfaa0e6849 Fixed event/mps hardcode. 2015-08-02 23:51:43 -05:00
Ty Sayers 58933fc855 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 21:19:00 -04:00
Ty Sayers 944a4a9535 Fix accidental double-queueing bug when left clicking server NPCs and add two second cooldown before attempting to auto-join servers. Fix bug with server groups not properly loading server NPC names into shops. Fix bug with server key/name/npc name not being properly interchangeable during server selection and auto-joining process. 2015-08-02 21:18:24 -04:00
Jonathan Williams a561bbbf12 Added hardcode for EVENT/MPS :D 2015-08-02 19:41:42 -05:00
Shaun Bennett cadd21c18b More bonus work 2015-08-02 19:12:39 -05:00
Ty Sayers 32a2687991 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 20:00:15 -04:00
Jonathan Williams d9a641fd92 Updated ServerManager to read server npc stuff from redis. 
Updated ServerGroup to have NPC name in it.
 2015-08-02 18:59:43 -05:00
Ty Sayers 4852e69991 Temporary un-finished changes for adding in team/solo UI pages and allowing players to select. 2015-08-02 19:19:40 -04:00
Ty Sayers 70c1b883db Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups. 2015-08-02 18:20:52 -04:00
Ty Sayers c2f6c402da Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-02 13:25:09 -04:00
Ty Sayers 612d967aa0 Add ability for auto-joining of gametypes to bypass manual server selection by player. 2015-08-02 13:24:59 -04:00
Shaun Bennett db15ffad72 Bonus changes + Update jooq 2015-08-02 05:17:51 -05:00
Mini-Chiss afc41c8831 converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity 2015-08-02 11:50:26 +02:00
Shaun Bennett 11e49b9678 Some updates 2015-08-02 04:28:57 -05:00
Mini-Chiss ac4755a5a9 Fixed incorrect velocity 2015-08-02 11:24:34 +02:00
Shaun Bennett fd65f27f0f Fix some typos/formatting issues 2015-07-31 10:01:19 -05:00
fooify b623f025ff manually updating something 2015-07-29 14:31:11 -07:00
fooify db5c5a9888 *crosses fingers* please work! 2015-07-29 14:12:52 -07:00
Aaron Brock 971908d38b Stuff 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-07-28 17:52:43 -04:00
Aaron Brock 832fb4638a More things 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-07-28 17:42:00 -04:00
Ben Sihota 7d9fd61c8e Display changes 2015-07-26 22:31:40 -07:00
Ben Sihota 0b53bca385 Needed permission changes for Jr Developers (Pending approval) 2015-07-26 18:58:35 -07:00
Ben Sihota 47d410370d Merge branch 'horus-bug-fixes' 2015-07-26 18:20:39 -07:00
Jonathan Williams 6d367e3cee Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-25 01:38:54 -07:00
Jonathan Williams 84be48f264 Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method. 
Added conversion of stats to new stat table via StatHandler.

Changed stats value from int to long.
 2015-07-25 01:30:50 -07:00
Ben Sihota fe80ed373a Fix numerous trello bugs 
- Stacker as Block morph
- Punish mistake
- Achievement mistake
- Stacking a chest opener
 2015-07-22 22:28:44 -07:00
Mysticate e4ecc9e858 http://pastebin.com/BRhT7pZP 2015-07-22 23:31:07 -04:00
Mysticate d38fc1a603 Reverted things 2015-07-20 16:40:37 -04:00
Mysticate 6addf00037 LOTS of tweaks :D 2015-07-20 14:27:10 -04:00
Cheese e36b0440a4 Merge branch 'bench' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
	Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
	Plugins/Mineplex.StaffServer/.classpath
 2015-07-08 13:55:01 +10:00
fooify 4ff456b722 Merge remote-tracking branch 'origin/master' into foo 2015-06-29 11:29:22 -07:00
Cheese 2963f7a61c stacker wont give too many msgs 2015-06-29 10:13:33 +10:00
Cheese 0ea388379a reduced win req for skywars ach 
enabled beenfit for 40k reward
 2015-06-28 15:16:05 +10:00
fooify 4b634d1bc3 Fix slashes (this won't affect windows users, right?) 2015-06-26 10:14:37 -07:00
Jonathan Williams 8c427bee24 Fix _gameDisplay bug. 
Fix Skywars quickmenu link.
 2015-06-26 03:57:39 -05:00
Cheese 1aa0832bb9 SkyWars to Skywars 2015-06-26 17:55:49 +10:00
Cheese 17af562f19 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 17:36:25 +10:00
Cheese 59f730ae9d changed sky text and icon to feather 2015-06-26 17:36:12 +10:00
Jonathan Williams f906f08a18 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:34:36 -05:00
Shaun Bennett 60901cc17e Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
 2015-06-26 02:32:51 -05:00
Shaun Bennett 7c698f65cf Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads 2015-06-26 02:31:35 -05:00
Jonathan Williams c78ef9d93d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:30:01 -05:00
Cheese 015ba53bbe skywars hub text 2015-06-26 16:39:25 +10:00
Jonathan Williams efa06d370b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 01:13:42 -05:00
Jonathan Williams 86e2514e37 Fixed callbacks for gem/coin rewards. 2015-06-26 01:13:28 -05:00
Cheese 2bf1faa70d fixed a few skywars bugs 
added ore generation (but theres some wierd bug, still working on it)
 2015-06-25 20:24:31 +10:00
Jonathan Williams 91b5beaff2 Fixed new Chat constructor requirement. 2015-06-20 03:43:38 -05:00
Aaron Brock da981980df Added world.setThundering(false); 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:35:11 -04:00
Aaron Brock 61494f93ba Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench 2015-06-19 18:13:48 -04:00
Cheese 8a224950b3 Added sale notifications 
Added 3s chat delay
 2015-06-19 13:27:59 +10:00
Aaron Brock b0ca5ca4aa Freezes the time using doDayLightCycle instead of using a UpdateEvent. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-17 20:54:28 -04:00
libraryaddict 37c6593753 Hub: Fix rulebook 2015-06-10 05:27:19 +12:00
libraryaddict 574dd16022 Hub: Modify rulebook 2015-05-30 10:20:28 +12:00
Jonathan Williams f0c7f2fe76 Merge branch 'MSSQL_Conversion' 
Conflicts:
	Website/LOCWebsite.suo
 2015-05-17 23:11:50 -07:00
Jonathan Williams 5a8f93f3db Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-14 00:12:22 -07:00
Jonathan Williams b7cdc82cd2 Fixed server sorter for UHC. 
Work on converting to UltraDNS api.
 2015-05-14 00:12:13 -07:00
Shaun Bennett 2c020d10a6 Merge remote-tracking branch 'origin/master' 2015-05-13 22:52:22 -05:00
Shaun Bennett 84c53347f8 [Hub] Add UHC to Quick server menu. Better formatting coming soon! 2015-05-13 22:52:14 -05:00
Mini-Chiss 2c3116a7a6 removed firework and sound from legend join 2015-05-13 15:45:29 -05:00
Jonathan Williams 1c6a12528c Added ability for LT to modify Admin ranks. 
Added Twithc rank to the updateRank list.

Fixed server sorting issues with UHC Generating servers.
 2015-05-13 00:58:45 -07:00
Jonathan Williams 98dcb9747a Added UHC support to server sorter. 2015-05-13 00:10:17 -07:00
Mini-Chiss f9735006b8 removed hub uhc hourly announcements 2015-05-13 00:05:00 -05:00
Shaun Bennett 53555a42cd [Core] Add MB Stats in gui, Add MB Achievement, Update stat gui layout, add ability to display combined stats 2015-05-12 17:14:50 -05:00
Mini-Chiss 643ed2c047 Fixed most enchants not working 
added commands to event
minor update to snowfight to make it more fun
 2015-05-11 19:55:26 -05:00
libraryaddict a558995e12 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-12 09:52:21 +12:00
Jonathan Williams b1a46d0f0d Converted TaskManager 2015-05-11 01:21:27 -07:00
Shaun Bennett 46c07665e1 Merge remote-tracking branch 'origin/master' 2015-05-11 00:44:34 -05:00
Shaun Bennett 800ce68637 Add Beta Games and Player Servers to Quick game menu (text probably needs tweaking) 2015-05-10 16:58:04 -05:00
libraryaddict 241935ef63 SurvivalGames: Removed description of deep freeze and updated to beware of borders 2015-05-11 09:13:04 +12:00
Mini-Chiss 822718095d cannot PM from spawn 
first push of cards game
 2015-05-09 12:23:07 -05:00
Jonathan Williams a7407d8b8c Added all minigames standalones into mixed arcade player count. 2015-05-04 22:51:21 -05:00
Jonathan Williams 4252bf70df Fix Master Builder game button in quick menu. 2015-05-04 01:40:57 -05:00
Jonathan Williams c8b5c84aa6 Added Master Builder quick game menu option. 
Added player counts to quick game menu
 2015-05-04 00:42:49 -05:00
Mini-Chiss 4f4aeac12c fixed typo 2015-05-03 23:34:09 -05:00
Mini-Chiss e013f8af8a sky text for hub change 2015-05-03 19:49:16 -05:00
Mini-Chiss 40d56c3500 Converted all code to updated UtilParticle methods 
/suicide
 2015-05-03 16:37:00 -05:00
Jonathan Williams 283d550903 Added Wizards to quick game menu. 2015-05-01 01:24:01 -05:00
Jonathan Williams fa4466b6a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-05-01 00:13:39 -05:00
Jonathan Williams d161d62773 Added chat filtering to private messages. 2015-04-30 23:56:08 -05:00
libraryaddict 9f8fe3bf78 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-04-22 03:45:59 +12:00
Cheese c79432c8b9 Fixed projectile hitboxes and specific values 2015-04-04 10:54:03 +11:00
Cheese ff0883e7d7 fixed easter egg duration 
parser list improvement
 2015-04-03 21:47:43 +11:00
Cheese ed35d2a992 April Fools update 2015-04-01 16:56:13 +11:00
Shaun Bennett 50c38dc467 April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA 2015-03-31 17:22:50 -04:00
Jonathan Williams f4061854cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-25 15:11:17 -07:00
Jonathan Williams 6472194d44 Optimized queries to retrieve and update player information by removing inner join calls on the account. 
Added account id retrieval on login.
Added account id caching in redis.
 2015-03-25 15:10:59 -07:00