TadahTech
978ee0055a
Bug fixes.
2016-07-04 09:15:47 -05:00
TadahTech
0ebddf9f45
Add UI Item.
...
Add check to make sure player's cant be invited to another party if they're already in one.
Bug fixes.
2016-07-04 05:43:01 -05:00
TadahTech
584c8f50f0
PC Party bugs and tweaks.
2016-07-04 05:12:02 -05:00
TadahTech
06feb615a9
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-04 04:18:01 -05:00
AlexTheCoder
e4c94f5421
Fix whitelist for Customer Support servers
2016-07-02 01:32:42 -05:00
LCastr0
30f413d04e
Fixes for persistence:
...
No longer save items after they are disabled
No longer keep the particle effect after a staff vanishes
2016-06-25 02:22:20 -03:00
TadahTech
50759661cf
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-24 23:52:27 -05:00
LCastr0
d75abe3aea
Persistence fixes
2016-06-25 00:36:00 -03:00
LCastr0
83f4b25887
Testing persistence fixes
2016-06-25 00:33:36 -03:00
cnr
c430566c6d
Never reset a player's YouTube click time locally
2016-06-24 16:59:27 -05:00
Shaun Bennett
94fe9f57d2
Add missing imports
2016-06-24 12:36:56 -07:00
Kenny Goodin
dc9145c707
Hotfix, disable youtube and twitter buttons in BonusGUI
2016-06-24 15:33:07 -04:00
TadahTech
8fbb06ae3d
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-06-24 04:11:38 -05:00
TadahTech
e71fc291d1
Fix cross server invites / joining servers.
2016-06-24 04:01:51 -05:00
Shaun Bennett
b4caf5125b
Adjust tip amounts
2016-06-24 03:16:42 -05:00
Shaun Bennett
d708c478d7
Dont display other boosters, fix typo
2016-06-24 03:16:42 -05:00
Shaun Bennett
348cb9efba
Fix remaining booster message
2016-06-24 02:23:09 -05:00
cnr
b58ff8c066
Add YouTube and Twitter buttons to UI
2016-06-24 01:30:10 -05:00
Shaun Bennett
def57e2c0b
Fix HubManager, add failsafe for BoosterManager
2016-06-23 23:19:02 -07:00
Shaun Bennett
fd843b88cb
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
# Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
2016-06-23 23:02:26 -07:00
Shaun Bennett
a9f291338f
Amplifiers GM Candidate
2016-06-23 22:49:12 -07:00
TadahTech
c204562eb3
Fix cross server invites / joining servers.
2016-06-23 23:25:26 -05:00
TadahTech
ce1aab5e11
Fixes and changes
2016-06-23 21:53:12 -05:00
cnr
3433e0e3bc
Merge branch 'project-cosmetics' into develop
2016-06-23 18:42:47 -05:00
LCastr0
c1b7be6363
Fix merge problems
2016-06-23 16:33:20 -03:00
LCastr0
7749314e64
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-23 16:11:49 -03:00
LCastr0
a441727e09
Freedom update:
...
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
2016-06-23 16:09:31 -03:00
TadahTech
33cce620be
Update UI and fix typos
2016-06-23 03:11:45 -05:00
TadahTech
df53021f7c
Fix Party Redis. Improve Party UI. General testing and fixing. (Funny enough, again.
2016-06-23 02:56:42 -05:00
TadahTech
fb6a772eb0
Fix Party Redis. Improve Party UI. General testing and fixing.
2016-06-23 02:39:05 -05:00
Shaun Bennett
6e2c751be1
Adjust amplifiers queue message
2016-06-22 21:09:09 -07:00
Shaun Bennett
0873efd876
Update more lore text
2016-06-22 20:54:29 -07:00
Shaun Bennett
621d72f541
Fix merge issues, update lore text
2016-06-22 20:51:58 -07:00
Shaun Bennett
249a5c70aa
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-22 20:35:40 -07:00
Shaun Bennett
906e0e0044
Allow API error messages from HTTP 503
2016-06-22 20:31:18 -07:00
Alex-The-Coder
2453f82061
Rename Filterbutton.java to FilterButton.java
2016-06-22 18:40:12 -04:00
TadahTech
50534c3af9
UI And server manager changes
2016-06-22 17:28:43 -05:00
Shaun Bennett
e855a866c7
Fix more thanks and booster occurrences
2016-06-22 08:58:27 -07:00
TadahTech
e53b474f3f
Fix typo.
2016-06-22 00:59:22 -05:00
TadahTech
38a13d01f1
Open server menu properly
2016-06-22 00:56:44 -05:00
TadahTech
4d31867e98
PC Party updates.
2016-06-22 00:35:57 -05:00
TadahTech
e39326b592
Help Command UI.
2016-06-21 00:11:33 -05:00
TadahTech
b75e87753d
Party UI work.
2016-06-20 22:45:53 -05:00
TadahTech
a49e815765
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-20 16:40:33 -05:00
TadahTech
2211cf4dec
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-20 16:37:07 -05:00
Shaun Bennett
1c1912b92a
Update fountain goals again
2016-06-20 00:52:33 -05:00
Shaun Bennett
afc636b7c5
Fix amplifier reward message
2016-06-19 20:16:33 -05:00
Shaun Bennett
bb8d94f38a
Fix a lot more Booster cases
2016-06-19 19:48:17 -05:00
Shaun Bennett
63b7648608
Amplifier rename, move podium backwards
2016-06-19 19:05:04 -05:00
Shaun Bennett
38058bc670
Confirmation Paging
2016-06-19 05:49:32 -05:00
