2b8754aa32
Metal Kit bug fixes
2016-08-02 23:34:12 +01:00
f41cd8c104
Add /thank command. Update jooq files
2016-08-02 00:10:46 -05:00
2c37af32ca
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-01 19:19:34 +01:00
d12d353c20
Fix pronoun in message autoreply
2016-07-30 17:36:03 -04:00
d853f8467c
Merge branch 'update/clans' into develop
2016-07-28 22:56:23 -05:00
9529789159
Remove 3 second chat delay.
2016-07-28 22:54:04 -05:00
47d79bbad5
Fix bugs arising during clans release
2016-07-28 19:08:47 -04:00
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
dd38a1dd76
Merge branch 'update/clans' into develop
2016-07-27 20:40:35 -05:00
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
031a9575ae
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-27 15:13:18 -04:00
8648581140
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-27 19:57:25 +01:00
167c0f2b5e
Reimplement EnergyShopButton with new machinery
2016-07-27 13:52:03 -05:00
3cddf35d12
Refactor out legacy ConfirmationPage
2016-07-27 13:52:03 -05:00
3d0cc2a5fd
Refactor Clans gold dependency out of core
2016-07-27 13:52:03 -05:00
dc96258055
Merge branch 'feature/party-v2' into develop
2016-07-27 13:19:25 -05:00
0d46bc4609
Add Amplifier thank button
2016-07-27 13:17:36 -05:00
72b5507390
Fixed PC-120
2016-07-27 12:29:07 +02:00
157c969e8d
Completely prevent players in parties from joining Clans servers
2016-07-27 05:51:49 -04:00
a1fd021f8d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-25 10:59:38 -04:00
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
25b0ae5916
Add support for sending players back to any clans hub via portal
2016-07-25 10:56:30 -04:00
a23c2c4e1c
Update UI to reflect allowing upgrades to be shown, per kit.
2016-07-24 16:05:19 -05:00
ceccf2d2ac
Don't give the item when a game is in progress.
2016-07-23 22:36:53 -05:00
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
50de769e36
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-24 00:13:13 +01:00
818ed4c9a9
Set up clans monetization features in the shop and fix some hardcoded names in core
2016-07-22 00:18:34 -04:00
5d0b5f80c0
Fix Party server sending. Tweak playercount and GUI display
2016-07-21 18:01:43 -05:00
75cc75f40c
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 17:25:15 -04:00
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
d7c5184980
Party fixes and tweaks.
2016-07-21 15:24:48 -05:00
9ed0bbe43a
Fix NPC's for unloaded worlds
2016-07-21 14:22:38 -05:00
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
faece2c5f8
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-21 11:13:15 +01:00
2615ef74dd
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 05:09:54 -04:00
b48f97fd2e
Fix stupid JOOQ issue and IntelliJ.
2016-07-21 03:46:18 -05:00
b734dc4e87
Remove Pay wall for Party sizes
2016-07-21 02:59:15 -05:00
9f0f4e0018
Fix possible cross server invite spamming.
2016-07-21 02:20:02 -05:00
f1b3c4756d
Use UUID's instead of playernames.
2016-07-21 02:16:26 -05:00
4cab91f251
Use getPlayerExact.
2016-07-21 02:05:37 -05:00
76ac89266e
-sigh- a hotfix.
...
Won't invite players across servers who are already in parties.
Fix transferring ownership to non-party members
2016-07-21 02:05:10 -05:00
b0f5b536b1
Merge branch 'feature/party-v2' into develop
2016-07-20 18:06:14 -05:00
31d6a2542d
Replace runSync call with runAsync
2016-07-20 18:03:01 -05:00
b136372d1b
Gem fountain changes; increase goal, link to eu
2016-07-20 18:03:01 -05:00
c3b7a81730
Don't show all buttons in all menus. Protected fields != private fields.
2016-07-20 17:48:24 -05:00
0fc64c45a8
Update JoinResponseReason
2016-07-20 16:33:26 -05:00
96261c1a6d
Party PR Updates.
2016-07-20 16:18:49 -05:00
67a185acc9
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-20 15:52:59 -05:00
d53a917627
getAbilityDetails using map and list interface
...
Changes so it uses the interface rather than the concrete class.
2016-07-19 22:38:32 +01:00
c8075b2b47
Merge remote-tracking branch 'origin/feature/party-v2' into feature/party-v2
2016-07-18 19:04:26 -05:00
b4aa303923
Bug fixes.
2016-07-18 19:04:02 -05:00
f012e8d4ed
Merge from develop
2016-07-16 08:41:15 +01:00
a0847b8d1a
Fix null ServerGroup uptimes value for MPSes
2016-07-14 08:08:24 -05:00
4d0903dba7
Fix compile error
2016-07-14 03:11:59 -05:00
e28320b361
Fix disableCustom not firing properly
2016-07-14 02:47:49 -05:00
917b83250d
Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"
...
This reverts commit 30287a0832b8650d741d
2016-07-14 00:10:37 -05:00
7dcf7378ef
Many changes
...
Fix spectator race condition
Refactor out cut clean into modules
Add combat log module
Add antixray module
2016-07-13 21:30:54 -05:00
a7b30f4f59
Merge branch 'thanos-mineware' into develop
2016-07-13 21:26:25 -05:00
4343fa3512
Merge branch 'project-cosmetics' into develop
2016-07-13 21:22:41 -05:00
6af04b5438
Fixes for winroom gadget disable messages
2016-07-13 18:21:08 -03:00
369dabffae
Amplifier updates - move to boost shards only
2016-07-13 15:07:24 -05:00
711a04ffa8
Add Bawk Bawk Battles to hub compass
2016-07-13 21:40:31 +03:00
9c3aee6373
Convert all possible gem vote rewards to treasure shard vote rewards to comply with Mojang EULA
2016-07-13 11:17:24 -05:00
7df228a8fa
Move WinEffectGadget schematics to update folder
2016-07-13 06:36:42 -05:00
179b59af2c
Merge branch 'develop' into thanos-mineware
2016-07-13 13:28:03 +03:00
e40abd4859
Merge branch 'thanos-mineware' into develop
2016-07-13 05:04:50 -05:00
85db0ad613
Remove global rawr
2016-07-12 15:51:47 -05:00
654ab281ea
Add option of "uptimes" to servergroups
2016-07-12 15:44:29 -05:00
0f3b2da8b7
Fix Bouncing Block, re-add features for testing
2016-07-12 23:02:01 +03:00
daddaa477e
Merge branch 'update/brawl-games' into develop
2016-07-12 06:45:32 -05:00
ac8a920484
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/brawl-games
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
2016-07-12 03:07:31 +02:00
d3270b9289
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-11 14:50:16 -04:00
30287a0832
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing
2016-07-11 14:46:08 -04:00
f40299e402
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-11 18:34:48 +01:00
0be317e5be
Implement tweaks and finalize implementations for bosses and fix loot dropping bugs
2016-07-11 11:36:48 -04:00
6a87be13f0
Remove features that contain bugs
2016-07-11 01:02:19 +03:00
2cac4c9c66
Remove toLowerCase owner method
2016-07-08 16:17:48 -05:00
cbb0fa37fb
Lang tweaks.
2016-07-08 15:32:25 -05:00
5b98bfddce
Update YouTube link to landing + sub confirmation
2016-07-08 15:20:50 -05:00
331c1bcf91
Merge branch 'develop' into thanos-mineware
2016-07-08 22:29:59 +03:00
1313db4071
Commit lost file.
2016-07-08 14:06:16 -05:00
ce72d25832
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-08 13:09:02 -05:00
8c7308add5
Add documentation.
...
Refactor code.
Remove most command backend capabilities to limit user error.
Cleanup.
2016-07-08 13:08:34 -05:00
da9ad913b2
Finalisation of update
2016-07-07 23:03:23 +01:00
443576ba1a
Update YouTube link and send shard reward message
2016-07-06 20:15:41 -05:00
63b6158fe4
More UHC Fixes
...
Fixes:
PC-137
PC-138
PC-497
PC-665
PC-710
PC-719
PC-754
Also fixes chunk synchronization issue, plugs potential memory leaks
Fancy spectating
Use enum priorities
2016-07-06 15:55:12 -04:00
8cf470cfd0
Update fountain goals
2016-07-06 13:39:56 -05:00
17f89f6937
Merge branch 'project-cosmetics' into develop
2016-07-06 13:00:29 -05:00
63500c19c9
Removed commented lines
...
Added javadocs to GadgetChangeEvent
2016-07-06 14:45:05 -03:00
185ba600ca
Merge branch 'develop' into thanos-mineware
2016-07-06 17:48:31 +03:00
67adb34311
Fixes for the WinRooms
...
Removed Freedom Chests from the menu
2016-07-06 00:00:50 -03:00
eccd7deedc
Fix merge errors and properly force disable particles by checking the game's settings
2016-07-05 17:25:01 -04:00
0eab6db116
Soccer bug fixes and minor improvements
...
- Slimeball will no longer be able to get stacked.
- Players in soccer mode will not able to stack others.
- Guardian lazer can no longer be used in the soccer field.
- Players in soccer won't get knockback, except if they double jump.
2016-07-05 15:39:10 -05:00
9f58e57a67
Bug fixes.
2016-07-05 14:35:37 -05:00
978ee0055a
Bug fixes.
2016-07-04 09:15:47 -05:00
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
584c8f50f0
PC Party bugs and tweaks.
2016-07-04 05:12:02 -05:00
06feb615a9
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-04 04:18:01 -05:00
af9d91faa8
Further prevent nullpointer errors
2016-07-03 04:11:14 -04:00
ffdc7b4be0
Temporarily patch random nullpointer
2016-07-02 18:05:26 -04:00
Sam
Shaun Bennett
AlexTheCoder
cnr
TadahTech
xGamingDudex
xXVevzZXx
samczsun
LCastr0
Thanos Paravantis