Sam
|
4c825cf80b
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
|
2016-08-08 22:48:33 +01:00 |
cnr
|
4180f03a52
|
Use the correct SalesPackageBase for gadgets
|
2016-08-07 22:40:26 -04:00 |
|
cnr
|
0ca4fe2d38
|
Disable MAC kick for suspicious movement
|
2016-08-04 12:41:59 -04:00 |
|
cnr
|
3610f78b37
|
Merge branch 'feature/thanks' into develop
|
2016-08-03 22:23:46 -04:00 |
Shaun Bennett
|
85c4c181ec
|
Reload ThankData when a player is /thank - Allows rewards to appear immediately at carl
|
2016-08-03 18:22:36 -05:00 |
|
Shaun Bennett
|
e113bedea5
|
Fix accidentally refactoring "thanks" in strings
|
2016-08-03 15:11:31 -05:00 |
|
Shaun Bennett
|
72f078fe54
|
Fix using wrong name, add missing jooq files
|
2016-08-03 15:04:06 -05:00 |
|
Shaun Bennett
|
6d93efc1a2
|
Adjust button text as well
|
2016-08-03 14:57:30 -05:00 |
|
Shaun Bennett
|
ad6c1dd970
|
Adjust some text wording
|
2016-08-03 14:55:33 -05:00 |
|
Shaun Bennett
|
2e80838376
|
Update ClaimTips lore
|
2016-08-03 14:25:07 -05:00 |
|
Shaun Bennett
|
1ae7f6cb25
|
Integrate the new ThankManager into Amplifiers
|
2016-08-03 14:03:12 -05:00 |
|
cnr
|
3f0938815d
|
Merge branch 'update/clans' into develop
|
2016-08-03 12:39:52 -04:00 |
|
Sam
|
2b8754aa32
|
Metal Kit bug fixes
|
2016-08-02 23:34:12 +01:00 |
|
Shaun Bennett
|
f41cd8c104
|
Add /thank command. Update jooq files
|
2016-08-02 00:10:46 -05:00 |
|
Sam
|
2c37af32ca
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
|
2016-08-01 19:19:34 +01:00 |
AlexTheCoder
|
d12d353c20
|
Fix pronoun in message autoreply
|
2016-07-30 17:36:03 -04:00 |
|
cnr
|
d853f8467c
|
Merge branch 'update/clans' into develop
|
2016-07-28 22:56:23 -05:00 |
TadahTech
|
9529789159
|
Remove 3 second chat delay.
|
2016-07-28 22:54:04 -05:00 |
|
AlexTheCoder
|
47d79bbad5
|
Fix bugs arising during clans release
|
2016-07-28 19:08:47 -04:00 |
|
TadahTech
|
ab9bf2f405
|
Fixes possible bug with party leaders not seeing chat.
Adds pling when you received an invite.
|
2016-07-28 03:40:24 -05:00 |
|
cnr
|
dd38a1dd76
|
Merge branch 'update/clans' into develop
|
2016-07-27 20:40:35 -05:00 |
|
cnr
|
05e59ae9cc
|
Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing""
This reverts commit 917b83250d.
|
2016-07-27 19:03:04 -05:00 |
|
AlexTheCoder
|
031a9575ae
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
|
2016-07-27 15:13:18 -04:00 |
|
Sam
|
8648581140
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
|
2016-07-27 19:57:25 +01:00 |
|
cnr
|
167c0f2b5e
|
Reimplement EnergyShopButton with new machinery
|
2016-07-27 13:52:03 -05:00 |
|
cnr
|
3cddf35d12
|
Refactor out legacy ConfirmationPage
|
2016-07-27 13:52:03 -05:00 |
|
cnr
|
3d0cc2a5fd
|
Refactor Clans gold dependency out of core
|
2016-07-27 13:52:03 -05:00 |
|
cnr
|
dc96258055
|
Merge branch 'feature/party-v2' into develop
|
2016-07-27 13:19:25 -05:00 |
|
Shaun Bennett
|
0d46bc4609
|
Add Amplifier thank button
|
2016-07-27 13:17:36 -05:00 |
|
AlexTheCoder
|
157c969e8d
|
Completely prevent players in parties from joining Clans servers
|
2016-07-27 05:51:49 -04:00 |
|
AlexTheCoder
|
a1fd021f8d
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
|
2016-07-25 10:59:38 -04:00 |
|
AlexTheCoder
|
979bb92034
|
Allow treasure chests to be placed in other locations instead of fixing them in the main hub's configuration
|
2016-07-25 10:57:15 -04:00 |
|
AlexTheCoder
|
25b0ae5916
|
Add support for sending players back to any clans hub via portal
|
2016-07-25 10:56:30 -04:00 |
|
TadahTech
|
a23c2c4e1c
|
Update UI to reflect allowing upgrades to be shown, per kit.
|
2016-07-24 16:05:19 -05:00 |
|
TadahTech
|
ceccf2d2ac
|
Don't give the item when a game is in progress.
|
2016-07-23 22:36:53 -05:00 |
|
TadahTech
|
133376fb94
|
Relocation of Full server check in party invites. Fixes a bug where people cannot invite players to their party, regardless of which server they are on, when the inivters server is full.
|
2016-07-23 19:50:57 -05:00 |
|
Sam
|
50de769e36
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
|
2016-07-24 00:13:13 +01:00 |
|
AlexTheCoder
|
818ed4c9a9
|
Set up clans monetization features in the shop and fix some hardcoded names in core
|
2016-07-22 00:18:34 -04:00 |
|
TadahTech
|
5d0b5f80c0
|
Fix Party server sending. Tweak playercount and GUI display
|
2016-07-21 18:01:43 -05:00 |
|
AlexTheCoder
|
75cc75f40c
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
|
2016-07-21 17:25:15 -04:00 |
|
TadahTech
|
2b8930eee8
|
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
|
2016-07-21 15:32:49 -05:00 |
|
TadahTech
|
d7c5184980
|
Party fixes and tweaks.
|
2016-07-21 15:24:48 -05:00 |
|
Shaun Bennett
|
9ed0bbe43a
|
Fix NPC's for unloaded worlds
|
2016-07-21 14:22:38 -05:00 |
xXVevzZXx
|
0262452b6a
|
Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable.
|
2016-07-21 13:59:35 -05:00 |
|
Sam
|
faece2c5f8
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
|
2016-07-21 11:13:15 +01:00 |
|
AlexTheCoder
|
2615ef74dd
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
|
2016-07-21 05:09:54 -04:00 |
|
TadahTech
|
b48f97fd2e
|
Fix stupid JOOQ issue and IntelliJ.
|
2016-07-21 03:46:18 -05:00 |
|
TadahTech
|
b734dc4e87
|
Remove Pay wall for Party sizes
|
2016-07-21 02:59:15 -05:00 |
|
TadahTech
|
9f0f4e0018
|
Fix possible cross server invite spamming.
|
2016-07-21 02:20:02 -05:00 |
|
TadahTech
|
f1b3c4756d
|
Use UUID's instead of playernames.
|
2016-07-21 02:16:26 -05:00 |