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

3149 Commits

Author SHA1 Message Date
Shaun Bennett
e12ed35da1 Fix NPE and kit upgrades issue 2016-09-07 23:13:28 -04:00
Shaun Bennett
9318ba4de2 Merge branch 'develop' into bugfix/samczsun 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
 2016-09-07 20:12:57 -04:00
Shaun Bennett
7fbd6087eb Merge pull request #187 from Mineplex-LLC/update/oitq 
Skywars Update Patch
 2016-09-07 20:08:08 -04:00
Sam
bed563876a Add a comment to explain usage of KitUpgradeShop 2016-09-07 14:18:07 +01:00
Shaun Bennett
b1b9900c9e Add offline stat checking 2016-09-07 07:47:19 -04:00
AlexTheCoder
225583a13d Remove join restrictions on beta servers from unranked players 2016-09-06 21:36:30 -04:00
samczsun
444fe5d151 Remove hacky reflection method to get server name 2016-09-05 18:37:17 -04:00
samczsun
6490ab3786 Don't hide banwave animation from staff 2016-09-05 18:25:16 -04:00
samczsun
6b1d551a37 Remove please investigate 2016-09-05 18:25:16 -04:00
samczsun
0678f7287d No fake levels for those who don't want it 2016-09-05 18:25:16 -04:00
samczsun
d09b27bfe1 Fix disguises prevent join, join rank check bugs 2016-09-05 18:25:16 -04:00
samczsun
c18d771715 Unbreak Squid in SSM 2016-09-05 18:25:16 -04:00
Sam
12130d41e6 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-05 17:59:51 +01:00
AlexTheCoder
29bb2a3895 Add an enjin chargeback command and fix punishing in support servers 2016-09-04 00:39:44 -05:00
Sam
b3212fc003 Particle changes 2016-09-03 20:13:08 +01:00
Sam
4b1c93150b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-03 20:12:39 +01:00
Sam
8d5d0c6272 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-03 18:29:37 +01:00
Sam
c3c61b8189 Merge fix 2016-09-03 18:29:18 +01:00
cnr
c9358d8c5a Add power play to support server 2016-09-02 19:10:30 -05:00
cnr
ae0d30558c Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:12:12 -05:00
cnr
f6db5393a3 Merge branch 'project-cosmetics' into develop 2016-09-02 00:08:23 -05:00
cnr
71b880793f Implement power play logging and initial rewards 2016-09-02 00:01:49 -05:00
TadahTech
9e0bb6ff96 Tweak invite starting index. 
Disable NextBestGame in an MPS
 2016-09-01 20:59:28 -05:00
TadahTech
9fcee07427 Fix people getting stuck in chests. 2016-09-01 05:34:37 -05:00
cnr
9cd5b73432 Merge branch 'update/basketball-game' into develop 2016-08-31 23:19:51 -05:00
cnr
55086efd91 Merge branch 'feature/shadowmute' into develop 2016-08-31 23:16:57 -05:00
LCastr0
8e8719070c Changes Omega Chest to not be craftable 
Changes LockCosmetic and PowerPlay commands to be JNR_DEV+
 2016-08-31 23:26:41 -03:00
AlexTheCoder
ba02dea404 Fix me being dumb 2016-08-30 03:22:55 -04:00
TadahTech
90ce21db3d Update preferences 2016-08-30 00:51:51 -05:00
AlexTheCoder
8ca214a4d8 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-08-30 01:37:14 -04:00
TadahTech
a68f7395e4 Use proper server group / remove testing. 2016-08-30 00:10:38 -05:00
TadahTech
dfced7186f Finish tweaks for the hub 2016-08-29 22:32:07 -05:00
AlexTheCoder
463c03e9d1 Add pitch and yaw to npcs 2016-08-29 22:11:53 -04:00
Shaun Bennett
f72647e1d4 Merge with develop 2016-08-29 21:56:03 -04:00
Shaun Bennett
e7d876e865 Fix string.format param order 2016-08-29 21:33:00 -04:00
TadahTech
39ea280098 NextBestGame code and new hub releases 2016-08-29 20:21:36 -05:00
LCastr0
3687c7ad98 PowerPlayClub update 2016-08-29 21:32:11 -03:00
Shaun Bennett
f3e38031ab Add shadowmuting 2016-08-29 18:57:07 -04:00
Sam
9454e1f409 Skywars and Kit Progression 2016-08-29 23:07:48 +01:00
Sam
a35c162dc4 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-26 21:26:16 +01:00
Sam
efc14ee13f Another merge fix 2016-08-26 21:26:14 +01:00
LCastr0
3e38eb5990 Fixes to the merging conflicts 2016-08-25 20:13:59 -03:00
LCastr0
25d64c6dee Changes to lock command 2016-08-25 20:12:00 -03:00
TadahTech
b3b8f44b3a Fix perks not being registered. 2016-08-25 05:11:52 -05:00
TadahTech
ebfd00ebc3 Fix centering of the Preference Menu 2016-08-25 04:04:53 -05:00
TadahTech
41b40fa12c Fix painting breaking. 2016-08-25 03:54:10 -05:00
TadahTech
77e0090531 Tweak preferences 2016-08-25 00:17:31 -05:00
TadahTech
1654850e8c Final Changes 2016-08-24 22:26:38 -05:00
TadahTech
ba2bee4f25 Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
 2016-08-24 21:29:01 -05:00
TadahTech
bca19788db Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
 2016-08-24 21:28:36 -05:00