06e583c05e
Added flat podium to Firework and Punchman
2016-05-12 23:50:41 +02:00
956d64d750
Git Merge Import Fix
2016-05-12 23:46:39 +02:00
29d4db0bfd
Merge branch 'project-cosmetics' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
2016-05-12 23:46:17 +02:00
2db98613ab
Cosmetic Update
...
* Redid the Reward manager
Added new rewards to the chest and changed some values
* Fixed some MineStrike skin bugs
* Removed particles/death effects from Minestrike
* Removed old test minestrike skins
* Moved minestrike skins to correct package
* Changed the illuminated chest animation a bit
* Fixed other minor bugs
2016-05-12 23:42:37 +02:00
6f4c6bc545
Fixes counter on WindUp suit
...
Removes kit modifier categories
2016-05-12 15:00:43 -03:00
276f572009
Merge branch 'project-cosmetics' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java
2016-05-10 20:21:37 +02:00
1b0b9a894b
Tweaked some cosmetics
...
* Changed Party Death to firework icon
* Removed idle spark from Emerald Trail
* Changed wing style to pixie from angle on infernal wings
* Added black dots to YinYang
Started some work on the RewardManager
2016-05-10 20:20:44 +02:00
4fada6de49
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-10 12:45:22 -03:00
5b8ff933b1
Removed more unused imports
...
Fixed some lores and names for cosmetics
Renamed some classes to match Set name
Commented out the Lovely set (Duplicate of Cupid's Love)
Fixed set descriptions
Added 'Comming soon...' to set bonuses
2016-05-10 12:44:45 -03:00
7c80c3826b
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-05-08 21:49:16 +01:00
ac86f3ac8c
Merge pull request #55 from Mineplex-LLC/alex-mcl
...
Change the visuals of the Billboards and of ELO's display in the stat…
2016-05-08 13:29:23 -04:00
34e8d65f4d
Change the visuals of the Billboards and of ELO's display in the stats menu to be more user friendly
2016-05-07 21:16:12 -04:00
b68127b111
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-05-08 00:37:59 +01:00
b1a41c3cb3
Make chat abuse colour easier on the eyes
...
Dark blue [bold] is hard to read, dark aqua [bold] should be easier
to read.
2016-05-07 22:48:49 +01:00
5649939f8c
Removed some old disabled code.
2016-05-06 21:59:18 +02:00
e04a897488
Added some pre-animation to chicken win effect. Removed some comments.
2016-05-06 21:58:31 +02:00
0fea90516b
Alternative emerald trail for full set
2016-05-06 13:24:06 +02:00
f58db6ee3b
Removed firework from party death
...
Replaced the death effect with item drops instead
2016-05-06 13:12:28 +02:00
d60fea4f76
Added chicken and guardian win room schematic handlers
2016-05-06 13:00:45 +02:00
97ef801e3d
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-06 00:40:55 -03:00
49c45628a2
Removed more unused imports
...
Fixed some lores and names for cosmetics
Renamed some classes to match Set name
Commented out the Lovely set (Duplicate of Cupid's Love)
2016-05-06 00:40:22 -03:00
93c2886601
Add boosters to inventory menu
2016-05-06 13:31:59 +10:00
55d40a1a6b
Merge pull request #53 from Mineplex-LLC/feature/logitech-brand
...
Changed design of billboard and fixed its centering in hubs
2016-05-05 18:33:15 -04:00
f329051399
Changed design of billboard and fixed its centering in hubs
2016-05-05 18:25:51 -04:00
17a4517e71
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2016-05-05 21:03:15 +02:00
1a96ea3c18
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-05-05 20:29:28 +02:00
db21c7dd22
EGit FTW!
...
Git, you are the greates, randomly deciding not to include everything
when I spesify you to do so....
This should have been part of prev commit.
2016-05-05 20:26:00 +02:00
9fca9283e2
Fixed skin layers for Player/Human disguises
2016-05-05 10:39:00 +02:00
e1f2bb9740
Use all-man style braces here to be compliant with the coding standards
...
(cherry picked from commit e553ac5
2016-05-04 16:02:39 +01:00
a663cb3e01
Revert "Revert "Report system (version 1)""
...
This reverts commit d0d2de1e21
2016-05-04 15:24:29 +01:00
145ea9221a
Merge pull request #40 from Mineplex-LLC/clans/beta
...
Clans/beta
2016-05-03 16:57:07 -04:00
cfc6f3703d
Merge pull request #50 from Mineplex-LLC/develop
...
Merge from develop
2016-05-03 13:24:32 -03:00
3c482e38cc
Merge pull request #47 from Mineplex-LLC/feature/logitech-brand
...
Convert over to System.out.println() for error messaging and add prot…
2016-05-02 16:34:58 -04:00
2cd76fbf72
Merge pull request #48 from Mineplex-LLC/alex-mcl
...
Add catch for rare occurrence where players have no stored data
2016-05-02 16:34:50 -04:00
ccd5b47d75
Convert over to System.out.println() for error messaging and add protection for billboards in Hub via a new manager
2016-05-02 16:20:41 -04:00
055b8684c2
- Added action bar message when booster is ready (Wind Up Suit)
...
- Moved each suit to an individual package, to make it easier to work with
- Removed some unused imports
- Added util to get entity egg data
- Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges)
- Added specific kit pages to game modifier menu
2016-05-02 00:13:06 -03:00
7e97bd346e
Change an internal method to private and add missing class JavaDoc
2016-05-01 15:16:42 -04:00
335c5a4510
Clean up billboard generation and clearing, rewrite MapRender for logos, and add JavaDocs to comply with code standard
2016-05-01 14:58:40 -04:00
48c8a5a630
Force structure to spawn correctly, complete with maps on item frames
2016-05-01 01:56:07 -04:00
189f9ad524
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 01:42:32 +01:00
2337e89a93
Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well.
2016-05-01 01:42:11 +01:00
070326e72d
Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding
2016-04-30 19:26:16 -04:00
39c105f0cf
Add catch for rare occurrence where players have no stored data
2016-04-30 15:34:04 -04:00
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -04:00
e0e30a8b7f
Merge pull request #43 from Mineplex-LLC/alex-mcl
...
Fix Async Elo Ranked Bans
2016-04-30 14:46:49 -04:00
37a815d52a
Update JavaDocs to fit Mineplex standard
2016-04-30 14:41:28 -04:00
2e4bae6915
Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-30 14:14:14 -04:00
2dc5c46624
Fix naming convention on checkRankBannedAsync
2016-04-30 14:13:21 -04:00
41e26f283c
Fix all async elo ranked ban methods and switch to callback system for API hooks
2016-04-30 14:10:09 -04:00
6e35bc0989
Stop spamming the chat.
2016-04-30 00:55:59 -05:00
2490e3df82
Previous git merge cause this single line to be deleted
...
I literally have no idea why or how this happened.
2016-04-29 23:47:01 +01:00
6a00f26d5f
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
81cebc4ce7
Swap static helpers for a much better solution
...
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.
Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
2016-04-29 23:37:40 +01:00
184d247fc9
Start adding BoosterPage. Move Boosters to core to support UI's
2016-04-29 17:37:34 +10:00
a8d9745320
- Fixed order of Top Elo
2016-04-29 00:12:25 -04:00
26f6a1189f
Prettyfy EloCommand
2016-04-28 21:34:43 -05:00
e83e4b270c
Prettyfy EloCommand
2016-04-28 21:34:07 -05:00
00efb7d72e
Fix ELO query
2016-04-28 21:20:48 -05:00
84ca13c0d3
Fix ELO query
2016-04-28 21:09:28 -05:00
80ea7b7a4c
Fix ELO query
2016-04-28 21:09:07 -05:00
5a4f89b484
Fix ELO query
2016-04-28 21:04:07 -05:00
7c279998ec
- Changed top elo queries
2016-04-28 21:55:51 -04:00
8e68d62356
- Added documentation for new EloManager methods
2016-04-28 21:16:18 -04:00
2887630cf8
- Added javadoc headers
2016-04-28 21:11:38 -04:00
4b7684da4c
Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-28 21:05:56 -04:00
e032b81842
- Made SQL calls async
2016-04-28 20:59:49 -04:00
562e950361
Remove File headers.
2016-04-28 19:46:13 -05:00
680e579223
Merge Alex's branch into mine.
...
Convert to Java 8
Remove unneeded comments.
2016-04-28 19:39:24 -05:00
168483a9fc
Communities work
2016-04-28 19:30:05 -05:00
725481f310
Top Elo data for Webpage
2016-04-28 19:23:57 -05:00
84c0b1b389
Top Elo data for Webpage
2016-04-28 19:22:45 -05:00
156982460f
- Fixed water permanently [MCL]
...
- Fixed team balancing [MCL]
- Fixed overjoining [MCL]
- Changed bans for quitting ranked matches [MCL]
2016-04-28 20:03:09 -04:00
bff5751691
Remove very last @author tag
2016-04-28 14:41:44 +01:00
dcd376b837
- Improved graphics for Elo display in /stats
2016-04-28 01:01:14 -04:00
189296a586
- Fixed using water in restricted zones in MCL
...
- Implemented Elo in /stats menu
2016-04-28 00:53:04 -04:00
b4c5be81f3
- Fixed random weather in MCL
...
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
2016-04-27 23:12:38 -04:00
a16145479e
- Disabled picking up lava
...
- Leaving ranked matches temp bans players from rejoining them
2016-04-27 03:18:44 -04:00
d0e7590b2a
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-04-26 23:23:45 -03:00
a7ef8bec49
Adds new constructor to NotePlayer, to be able to send the song to specific players
...
Some WindUp costume fixes
Added actionbar and song to WindUp suit
Created new booster manager
2016-04-26 23:21:59 -03:00
38d03b8468
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-04-27 00:03:29 +02:00
79f210e242
Schematic and WinEffect update
...
+Added better schematic support
+Fixed schematics not sending block updates to nearby players
+Added win room schematics
*Tweaked some of the win rooms
+Added sounds to the Lava Trap win effect.
2016-04-27 00:01:30 +02:00
714000163b
Add messages when fountain is complete and resets
2016-04-26 16:19:27 +10:00
4a8c38e1c8
Add fountain reset command
2016-04-26 15:33:52 +10:00
cabf4c4c8b
Add BlockProgressBar for Gem Fountain
2016-04-26 15:26:07 +10:00
e8370579c0
Counter refactoring
2016-04-26 13:55:06 +10:00
28de514d1a
Adds some utils for UtilColor
...
Small changes in Wind Up suit
2016-04-24 21:39:35 -03:00
949f9ca712
Don't allow players to report themselves
...
I left this to last minute to make testing easier, as with this check
in place it means at least two players are required to test the report
mechanism.
2016-04-24 18:10:01 +01:00
dab1f9485c
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-04-24 17:17:17 +01:00
9df4dac023
Remove dead code
...
This was left over from before I took over development of the report
feature.
2016-04-24 17:16:36 +01:00
713263214f
Run ReportPurgeTask asynchronously
...
This prevents the task from hanging the server which may be an issue
when a large amount of reports exist.
2016-04-24 17:15:12 +01:00
57e9cd6e19
Add class headers and remove @author tags
...
This makes the PR compliant with with the Mineplex coding style.
Class headers are used to describe the function of a class and git
history will be used to determine the author of a class.
2016-04-24 17:10:29 +01:00
b21dfad12e
Merge remote-tracking branch 'remotes/origin/develop' into feature/gems
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2016-04-24 13:37:45 +10:00
c60beec68c
Implement Fountain GUI
2016-04-24 12:40:38 +10:00
491c509317
Added UnlockCosmetics command (/unlockCosmetics <type>)
...
Added Ammo command (/ammo <gadget> <ammo> [player])
Added util for red world border screen (UtilPlayer.sendRedScreen)
Added new costume -> Wind Up
Removed test gadget (ItemBouncyBall)
2016-04-23 22:16:02 -03:00
ccd630e2ae
Leftovers from merge
2016-04-23 00:56:19 +02:00
b7099088a9
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
2016-04-23 00:55:48 +02:00
fe0cee65e8
Added gem and coin rewards back into bonus.
2016-04-22 05:33:25 -05:00
260c617007
Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop
2016-04-22 05:12:30 -05:00
e28621ae26
Set oldElo equal to new elo on new row.
2016-04-22 05:04:13 -05:00
70541fd6f2
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 05:41:24 -04:00
d73b720323
Merge branch 'features/elo' into develop
2016-04-22 04:34:35 -05:00
477acf044e
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-22 04:34:21 -05:00
6db7e648f5
Don't insert new row if the update doesn't succeed because of elo mismatch on loss.
2016-04-22 04:20:59 -05:00
7b18efa7b0
Prevent farming elo up with multiple games by dc and joining new game.
2016-04-22 04:05:07 -05:00
ddd1c5af9b
Removed EloSettings and fixed scoreboard.
2016-04-22 03:10:09 -05:00
a31eccc15b
Multiply new rating by team size. MIssed that undo!
2016-04-22 02:53:02 -05:00
757c945320
Added in kFactor ratio application to rating delta.
2016-04-22 02:35:37 -05:00
aa6d25139f
Tweaked elo for team games.
2016-04-22 02:04:57 -05:00
776093288a
Fixed rating not setting in EloPlayer constructor.
2016-04-22 01:11:48 -05:00
977fbe684a
Fixed elo query.
2016-04-22 01:06:33 -05:00
6d00e8b41f
Refactored Elo to work correctly.
2016-04-22 00:21:11 -05:00
8a5fdccb60
Add to fountain button
2016-04-22 11:26:05 +10:00
d0e3b094c1
- cleaned up and prepped for live update
2016-04-21 20:57:35 -04:00
e46798f20e
Fix NPE in AdminCommand from IncognitoManager being null
2016-04-22 10:49:34 +10:00
435d3968a2
Fix Fountain string being changed to Counter from refactor
2016-04-21 19:46:20 +10:00
d57cc48f0f
- Added new features!
2016-04-20 22:31:54 -04:00
f86b18b603
Elo Works Now
...
Ready to move on to MCL implementation
2016-04-20 22:09:18 -04:00
54f0b99756
Add fountain gui command
2016-04-21 11:41:16 +10:00
6a5c8336cf
Elo and Division fixed
...
Elo and Division should be displaying properly
Cleaned the code up a bit
Added endElo() to Game.java to handle team Elo code
Added event listener to check for GameState.End in TDM to call endElo()
2016-04-20 14:52:06 -04:00
588e6f08c2
- Removed TypeWars achievements to make room
2016-04-19 18:07:20 -04:00
793f5b3f41
Test gadget added by LCastr0, to get used to the code
2016-04-19 15:20:31 -03:00
2b80ebabf7
Test gadget added by LCastr0, to get used to the code
2016-04-19 15:14:22 -03:00
cb48df6a3d
Update fountain count every 5 seconds. Display Hologram
2016-04-19 14:30:38 +10:00
5a667a7d31
Add /fountain command. Fountain implementation
2016-04-19 13:57:19 +10:00
6c20427395
- Fixed some bugs and added final achievements
2016-04-18 22:32:15 -04:00
d9b6434bad
Typo in description
2016-04-18 23:24:59 +02:00
534a5dee4e
Forgot to remove debug message
2016-04-18 22:18:42 +02:00
591d3cadc9
Cleaned up some GUI stuff, mostly lores on items
2016-04-18 22:16:10 +02:00
44263beb87
- Make elo store/recover properly
2016-04-17 17:34:18 -04:00
ee30012011
Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-17 12:27:23 -04:00
d623d0982b
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge
2016-04-17 12:02:08 -04:00
4c35e35fc0
- More polish and bugfixes
2016-04-16 23:59:44 -04:00
4477a215f4
Update to Redis 2.8.1 and clean up repositories ( #26 )
2016-04-16 22:51:20 -05:00
fed9f675d3
Implementation for basic Fountains
2016-04-17 13:51:15 +10:00
9c2cd6a883
Merge branch 'feature/redis-update' into feature/gems
2016-04-17 13:08:11 +10:00
16dacbe3b3
Update to Redis 2.8.1 and clean up repositories
2016-04-17 12:58:44 +10:00
b0d30a4ff4
- cleaned everything up
...
- renamed game
2016-04-16 20:32:14 -04:00
bbb81dd663
Elo calls migrated to Game.java
...
Consequently, elo code is actually being called now
Bukkit.broadcastMessage calls have shown where things are breaking
handleElo() added to EloManager to facilitate movement of team elo code
preparing to use EloManager's getNewRatings() method to
calculate team elos
2016-04-15 20:48:56 -04:00
ffc0459e5a
Cosmetic Update
...
+ Support for relative copy position from with //copy from worledit in
schematics
+ Better block selection in bounding box in UtilBlock
+ Goal selector utils for entities
+ Global hide and show methods for players
+ Win effects and game modifiers
+ Tweaked player disguises
+ Added clean room generator to arcade games, previously normal flat
world
+ Animation utils
* Edited some particles, hats and death animations
2016-04-16 02:24:41 +02:00
2b2b251548
Merge branch 'clans/beta' into develop
2016-04-15 12:41:14 -05:00
b43953439e
Properly store teamId locally after registering for tournament.
...
Use team id when unregistering for the tournament.
2016-04-15 12:36:28 -05:00
cf3141ddc0
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-15 12:30:32 -05:00
33b557eb10
- Huuuuuuuge amount of changes for chiss
2016-04-14 22:45:21 -04:00
4a4e64a3ff
EloRepository overhaul started
...
Tinkering with EloRepository, using AccountRepository as a base
2016-04-14 20:09:09 -04:00
64d5f91e8f
Remove TeamInvite table.
2016-04-14 18:49:20 -05:00
742807d80e
Added generatePlayerElos and updated saveDivision
...
Added method to fill EloManager's playerElos hashmap with values
--This may not work as intended
--Currently only implemented in Team Death Match
2016-04-14 17:17:26 -04:00
eb67c12108
Added getRepoElo to EloRepository
...
Added Bukkit.broadcastMessage() calls to test code
Methods that needed to throw SQLExceptions now throw SQLExceptions
2016-04-14 15:21:28 -04:00
3a26225ce2
Finished main tournament calendar UI.
...
Added registration for tournaments.
2016-04-14 12:21:24 -05:00
ab21efd2ca
Give the correct amount of old/ancient chests for bonuses
2016-04-13 18:51:52 -05:00
9e8a7b582b
Elo updates
...
EloRanking turned on for Domination, Team Deathmatch, Turf Wars, CTF
Database QoL changes made to EloManager and EloRepository
--Unfortunately, Database still seems to not be updating properly
--Something on my end, or something to do with the queries? Unsure.
2016-04-13 18:35:56 -04:00
xGamingDudex
LCastr0
Keir Nellyer
Conrad
AlexTheCoder
Shaun Bennett
Ben
TadahTech
Jonathan Williams
Joseph Prezioso Jr.
Shaun Bennett
cnr