Sam
|
43aae5e076
|
Ultimate visual and gameplay improvements
|
2016-07-22 22:47:29 +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 |
|
AlexTheCoder
|
869dfc1dfa
|
Finalize Amplifier system
|
2016-07-21 20:21:11 -04:00 |
|
TadahTech
|
5d0b5f80c0
|
Fix Party server sending. Tweak playercount and GUI display
|
2016-07-21 18:01:43 -05:00 |
|
Keir Nellyer
|
369246f635
|
Fix out of bounds statement parameter caused by earlier removal of report preferences
|
2016-07-21 23:11:48 +01:00 |
|
Keir Nellyer
|
c5f3f2b2d6
|
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
|
2016-07-21 22:44:43 +01:00 |
|
AlexTheCoder
|
891a3231d8
|
Change banner GUI
|
2016-07-21 17:37:02 -04:00 |
|
AlexTheCoder
|
b87c6cfff0
|
Fix git removing class
|
2016-07-21 17:27:41 -04:00 |
|
AlexTheCoder
|
75cc75f40c
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
|
2016-07-21 17:25:15 -04:00 |
|
AlexTheCoder
|
55c63364f2
|
Fix KOTH starting in other hub worlds and hub basketball teams always being null
|
2016-07-21 16:57:24 -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 |
|
AlexTheCoder
|
286a7aa32a
|
Even more debug
|
2016-07-21 16:16:38 -04:00 |
|
AlexTheCoder
|
4a77a587f8
|
Fix git removing a class
|
2016-07-21 16:11:05 -04:00 |
|
AlexTheCoder
|
b5ce35544f
|
Fix merge conflict
|
2016-07-21 15:48:56 -04:00 |
|
AlexTheCoder
|
fc3ceddf4d
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
|
2016-07-21 15:47:59 -04:00 |
|
AlexTheCoder
|
97ef408e14
|
Debug
|
2016-07-21 15:46:48 -04: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 |
|
AlexTheCoder
|
11992129d1
|
Convert to EntityPortalEnterEvent
|
2016-07-21 14:01:08 -04:00 |
|
AlexTheCoder
|
d59882007b
|
Slightly increase boundaries
|
2016-07-21 13:55:09 -04:00 |
|
AlexTheCoder
|
37cf863625
|
Tiny fixes
|
2016-07-21 13:46:13 -04:00 |
|
AlexTheCoder
|
57f9f7db4b
|
Fix ClassCastException
|
2016-07-21 13:25:17 -04:00 |
|
AlexTheCoder
|
1f2b1557d5
|
Work on amplifiers and deleting banners when the clan is deleted
|
2016-07-21 13:20:45 -04:00 |
|
Keir Nellyer
|
9b58c53e90
|
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
|
2016-07-21 16:11:09 +01:00 |
|
Sam
|
faece2c5f8
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
|
2016-07-21 11:13:15 +01:00 |
|
Sam
|
f48009d9f8
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
|
2016-07-21 11:12:23 +01:00 |
|
Sam
|
e7658b4bf2
|
New kits and upgrades for old kits
|
2016-07-21 11:05:21 +01:00 |
|
AlexTheCoder
|
e5cd38c11b
|
Revert enjin changes
|
2016-07-21 05:20:47 -04:00 |
|
AlexTheCoder
|
2615ef74dd
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
|
2016-07-21 05:09:54 -04:00 |
|
AlexTheCoder
|
1dedde41a8
|
Banners and beginning javadocs
|
2016-07-21 05:09:31 -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 |
|
TadahTech
|
4cab91f251
|
Use getPlayerExact.
|
2016-07-21 02:05:37 -05:00 |
|
TadahTech
|
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 |
|
cnr
|
e7da161f35
|
Revert "Fixed PC-706"
This reverts commit 96d16be5b7.
|
2016-07-20 20:07:06 -05:00 |
|
cnr
|
b0f5b536b1
|
Merge branch 'feature/party-v2' into develop
|
2016-07-20 18:06:14 -05:00 |
|
Shaun Bennett
|
31d6a2542d
|
Replace runSync call with runAsync
|
2016-07-20 18:03:01 -05:00 |
|
Shaun Bennett
|
b136372d1b
|
Gem fountain changes; increase goal, link to eu
|
2016-07-20 18:03:01 -05:00 |
|
TadahTech
|
c3b7a81730
|
Don't show all buttons in all menus. Protected fields != private fields.
|
2016-07-20 17:48:24 -05:00 |
|
cnr
|
14e5928b00
|
Add a pull request template
|
2016-07-20 17:33:03 -05:00 |
|
cnr
|
9a06cce0a0
|
Merge branch 'feature/party-v2' into develop
|
2016-07-20 16:41:50 -05:00 |
|
TadahTech
|
0fc64c45a8
|
Update JoinResponseReason
|
2016-07-20 16:33:26 -05:00 |
|
TadahTech
|
96261c1a6d
|
Party PR Updates.
|
2016-07-20 16:18:49 -05:00 |
|
TadahTech
|
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 |
|
AlexTheCoder
|
ff210271c9
|
Add javadocs
|
2016-07-20 12:21:15 -04:00 |
|
AlexTheCoder
|
0b4c9d78ff
|
Finalize game integration into map
|
2016-07-20 11:22:14 -04:00 |
|
AlexTheCoder
|
29d52ac075
|
More work on Nether
|
2016-07-20 10:42:24 -04:00 |
|