Commit Graph

8174 Commits

Author SHA1 Message Date
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
TadahTech 5180e46be7 Revert party chat symbol to "@". Change team chat symbol to "#". 2016-07-24 22:17:50 -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
TadahTech 5d0b5f80c0 Fix Party server sending. Tweak playercount and GUI display 2016-07-21 18:01:43 -05: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
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 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
TadahTech 136eb078ef PC-426: Update UX for non-premium players:
Removes the in game advertisement display when selecting servers.
Removes all chat throttling.
Adds a message sent on join to the player, promoting the newest sale or promotion.
2016-07-20 06:59:37 -05:00
TadahTech c32e647d9e Add private messaging system 2016-07-18 22:21:09 -05:00
TadahTech ce4289fa00 Don't do weather. 2016-07-18 22:13:32 -05:00
TadahTech c8075b2b47 Merge remote-tracking branch 'origin/feature/party-v2' into feature/party-v2 2016-07-18 19:04:26 -05:00
TadahTech b4aa303923 Bug fixes. 2016-07-18 19:04:02 -05:00
TadahTech 36f2873e15 Map Parser update. 2016-07-18 19:00:11 -05:00
xXVevzZXx 370b0693d9 fix the server thinking it's the next week 2016-07-17 05:20:21 -05:00
cnr 0ae4b0c5e0 Temporarily disable anti-xray in UHC 2016-07-16 23:08:18 -05:00
Shaun Bennett 34f718b2ec Fix improper gem/shard reward handling 2016-07-16 06:27:16 -05:00
xXVevzZXx 728a91da0f adding damage outsid ethe loop 2016-07-15 04:57:44 +02:00
xXVevzZXx 3070835662 enable armor protection and fix shotguns 2016-07-15 04:39:53 +02:00
xXVevzZXx 6c7f2d8b0d fix damage in DM prepare, eating grenades and no health regen 2016-07-15 02:28:22 +02:00
cnr d54e47d8ea Check for uptimes field 2016-07-14 11:22:10 -05:00
cnr a0847b8d1a Fix null ServerGroup uptimes value for MPSes 2016-07-14 08:08:24 -05:00
cnr 1a2e0df6ca Only allow OPs to use minestrike debug commands 2016-07-14 07:28:33 -05:00
cnr 1d1c3ef1be Merge branch 'thanos-mineware' into develop 2016-07-14 03:41:00 -05:00
Thanos Paravantis 40345bc93c Fix Bawk Bawk Battles game start 2016-07-14 11:23:39 +03:00
cnr 4d0903dba7 Fix compile error 2016-07-14 03:11:59 -05:00
Shaun Bennett e28320b361 Fix disableCustom not firing properly 2016-07-14 02:47:49 -05:00
cnr 7cc44c8bfc Merge branch 'thanos-mineware' into develop 2016-07-14 00:22:01 -05:00
Thanos Paravantis 906762e9db Remove debug commands 2016-07-14 08:17:36 +03:00
cnr 917b83250d Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"
This reverts commit 30287a0832, reversing
changes made to b8650d741d.
2016-07-14 00:10:37 -05:00