fb6a772eb0
Fix Party Redis. Improve Party UI. General testing and fixing.
2016-06-23 02:39:05 -05:00
6e2c751be1
Adjust amplifiers queue message
2016-06-22 21:09:09 -07:00
0873efd876
Update more lore text
2016-06-22 20:54:29 -07:00
621d72f541
Fix merge issues, update lore text
2016-06-22 20:51:58 -07:00
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
906e0e0044
Allow API error messages from HTTP 503
2016-06-22 20:31:18 -07:00
2453f82061
Rename Filterbutton.java to FilterButton.java
2016-06-22 18:40:12 -04:00
50534c3af9
UI And server manager changes
2016-06-22 17:28:43 -05:00
e855a866c7
Fix more thanks and booster occurrences
2016-06-22 08:58:27 -07:00
e53b474f3f
Fix typo.
2016-06-22 00:59:22 -05:00
38a13d01f1
Open server menu properly
2016-06-22 00:56:44 -05:00
4d31867e98
PC Party updates.
2016-06-22 00:35:57 -05:00
e39326b592
Help Command UI.
2016-06-21 00:11:33 -05:00
b75e87753d
Party UI work.
2016-06-20 22:45:53 -05:00
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
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
1c1912b92a
Update fountain goals again
2016-06-20 00:52:33 -05:00
afc636b7c5
Fix amplifier reward message
2016-06-19 20:16:33 -05:00
bb8d94f38a
Fix a lot more Booster cases
2016-06-19 19:48:17 -05:00
63b7648608
Amplifier rename, move podium backwards
2016-06-19 19:05:04 -05:00
38058bc670
Confirmation Paging
2016-06-19 05:49:32 -05:00
2f0a559441
Add reload command, change podium to lime dye, change tip message
2016-06-18 14:41:32 -05:00
5f9a57b7e2
Lower booster tip cooldown to 1 minute
2016-06-17 16:10:01 -05:00
4e3062f413
Swap Cosmetic and Booster interface slot
2016-06-17 15:23:53 -05:00
0873ee0116
Show entire booster queue in booster gui
2016-06-16 16:54:54 -05:00
1893e98036
Don't run chat filtering on the main thread
2016-06-16 16:39:43 -04:00
5ac6249684
Fix Bridges Kits not getting their items.
...
Fix Kits breaking at Level 5
2016-06-16 15:34:23 -05:00
ea551182b6
Make booster gui smaller
2016-06-16 15:29:05 -05:00
e7d76e2ef4
Hot fixes.
2016-06-16 03:56:32 -05:00
1e5d91e392
Make porting from old legendaries work, fix null commandcenter
2016-06-15 21:52:25 -04:00
cbfbd6fe1c
Booster GUI update
2016-06-15 17:40:20 -05:00
27afd3d96c
Kit progression update
2016-06-15 15:54:53 -05:00
aa785ed3d5
Code clean-up and documentation
2016-06-12 21:18:11 -05:00
22e22ff508
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-12 00:42:22 -05:00
cf87469400
Fix a possible NPE, use proper IP and port for api
2016-06-10 20:24:22 -05:00
2421fd1cfe
Update booster page, proper booster rewards
2016-06-10 19:40:27 -05:00
42c35063b3
Display all the boosters you have activated
2016-06-10 17:40:59 -05:00
6964b1f266
Booster gui command
2016-06-10 17:20:23 -05:00
e6920b4549
Work on booster gui, display wait time
2016-06-10 17:17:43 -05:00
ceb4de8b35
Load booster groups for arcade
2016-06-10 16:33:53 -05:00
6d380c6c6f
Rename building champion to Speedy Builders
2016-06-10 22:44:13 +03:00
0a204a3b90
Use redis pub/sub to send booster updates
2016-06-10 12:44:27 -05:00
52ce640391
Merge branch 'develop' into thanos-mineware
2016-06-10 12:15:54 +03:00
e30cd6747b
Increase goal 10 million, probably need to change later
2016-06-09 23:40:58 -05:00
1d365d726c
brawl fountain now displays proper info on the weekend
2016-06-09 23:40:58 -05:00
08e47b4b1b
Enable tips in bonus gui
2016-06-09 22:41:41 -05:00
77e9de0f8f
Update required rank in
...
fountain add help message
2016-06-09 17:02:00 -05:00
0306f1d703
Update required rank in
...
booster command help message
2016-06-09 17:02:00 -05:00
dbe8f39eeb
Update required rank in
...
add booster help message
2016-06-09 17:02:00 -05:00
ba319599ba
Fix fountain schematic file paths
2016-06-09 01:18:09 -05:00
91f6ddce55
Add some minor documentation
2016-06-09 00:48:44 -05:00
611cb28d1a
Fix a typo
2016-06-09 00:47:03 -05:00
cade7b4081
Remove got boosters message
2016-06-09 00:43:59 -05:00
d6bce63967
Use schematics from update folder
2016-06-09 00:43:03 -05:00
ece08c23a9
Fix merge issues
2016-06-09 00:40:05 -05:00
699b35995f
Merge remote-tracking branch 'remotes/origin/develop' into feature/gems
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
2016-06-09 00:39:39 -05:00
d4ac309daa
Merge remote-tracking branch 'remotes/origin/master' into feature/gems
2016-06-09 00:29:27 -05:00
85829d355d
Fix command permissions
2016-06-09 00:25:54 -05:00
22bb56dfda
Remove game booster button
2016-06-09 00:22:54 -05:00
09d2c00f66
Proper display of extra gem fountain rewards
2016-06-09 00:14:01 -05:00
cf6e3cf05d
Merge branch 'feature/game-variants' into develop
2016-06-08 22:47:16 -05:00
c9d5b91c52
Proper booster activation events
2016-06-08 19:22:25 -05:00
37a412f1bf
Starting to merge boosters into arcade code
2016-06-07 17:24:24 -05:00
298c09ab82
Lowercase rank prefixes in tablist when in party
...
When in a party the rank prefix in the tablist of every user is now
uppercase.
2016-06-06 20:45:07 +01:00
474a9dc975
Heavy UI and Command work. Begin testing
...
Time: 2hrs
2016-06-05 23:37:08 -05:00
c577e5827c
Heavy UI and Command progress.
...
Time: 4hrs
2016-06-05 22:55:06 -05:00
a9c086172f
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-05 19:06:15 -05:00
ee35dd3442
Redis system implementation and code refactoring.
...
Total time: 13hr
2016-06-05 19:05:29 -05:00
2410151371
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-05 17:46:27 -03:00
cb71bf4ba5
Removes morphs from gadget persistence (PC-429)
2016-06-05 17:44:34 -03:00
2755543686
Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
2016-06-05 15:32:06 +01:00
502111ef4e
Redis system needs a shit ton of work. Need to design it better.
2016-06-05 00:42:22 -05:00
4ce9c90839
Party Redis init.
...
Wrap for 6/4/2016. Total time: 9.3 hrs.
2016-06-05 00:32:04 -05:00
8c3d5f66a2
UI work.
2016-06-05 00:03:01 -05:00
8de5280241
Disable /allowCmd
2016-06-04 22:55:15 -05:00
bccc11eeaf
Files changed that need to be edited later on with the new Party System.
...
Memory commit
2016-06-04 22:41:01 -05:00
84f428fa99
Redis work: Command work: UI work:
...
Total Time: 2.5hrs
2016-06-04 21:13:19 -05:00
22a438d5c1
Party system rewrite init. Barebones frame work: Total time - 2hrs.
2016-06-04 01:54:17 -05:00
c01b6da390
Staff is incognito could be found using /stats (PC-Bugs-407)
...
Fixes an issue where players could do /stats <name> to find out if
vanished players were on their server.
2016-06-03 13:14:54 +01:00
c5cbca3ed0
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-02 18:30:22 -03:00
b51007da91
Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
2016-06-02 22:28:35 +01:00
b3291476cb
Changed method names
...
Changed kit modifiers to be in an enum instead of creating a new class for each modifier
Implemented kit modifiers in the games
Removed renaming from Widder, Christmas Elf and Pumpling
Changed the persistence to have the system that Connor added
2016-06-02 18:25:16 -03:00
c1bd25cdbe
Merge branch 'develop' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-06-02 22:06:59 +03:00
894b7db18e
Remove remaining fake ultra tag artifacts
2016-06-02 02:25:15 -05:00
936eb1b978
Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
2016-06-01 15:41:22 +01:00
750120c106
Prevent developers from using /punish
2016-06-01 00:47:22 -05:00
84853a1f9a
Revert "Update chat-spam message with coupon link"
...
This reverts commit dfbb4dca11
2016-06-01 00:39:44 -05:00
825839d853
Fix PlayerKeyValueRepository's exception and return types
2016-06-01 00:38:29 -05:00
6cb275e036
PC-121
...
Changed 'a' to 'an' in the text component of the friend menu
2016-05-31 14:44:18 +01:00
4e9a48ab4f
Finish off the tip system
2016-05-30 12:02:12 -05:00
e77bee5cd8
Implement building champion, remove quick climber and enhance chicken attack
...
Building Champion achievement was implemented as a replacement
for quick climber achievement, since quick climber is almost impossible
to complete in public games. Build Champion is based on Build Race challenge,
and it requires players to place all blocks in their inventory,
within 15 seconds. Moreover, chicken minions can now attack players,
even if they are stuck in the water.
2016-05-30 12:51:58 +03:00
e380354bad
Refactor CurrencyType
2016-05-29 16:34:21 -05:00
a1437a3044
Starting to add gui logic
2016-05-28 11:23:26 -07:00
aebcfc2727
Booster tip system
2016-05-28 09:21:10 -07:00
e00009a6d1
Fix CustomTagFix applying to holograms under certain conditions
2016-05-28 09:20:33 -07:00
dfbb4dca11
Update chat-spam message with coupon link
2016-05-27 13:18:07 -05:00
255191f01a
Changed gadget persistence to use Player Key/Value system (Thanks to Connor)
...
Changed the method names for some classes
2016-05-26 23:58:36 -03:00
f1f464f3a4
Change listener priority again. Fixes PC-209
2016-05-26 14:29:13 -05:00
1c66c10293
Don't create backing tables on startup
2016-05-25 17:59:21 -05:00
5331e2bec9
Allow PlayerKeyValueRepository Exceptions to propagate
2016-05-25 17:59:20 -05:00
e52ff13712
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-25 12:20:18 -03:00
460cb08f54
Adds old gadget names
...
Adds another fix for winroom speed
Moves gadgets to individual packages, easier to manage in a future update
Adds gadget persistence (Or maybe not)
Changed mount locked item data to 8 instead of 7
2016-05-25 12:19:06 -03:00
857cf6ad30
Add PlayerKeyValueRepository and BukkitFuture
...
PlayerKeyValueRepository<V> is a key/value store whose keys are Strings
and whose value type is parameterized by V. Each repository is backed by
a MySQL table in the Accounts database.
Access to PlayerKeyValueRepository's values is restricted via
CompletableFuture to enforce async database access.
BukkitFuture contains helpful utilities for producing, transforming, and
terminating CompletableFutures with actions on the main thread. A
typical PlayerKeyValueRepository action may look similar to the
following, where we retrieve all key/value pairs for a player and
perform an action with the result on the main thread:
PlayerKeyValueRepository<String> repo = [...]; // init repo
UUID uuid = [...]; // a player's UUID
repo.getAll(uuid).thenCompose(BukkitFuture.accept(values -> {
// this will be run on the main thread!
// `values` is of type `Map<String,String>`
}));
2016-05-25 08:35:05 -05:00
72a2aa926f
Change event priority again. Fixes PC-216
2016-05-24 13:15:29 -04:00
cd0e59087a
Don't drop items from hidden slimes. Fixes PC-276
2016-05-24 13:15:29 -04:00
434ada2e86
Fix merge issues
2016-05-24 19:14:52 +10:00
1377e6724f
Merge with develop
2016-05-24 19:10:55 +10:00
12c5ba80b7
API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation
2016-05-24 17:13:33 +10:00
8da4ac3135
[Brute/FleshHook] Deal more damage/pull velocity when charging up more [PC-340]
2016-05-23 23:42:12 +01:00
3ad7fc5f21
Adds old Mr.Punchman name
...
Adds another fix for winroom speed
2016-05-22 21:46:22 -03:00
ed68ef332b
Fixes for Win Room (Players were able to see other players)
...
Added command to allow other players to run ranked commands
Fixes code styles
2016-05-22 21:05:48 -03:00
c984bbfc8a
make it possible to add stats to the brawl games
2016-05-22 00:29:58 +02:00
92b6abc884
Fixes merging bugs
2016-05-20 23:53:27 -03:00
0109e2f2dd
Fixes for Illuminated chest
...
Fixes for /check command (Support)
2016-05-20 23:33:58 -03:00
0fb84e57c1
Merge branch 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2016-05-20 23:26:54 +02:00
d6750c7d91
Disable /unlockCosmetics on production servers
2016-05-20 03:23:27 -05:00
22fb507871
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-20 05:14:29 -03:00
c58e0f3e30
Fixes for the 1 Shard thing (Next time, for testing, use /unlockCosmetics)
2016-05-20 05:11:59 -03:00
efb264dd75
Hook into Booster API
2016-05-20 16:58:58 +10:00
28f1d45b1c
Update achievement category game enum
2016-05-19 20:55:22 +03:00
472d3881a0
Merge branch 'develop' into thanos-mineware
2016-05-19 20:49:45 +03:00
87c8c7efa4
Merge branch 'master' into thanos-mineware
2016-05-19 20:42:43 +03:00
7f44281441
Merge branch 'develop' into project-cosmetics
2016-05-19 10:04:19 -05:00
012edfed45
Use loaded schematics to display fountain progress
2016-05-18 18:04:21 +10:00
11db05b6bf
Fixes spelling of MineStrike gun
...
Fixes spectators not being sent to the
winroom
2016-05-18 03:58:50 -03:00
e3833b95ad
Update Gem Fountain purchase gui
2016-05-18 15:59:04 +10:00
3479d6e318
Fix incognito.
2016-05-17 18:12:05 -05:00
38a0b593ee
Fix height for 1.9 and 1.8 users.
...
*Thanks QA for not fully testing*....
2016-05-17 18:11:28 -05:00
35c7b9a2bd
Incognito Updates:
...
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
2016-05-17 18:10:07 -05:00
8a75a5098c
Remove hub invisibility preference for all but Admins and higher.
2016-05-17 18:08:01 -05:00
014ce137fc
If a player uses /a regardless of if staff are online, offline, or vanished, making it always yield a response telling the player that if there are staff currently online, they will receive a reply soon - removing the "there are no staff online" message. Also a 60s Recharge for this.
2016-05-17 18:03:18 -05:00
6760c07e6c
Fix staff members getting stuck in both Incognito mode and the Hub Invisibility preference, and not being able to toggle either off them off because Incognito would stop Hub Invisibility from getting toggled (on OR off), and vice versa.
2016-05-17 18:00:20 -05:00
6e9b0e4fa5
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
2016-05-17 14:41:17 +02:00
43cadf564e
Fix Carl the Creeper. Fix Bridges TNT exploit.
2016-05-16 22:03:27 -05:00
fb63b3a1a4
Fixes for winroom command, and illuminated chest
2016-05-15 22:49:10 -03:00
42eef838b3
Fixes podium not being enabled by default
2016-05-15 21:33:36 -03:00
a27a618b2f
Made debugging tools only available on test servers
2016-05-16 02:04:15 +02:00
816a7ca232
Re-Activated chest buttons
2016-05-16 01:57:58 +02:00
d92ad9c53f
Made illuminated chest purchasable and added appropriate lore
2016-05-16 01:51:40 +02:00
511726f72a
Treasure chest coin checker for test servers
2016-05-15 20:43:46 -03:00
4ebf48bd45
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-05-16 01:34:08 +02:00
8ad7646128
Edits to treasure chests
2016-05-16 01:33:54 +02:00
f8d5bd3c11
Fixed treasure chests
...
Items would sometimes pop out of chest blocks
You could open illuminated chests before they were converted to real
chests
2016-05-16 00:51:33 +02:00
09b7fbdbbe
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-15 18:48:00 -03:00
4f79ec6551
Pinata fixes
2016-05-15 18:47:09 -03:00
b4aad690e5
Fixed some rewards and added party trail to chests
2016-05-15 23:31:10 +02:00
fdf167953f
Fixed emerald set order
2016-05-15 23:30:17 +02:00
1e6dda2d7d
Cleaned up some win effect backend code & fixed kits working in winroom
2016-05-15 23:28:12 +02:00
d850bed725
Minor code tweaking
...
* Made reward manager ammo multiplier private final field
* Removed old commented code from WinEffectPodium, WinEffectLavaTrap,
ParticleMusic, ParticleEmerald, ParticleBlood
* Cleaned up the GameModifierMineStrikeSkin filter
* Removed unused Math#isBetween(double, double, double) method
* Changed Animator to use PriorityQueue
2016-05-15 19:43:07 +02:00
97f82e422d
Merge branch 'project-cosmetics' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java
2016-05-15 16:03:36 +02:00
TadahTech
Shaun Bennett
Alex-The-Coder
samczsun
Thanos Paravantis
cnr
Sam
LCastr0
Sam Sun
Ben
xXVevzZXx
xGamingDudex