Shaun Bennett
9be26a92d1
Remove NCP
2016-09-21 22:21:49 -04:00
Sam
ac967f6b18
OITQP no longer in Beta ( #210 )
...
* Convert OITQP into a module based system.
* More magic modules
* Achievements and Stats
* Achievement menu update
* Removed some Util methods I added that were never used.
* Missed a few things
* To Alex, Love Sam
* Gem and achievement kits
2016-09-21 22:05:21 -04:00
Sarah
c1c46aceb8
Skyfall Game( #208 )
...
* basic prototype of the game Skyfall
* new crumble mechanic
* Developing basic game with basic mechanics and basic kits.
* Fix merge issues
* Add Supply Grop and Deathmatch and change map crumbling
* Make cosmetical changes for QA and add Stat Trackers and Achievements
* Add version requirement
* Change scoreboard layout
* Dont crumble the first island, but the islands over the spawn points
* Remove Surefoot, fix TNT, remove boats and remove elytra on contact with water/lava
* Unused imports
* Fix kit description, modify island crumbling and add ring damage
* Revert to normal crumble values
* Add Javadoc
* Remove more unused imports
* Check for material data on ring generation
* Add Block effect for Booster Ring recharge
* Unused imports...
* Add Elytra removal message and countdown
* "Fix" food issues and some other minor things
* Add chest refill to scoreboard from beginning
* Fix supply drop
* Unused imports.....
* Re-enable Anti Cheat
* Add java doc, remove system messages and add exeptions
* The end of the great label debate
* Fix method naming conventions
* Remove more labels
* Disable Booster kit
2016-09-21 21:57:38 -04:00
samczsun
7252906d30
Better synchronization of Managers
2016-09-21 21:37:57 -04:00
samczsun
92a0d606d4
Fix timings
2016-09-21 21:37:57 -04:00
samczsun
ec4add259d
Teleport players back to center of arcade lobby
2016-09-21 21:37:57 -04:00
Timothy Andis
bf61296948
PlayWire Ad integration ( #207 )
...
* PlayWire integration.
* Tweak PlayWire display.
Update the GUI command.
Temp set cooldown to 10 seconds for testing *WILL BE REMOVED*
* PlayWire stuff.
* PlayWire streaks and tweaks.
2016-09-21 21:24:58 -04:00
Keir Nellyer
1eecfbafee
Small code improvement
2016-09-21 16:33:05 +01:00
Keir Nellyer
c6eb23812f
PC-1001 Do not show private messages between users unless reporter is
...
involved
2016-09-21 13:21:23 +01:00
Keir Nellyer
09287ddefc
PC-1002 Automatic reports bans show the id of the report which caused
...
the ban
2016-09-21 12:22:55 +01:00
Keir Nellyer
e73b06b5ab
PC-998 Change cache time for chat messages to 5 minutes
2016-09-21 11:46:03 +01:00
Sam
209ea32ef9
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-09-20 09:18:20 +01:00
Keir Nellyer
32563904fa
PC-997 Show total counts when showing report statistics
2016-09-19 10:38:03 +01:00
LCastr0
f0c7b1d6aa
Whoops, forgot this
2016-09-18 16:18:33 -03:00
LCastr0
537dc28daa
Used proper method to add specific prizes
2016-09-18 16:16:57 -03:00
LCastr0
ae6868b76a
Added Witch Morph
...
Added Metal Man morph
2016-09-16 20:46:52 -03:00
Keir Nellyer
2cdab061b6
PC-886 Move report bans over to punishment gui
2016-09-16 17:40:14 +01:00
Keir Nellyer
ebe212c8ff
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-15 17:30:27 +01:00
William Burns
199d6cba3e
Add a period to the anticheat ban message. ( #206 )
2016-09-14 20:50:08 -04:00
Alexander Meech
93c227a22d
Change Mavs Basketball to 5 Minutes ( #201 )
...
* Update ScoringManager.java
* Update Basketball.java
2016-09-14 20:49:24 -04:00
Keir Nellyer
da5a8d5b46
PC-966 Reports assigned to RC now have a higher priority instead of no decay effect
2016-09-14 21:51:06 +01:00
Keir Nellyer
a64ba4db2a
Include sender as being a recipient for testing reasons when checking if player can create a chat abuse report
2016-09-14 21:44:57 +01:00
Sam
1458cb84b9
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-09-14 20:14:05 +01:00
Keir Nellyer
9af606ae20
Ensure suspect messages actually involved the reporter
2016-09-14 14:53:39 +01:00
Keir Nellyer
efe532e8a6
Clean-up createReport method
2016-09-14 14:37:44 +01:00
Keir Nellyer
464099dc87
Correctly handle weird cases whereby an account may be involved in
...
multiple open reports of the same category
2016-09-14 14:26:12 +01:00
Keir Nellyer
2be0522599
Attach JavaDocs and small method renames
2016-09-14 14:14:11 +01:00
Keir Nellyer
425d814ac4
PC-966 When selecting a new report for a user to handle, always
...
prioritise reports assigned to teams that the user is a member of
2016-09-14 12:14:14 +01:00
Keir Nellyer
5ad4f2831d
PC-966 Only allow members of team to handle report if team assigned
...
to report
2016-09-14 12:13:41 +01:00
Keir Nellyer
20c4488c5f
PC-966 Add gui button for passing report to RC team
...
Misc. other changes
2016-09-13 18:28:09 +01:00
Keir Nellyer
d115097eb9
PC-966 Implement support for teams to be assigned to a report
2016-09-13 17:01:47 +01:00
Keir Nellyer
f1d1585585
PC-966 Implement method to get members of a team
2016-09-12 18:13:10 +01:00
Keir Nellyer
ee6e8a9656
PC-966 Implement report user cache
2016-09-12 18:07:01 +01:00
Keir Nellyer
a39d894d85
PC-966 Add support for saving report teams to database
2016-09-12 17:54:00 +01:00
Keir Nellyer
fae7e93f1a
PC-966 Add support for loading report teams from database
2016-09-12 17:08:11 +01:00
Keir Nellyer
a5e5be4329
PC-951 Fix handler message task not being cancelled when closing report
2016-09-12 11:56:21 +01:00
Keir Nellyer
5e5cb3284a
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-12 10:11:31 +01:00
cnr
6de3640243
Disable immediate ban actions for Glide and Speed
2016-09-11 17:54:50 -05:00
LCastr0
36ce7ef222
Fixes for the Omega chest giving duplicated items ( #202 )
2016-09-10 23:05:29 -04:00
Connor James
454e1c8c11
AntiCheat 1.2 ( #200 )
...
* Implement Anticheat 1.2 hooks
* Add default check thresholds for unknown check types
* Add violation level support for new checks
* Add ban waves for KillAura type D
* Amend DELETE_PENDING now that it's not hardcoded
* Add instant bans for high VL Glide/Speed
* Don't specify hack type in banwave ban message
2016-09-10 23:01:13 -04:00
Sam
38473dcffd
Fix metal taking too little damage with full iron ( #203 )
2016-09-10 22:47:52 -04:00
LCastr0
f6b06c63ac
Fixes for the Omega chest giving duplicated items
2016-09-10 00:43:08 -03:00
AlexTheCoder
23a330d449
Add monster maze and bawk bawk battles to mixed arcade display in compass and set beta button to new oitq payload gamemode
2016-09-08 03:50:45 -04:00
Shaun Bennett
e12ed35da1
Fix NPE and kit upgrades issue
2016-09-07 23:13:28 -04:00
Shaun Bennett
493086fcf3
Merge pull request #198 from Mineplex-LLC/update/developer-servers
...
Update/developer servers
2016-09-07 21:21:35 -04:00
Shaun Bennett
9318ba4de2
Merge branch 'develop' into bugfix/samczsun
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
2016-09-07 20:12:57 -04:00
Shaun Bennett
7fbd6087eb
Merge pull request #187 from Mineplex-LLC/update/oitq
...
Skywars Update Patch
2016-09-07 20:08:08 -04:00
samczsun
fba449ca03
Don't rearrange GUI if all dev servers are ingame
2016-09-07 19:17:47 -04:00
samczsun
a8adf23c15
Allow dev servers
2016-09-07 11:45:42 -04:00
Keir Nellyer
7b6f0ae221
PC-953 Make report ids in /reportstats command clickable
2016-09-07 16:40:05 +01:00
Sam
bed563876a
Add a comment to explain usage of KitUpgradeShop
2016-09-07 14:18:07 +01:00
Shaun Bennett
ba322f0df1
Merge pull request #195 from Mineplex-LLC/update/emergency-support-fixes
...
Update/emergency support fixes
2016-09-07 07:57:53 -04:00
Shaun Bennett
b1b9900c9e
Add offline stat checking
2016-09-07 07:47:19 -04:00
Keir Nellyer
e2840f36b5
PC-958 Don't allow chat abuse reports of players who haven't spoken
...
in chat
2016-09-07 11:28:20 +01:00
Keir Nellyer
640a8d3516
PC-958 Allow reporting of offline players
2016-09-07 09:50:10 +01:00
AlexTheCoder
225583a13d
Remove join restrictions on beta servers from unranked players
2016-09-06 21:36:30 -04:00
Sam
5bf35d49db
Message inconsistancy
2016-09-06 21:38:43 +01:00
Sam
be268991b0
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-09-06 21:37:33 +01:00
Sam
7a5a6c3d00
Fix duplicate message
2016-09-06 19:55:31 +01:00
Keir Nellyer
353cdb2413
Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2
2016-09-06 17:28:03 +01:00
Keir Nellyer
b1b275fc67
PC-958 Prepare codebase for reporting of offline players
2016-09-06 17:27:48 +01:00
Keir Nellyer
94b5a6e760
PC-952 Add /reportinfo
2016-09-06 16:43:51 +01:00
AlexTheCoder
64db10c91a
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/emergency-support-fixes
2016-09-05 20:27:09 -04:00
AlexTheCoder
a124aa3d85
Fix items added via support server not showing up in customer service logs
2016-09-05 20:25:02 -04:00
samczsun
444fe5d151
Remove hacky reflection method to get server name
2016-09-05 18:37:17 -04:00
samczsun
08090f5e06
PC-818
...
Seismic Charges can no longer remove barrier blocks
2016-09-05 18:25:16 -04:00
samczsun
11c97691a9
PC-937
...
This commit allows Arcade to consider spectating and vanished players when
deciding to autostart a game
2016-09-05 18:25:16 -04:00
samczsun
6490ab3786
Don't hide banwave animation from staff
2016-09-05 18:25:16 -04:00
samczsun
3aaa9b2514
Sort tab list properly
2016-09-05 18:25:16 -04:00
samczsun
6b1d551a37
Remove please investigate
2016-09-05 18:25:16 -04:00
samczsun
0678f7287d
No fake levels for those who don't want it
2016-09-05 18:25:16 -04:00
samczsun
d09b27bfe1
Fix disguises prevent join, join rank check bugs
2016-09-05 18:25:16 -04:00
samczsun
c18d771715
Unbreak Squid in SSM
2016-09-05 18:25:16 -04:00
Keir Nellyer
e2455bbc9d
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-05 20:04:12 +01:00
cnr
ccd81c1820
Fix BlockIgniteEvent NPE in MavericksManager
2016-09-05 13:42:24 -05:00
Sam
12130d41e6
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-09-05 17:59:51 +01:00
Sam
8ebaad4736
Beta ready commit
2016-09-05 17:59:49 +01:00
Keir Nellyer
acd63c90a1
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-05 14:26:06 +01:00
AlexTheCoder
a7b0c9de05
Fix unnecessary calls to mysql/mssql databases in support server
2016-09-05 04:46:13 -05:00
AlexTheCoder
504432d87b
Fix titan command not being registered
2016-09-05 04:46:01 -05:00
AlexTheCoder
9ce49b10c0
Add a command to allow support agents to check for ownership of internal sales packages
2016-09-05 04:45:51 -05:00
AlexTheCoder
ffb6073532
Fix unnecessary calls to mysql/mssql databases in support server
2016-09-04 23:44:54 -04:00
AlexTheCoder
b5771550ad
Fix titan command not being registered
2016-09-04 23:28:25 -04:00
AlexTheCoder
866c3ee7c9
Add a command to allow support agents to check for ownership of internal sales packages
2016-09-04 22:11:05 -04:00
AlexTheCoder
29bb2a3895
Add an enjin chargeback command and fix punishing in support servers
2016-09-04 00:39:44 -05:00
AlexTheCoder
b3478d70e8
Update support packages
2016-09-04 00:39:44 -05:00
AlexTheCoder
5b80f3b6ac
Fix clan banner being removed from support server information
2016-09-04 00:39:44 -05:00
AlexTheCoder
e2d3763ec0
Add an enjin chargeback command and fix punishing in support servers
2016-09-03 15:42:32 -04:00
Sam
34ee62bdc3
Fix NPE
2016-09-03 20:32:10 +01:00
AlexTheCoder
3088d79cf5
Update support packages
2016-09-03 15:16:59 -04:00
Sam
b3212fc003
Particle changes
2016-09-03 20:13:08 +01:00
Sam
4b1c93150b
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-09-03 20:12:39 +01:00
Sam
8d5d0c6272
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-09-03 18:29:37 +01:00
Sam
c3c61b8189
Merge fix
2016-09-03 18:29:18 +01:00
Sam
fc0217f1fd
More magic OITQ
2016-09-03 18:25:17 +01:00
Sam
e0424c78b2
Added spawn barrier
2016-09-03 18:24:56 +01:00
Sam
7eb148cc59
Ultimate colour change
2016-09-03 18:24:44 +01:00
AlexTheCoder
09a535466a
Fix clan banner being removed from support server information
2016-09-03 11:37:45 -04:00
Shaun Bennett
e57d009341
Remove unused import!
2016-09-03 01:11:50 -04:00
Shaun Bennett
586a768c7b
Fix enjin listener else bug
2016-09-03 00:59:15 -04:00
cnr
c9358d8c5a
Add power play to support server
2016-09-02 19:10:30 -05:00
Keir Nellyer
a5efacc12f
PC-955 Fix closing gui showing incorrect suspect name
2016-09-02 14:31:38 +01:00
cnr
2bce540c5d
Disable Antihack in the staff server
2016-09-02 02:51:34 -05:00
cnr
374142e63f
Merge branch 'update/the-smoothest-release-we-will-never-have' into develop
2016-09-02 00:42:51 -05:00
TadahTech
e2f974e1e6
Add sounds and messages to basketball.
2016-09-02 00:40:23 -05:00
cnr
ae0d30558c
Merge branch 'update/the-smoothest-release-we-will-never-have' into develop
2016-09-02 00:12:12 -05:00
AlexTheCoder
9abbe1bfb9
Update support whitelist and op list
2016-09-02 00:10:36 -05:00
cnr
f6db5393a3
Merge branch 'project-cosmetics' into develop
2016-09-02 00:08:23 -05:00
cnr
71b880793f
Implement power play logging and initial rewards
2016-09-02 00:01:49 -05:00
TadahTech
9e0bb6ff96
Tweak invite starting index.
...
Disable NextBestGame in an MPS
2016-09-01 20:59:28 -05:00
TadahTech
d8486abbfd
Fix minor best game issues.
2016-09-01 20:05:53 -05:00
Keir Nellyer
78048ac279
PC-947 Add bypass for handling reports created or made against for developer
2016-09-01 18:21:50 +01:00
Keir Nellyer
d39dae748c
PC-947 Don't allow staff members to handle reports created by or made against them
2016-09-01 17:55:36 +01:00
TadahTech
a6360249b7
Use party if a player has it.
2016-09-01 08:47:43 -05:00
TadahTech
6f3d7dcd29
Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have
2016-09-01 08:45:43 -05:00
TadahTech
41936e0efc
Remove users from the map.
2016-09-01 08:31:16 -05:00
TadahTech
fdc54e1dd1
Fix BestGame not cancelling for parties.
2016-09-01 08:29:51 -05:00
cnr
05f640266f
Fix basketball scoring infinite loop
2016-09-01 06:36:47 -05:00
TadahTech
107a296239
Fuck you intellij
2016-09-01 05:49:59 -05:00
TadahTech
53846acbf6
Dont let Minestrike use NextBestGame
2016-09-01 05:39:47 -05:00
TadahTech
9fcee07427
Fix people getting stuck in chests.
2016-09-01 05:34:37 -05:00
TadahTech
68743cf73c
Mavs changes.
2016-09-01 03:24:38 -05:00
TadahTech
46053e82e1
Mavs changes.
2016-09-01 02:35:31 -05:00
TadahTech
c0c75ea375
Allow team selecting to work on the mavs hub.
2016-08-31 23:46:29 -05:00
cnr
9cd5b73432
Merge branch 'update/basketball-game' into develop
2016-08-31 23:19:51 -05:00
cnr
55086efd91
Merge branch 'feature/shadowmute' into develop
2016-08-31 23:16:57 -05:00
LCastr0
8e8719070c
Changes Omega Chest to not be craftable
...
Changes LockCosmetic and PowerPlay commands to be JNR_DEV+
2016-08-31 23:26:41 -03:00
Sam
57292414c6
Gems for winners
2016-08-31 22:55:13 +01:00
Keir Nellyer
725892e93b
PC-957 Show warning message when a user's report is marked as abusive
2016-08-31 16:38:35 +01:00
Keir Nellyer
8f28ab3f0d
PC-949 /reportclose argument "<conclusion>" should be "<reason>"
2016-08-31 16:30:55 +01:00
Sam
0b7fdc01eb
Initial balence change
2016-08-31 16:30:50 +01:00
Keir Nellyer
97e06053d1
PC-948 Don't send handler to server if they are already connected to it
2016-08-31 16:25:14 +01:00
Keir Nellyer
04432d44d7
This can be an in-line return
2016-08-31 15:04:15 +01:00
Sam
6a139d5c55
Tiny code improvement
2016-08-31 13:28:48 +01:00
Sam
7599630328
Pyromancer Ultimate name change
2016-08-31 13:27:07 +01:00
Sam
8d222aafec
Fix increasing loop in Overtime
2016-08-31 13:26:54 +01:00
Sam
1bfebf358f
Add Overtime
2016-08-31 12:07:50 +01:00
Sam
47df09b770
Handle null sound
2016-08-31 12:07:35 +01:00
Sam
b1faecea49
Kit Fire incorrect values
2016-08-31 12:07:25 +01:00
Keir Nellyer
41bae9d5f8
Add bottom margin so that big chat logs do not collide with footer
2016-08-31 10:45:38 +01:00
Keir Nellyer
a7d224b7e4
Fix reports duplicating themselves and causing massive issues
2016-08-30 23:18:12 +01:00
Keir Nellyer
96b74444e5
Fix duplicate message entries
2016-08-30 22:54:58 +01:00
AlexTheCoder
8397f53d39
Remove unneeded teleportation in clans hubs
2016-08-30 03:27:11 -04:00
AlexTheCoder
ba02dea404
Fix me being dumb
2016-08-30 03:22:55 -04:00
TadahTech
90ce21db3d
Update preferences
2016-08-30 00:51:51 -05:00
AlexTheCoder
8ca214a4d8
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
2016-08-30 01:37:14 -04:00
TadahTech
a68f7395e4
Use proper server group / remove testing.
2016-08-30 00:10:38 -05:00
AlexTheCoder
5108a6f08d
Convert to npc for entering mavericks lobby
2016-08-30 01:02:26 -04:00
AlexTheCoder
d7d8ef021e
Disable using cosmetics inside mavericks hub
2016-08-30 00:47:48 -04:00
TadahTech
94bfc9aa15
Use proper server group / remove testing.
2016-08-29 22:33:01 -05:00
TadahTech
dfced7186f
Finish tweaks for the hub
2016-08-29 22:32:07 -05:00
AlexTheCoder
463c03e9d1
Add pitch and yaw to npcs
2016-08-29 22:11:53 -04:00
Shaun Bennett
f72647e1d4
Merge with develop
2016-08-29 21:56:03 -04:00
Shaun Bennett
e7d876e865
Fix string.format param order
2016-08-29 21:33:00 -04:00
TadahTech
39ea280098
NextBestGame code and new hub releases
2016-08-29 20:21:36 -05:00
Alexander Meech
464c9fcdc3
Update steal chance
2016-08-29 20:37:02 -04:00
LCastr0
3687c7ad98
PowerPlayClub update
2016-08-29 21:32:11 -03:00
Shaun Bennett
f3e38031ab
Add shadowmuting
2016-08-29 18:57:07 -04:00
Sam
7a3ce9813c
Payload (OITQ)
2016-08-29 23:08:04 +01:00
Sam
9454e1f409
Skywars and Kit Progression
2016-08-29 23:07:48 +01:00
Keir Nellyer
b30f395d88
Update chat snap site for backend changes
2016-08-29 12:21:57 +01:00
Sam
ec8ed76270
Convert old perks to new perks
2016-08-28 09:06:07 +01:00
Sam
88f4813534
Perk related issue
2016-08-28 09:05:49 +01:00
Sam
ccd855da84
Name the ultimates
2016-08-28 09:05:31 +01:00
Sam
54e8f8e5e8
Code improvement and cleanup
2016-08-28 09:05:11 +01:00
Sam
34c6e1cab7
Add the base of kit progression
2016-08-28 09:04:46 +01:00
Sam
d81ed348f3
Remove used import
2016-08-28 09:04:09 +01:00
Keir Nellyer
022e9f6bd4
Players can have more than 1 active report open against them
2016-08-27 22:38:54 +01:00
Keir Nellyer
3f18c0cc6b
Fix join/leave report handling
2016-08-27 22:35:12 +01:00
Keir Nellyer
cd9423a8e4
De-couple chatsnap from report system
2016-08-27 22:21:56 +01:00
Sam
a35c162dc4
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-26 21:26:16 +01:00
Sam
efc14ee13f
Another merge fix
2016-08-26 21:26:14 +01:00
Sam
4bc49e6133
Solve merge conflicts
2016-08-26 21:21:18 +01:00
LCastr0
3e38eb5990
Fixes to the merging conflicts
2016-08-25 20:13:59 -03:00
LCastr0
25d64c6dee
Changes to lock command
2016-08-25 20:12:00 -03:00
Sam
c2344a0494
Magnet not giving the kill
2016-08-25 20:26:18 +01:00
Sam
265ab620e4
Fix Magnet affecting teams members
2016-08-25 20:10:13 +01:00
Sam
9c5ab7c67e
Remove Fire Aspect 2
2016-08-25 20:09:50 +01:00
TadahTech
2a861460c6
Remove unused variables
2016-08-25 05:12:29 -05:00
TadahTech
b3b8f44b3a
Fix perks not being registered.
2016-08-25 05:11:52 -05:00
TadahTech
f976f56fb7
Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
2016-08-25 04:26:21 -05:00
TadahTech
ebfd00ebc3
Fix centering of the Preference Menu
2016-08-25 04:04:53 -05:00
TadahTech
f9cc505908
Minor tweaks to soccer fields
2016-08-25 04:02:17 -05:00
TadahTech
19cfcc414b
Fix stacking minecarts
2016-08-25 03:58:39 -05:00
TadahTech
41b40fa12c
Fix painting breaking.
2016-08-25 03:54:10 -05:00
cnr
8617572980
Fix preferences menu interaction in Clans{,Hub}
2016-08-25 02:26:42 -05:00
TadahTech
77e0090531
Tweak preferences
2016-08-25 00:17:31 -05:00
TadahTech
f518185518
Tweak parkour
2016-08-24 22:55:39 -05:00
TadahTech
1654850e8c
Final Changes
2016-08-24 22:26:38 -05:00
TadahTech
ba2bee4f25
Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
# Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:29:01 -05:00
TadahTech
bca19788db
Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
# Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
# Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:28:36 -05:00
cnr
352e1e0eb2
Merge branch 'update/skywars-finalised' into develop
2016-08-24 17:22:01 -05:00
cnr
df1fc60d3d
Merge branch 'update/skywars-finalised' into develop
2016-08-24 17:12:58 -05:00
Sam
4088d2a311
Air teleportation fix
...
Makes it less likey that a player would die of fall damage when using
the eye of ender
2016-08-24 19:50:38 +01:00
Keir Nellyer
469a72afc0
JavaDocs
2016-08-23 16:40:25 +01:00
TadahTech
c9d14dc522
Update clans to new preferences. Remove debug messages.
2016-08-23 03:12:36 -05:00
TadahTech
bbe44e7d75
Remove debug.
2016-08-23 02:04:07 -05:00
TadahTech
02f703e68e
Remove debug.
2016-08-23 01:57:39 -05:00
TadahTech
42c228773c
Fix entity directions
2016-08-23 01:52:19 -05:00
TadahTech
3b9d6adfbc
Lobby Update
2016-08-23 01:37:07 -05:00
Sam
2c37d17db3
Slight code change
2016-08-22 19:42:30 +01:00
Sam
e0f319ea09
Change kit internal names
...
Changes the kit internal names to match the current skywars ones in
order so that kit progression experience is carried over during this
update.
2016-08-22 17:28:51 +01:00
Keir Nellyer
dcfeaab5e1
Show invalid usage with alias used
2016-08-22 16:48:59 +01:00
Keir Nellyer
fb369d3df9
Add command to unban player from report system
2016-08-22 16:36:42 +01:00
Keir Nellyer
f805ceccdc
Don't include aborted reports in report statistics
2016-08-22 16:07:14 +01:00
xGamingDudex
7fb6ff58d0
Moved gadgets to use a whitelist system instead of blacklist for
...
collisions
2016-08-22 01:00:29 +02:00
Sam
7db41a8be5
Reduce Earth kit scaling
2016-08-20 22:45:17 +01:00
Sam
28bbda23f5
Remove debug commands
2016-08-20 22:44:54 +01:00
Sam
e6530a6f44
More tweaks and fixes
2016-08-20 12:14:01 +01:00
xGamingDudex
e64324b36c
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-20 11:40:15 +02:00
Keir Nellyer
bde51e6a54
The server of the handler now handles sending periodic message, instead of it being done through Redis
...
This also fixes server restarts breaking handler messages.
2016-08-19 18:08:36 +01:00
Sam
dc5c2430cd
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-19 17:58:27 +01:00
Keir Nellyer
d05a69ac69
Fix handler message disappearing when changing server
2016-08-19 17:27:05 +01:00
Keir Nellyer
6367321315
Fix weird colouring
2016-08-19 17:26:08 +01:00
Keir Nellyer
eabaa1e68a
Move limit statistic limit to query and sort returned results
2016-08-19 17:01:26 +01:00
Keir Nellyer
834e6b5fdf
Switch to using UtilPlayer.message
2016-08-19 16:48:05 +01:00
Keir Nellyer
26aff936a0
Rename /reportstat command to /reportstats
2016-08-19 16:46:49 +01:00
Keir Nellyer
779efe3f47
Improve display of /reportstat
2016-08-19 16:46:25 +01:00
Keir Nellyer
bbb40a7b6e
A report is considered expired once it's priority is < 1
2016-08-19 16:23:19 +01:00
Keir Nellyer
b6f0e84a02
Fix sql error when attempting to reinsert same report mapping
2016-08-19 16:21:44 +01:00
Keir Nellyer
2a62abfd33
Push chat snapshots at save time instead of handle time
2016-08-19 16:07:06 +01:00
Keir Nellyer
a1a604757b
Remove old todo
2016-08-19 15:48:02 +01:00
Keir Nellyer
5b685a3a86
Fixed query for getting unhandled reports to behave well with abused reports
2016-08-19 15:46:59 +01:00
Keir Nellyer
2211e6c4ef
Fix query for getting reports a user is handling to ignore aborted reports
2016-08-19 15:03:54 +01:00
Keir Nellyer
514757924d
More descriptive message when aborting a report
2016-08-19 14:31:15 +01:00
Keir Nellyer
373c82c11b
Fix query for getting unhandled reports
2016-08-19 14:30:59 +01:00
Keir Nellyer
ee78cf2bb9
Cancel messaging task if handler is no longer present
2016-08-19 14:30:24 +01:00
Keir Nellyer
10a6cbfe3b
Remove handler from report object when aborting a report
2016-08-19 14:29:15 +01:00
Keir Nellyer
24d4da6aa2
Fix query to fetch report not fetching reports with no handler
2016-08-19 14:19:52 +01:00
Keir Nellyer
e6609d59c9
Fix incorrect MySQL operator
2016-08-19 14:01:17 +01:00
Sam
c4cb5d8db4
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-19 12:56:24 +01:00
cnr
5365f1269f
Delay Anticheat enable in Clans
...
This ensure the anticheat has registered GameStartEvent before we fire
it
2016-08-18 20:46:24 -05:00
cnr
72ddfd5d85
Disable server spawn radius in Clans
...
Defer to the spawn claim area, instead
2016-08-18 20:44:01 -05:00
LCastr0
84c6720d1c
Fix merging errors
2016-08-18 18:30:32 -03:00
LCastr0
f4175ed724
Added PowerPlay managers, commands, button inside Carl to claim PowerPlay bonus... Includes a new SQL table, will be sent to Connor and Jaws so they can release it correctly! :D
2016-08-18 18:07:32 -03:00
Sam
3b11a2e985
Killstreaks
2016-08-18 22:02:33 +01:00
Keir Nellyer
b4ae149d89
Handlers can now abort a report allowing it to be handled by another
...
member of staff
2016-08-18 14:42:53 +01:00
cnr
a79fa9cd46
Update GWEN preference name to reflect its purpose
2016-08-18 01:59:31 -05:00
cnr
08e1b765f7
Send local Anticheat messages regardless of preference
2016-08-18 01:59:31 -05:00
cnr
78fe41a8af
Update Anticheat ban message and duration
2016-08-18 01:59:30 -05:00
cnr
999237fe69
Accurately report game TPS
2016-08-18 01:59:05 -05:00
cnr
405f67f8b2
Implement/activate Anticheat phase two
...
- Remove anticheat guardians from Arcade
- Uncomment/implement Anticheat phase two actions
- Specifically: immediate ban on Kill Aura type A, VL 200.
- Give moderators less-specific messages, and limit messages by severity
2016-08-17 23:23:20 -04:00
AlexTheCoder
c66e485c9e
Fix arrow knockback
2016-08-17 23:22:30 -04:00
Sam
6c1bd88631
Increase passive knockback
2016-08-17 23:33:31 +01:00
Sam
1565b66395
Ore level changes
2016-08-17 23:33:17 +01:00
Sam
8d6e4a5fd3
Remove some unused code and cleanup
2016-08-17 22:28:22 +01:00
xGamingDudex
69275cb79c
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-17 20:57:18 +02:00
Keir Nellyer
3126d540e7
/reportstat command progress
2016-08-16 21:30:37 +01:00
Sam
0176f31f1e
Complete implementation of kit progression
2016-08-16 18:55:26 +01:00
Keir Nellyer
3760166599
Remove remnants of old user report preference
2016-08-16 14:13:01 +01:00
Sam
604f5bc2cc
Update to work with new scoreboard system
2016-08-16 11:03:12 +01:00
Sam
29a07c60ab
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-08-16 11:02:15 +01:00
Sam
84e5b38380
Testing session feedback
2016-08-16 10:53:37 +01:00
Sam
dac4d9595c
Change scoreboard to use new system
2016-08-15 20:28:12 +01:00
Sam
6839006bd1
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-08-15 20:25:01 +01:00
Sam
d5d8f07085
Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple
2016-08-15 19:21:56 +01:00
Sam
df606d5e07
Changed game logic to try out multiple round concept
2016-08-15 19:19:20 +01:00
Sam
09741d4d2a
Added VersionModule (The new way to check client versions for games)
2016-08-15 19:18:51 +01:00
Sam
ea7d877d36
Some attempt at per player kits
2016-08-15 17:45:24 +01:00
cnr
08e65cb17e
Implement MineplexLink spectator check
2016-08-14 17:40:28 -04:00
xGamingDudex
6e32906805
More Gadget Collision patches
2016-08-14 22:50:48 +02:00
xGamingDudex
045445791a
Fixed gadget collision checks
2016-08-14 21:06:28 +02:00
xGamingDudex
e71cec874e
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-14 20:09:01 +02:00
Sam
8f4303cf39
Progress on Upgrade Details
2016-08-13 22:40:33 +01:00
Shaun Bennett
0f4f1a3582
Remove pointless try/catch
2016-08-13 01:39:56 -05:00
Shaun Bennett
c99a23d670
Add region and server to chat payload
2016-08-13 00:57:39 -05:00
Sam
33cb4db338
Minestrike - Stop vanished players being assigned teams on join
2016-08-12 19:52:23 +01:00
Sam
2915a5e3b9
Add mid-game kit changing NPCs
2016-08-11 21:16:49 +01:00
Sam
69fd78bbf2
Remove Shurikens
2016-08-11 19:05:13 +01:00
Shaun Bennett
a744566cd3
Add AntiSpam front end
2016-08-11 11:34:17 -05:00
Keir Nellyer
a8e891f247
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
2016-08-11 14:53:57 +01:00
Sam
60a46c8c10
Fire burst is now instant
2016-08-11 14:26:25 +01:00
Keir Nellyer
5b516fd7bd
Show player name in black if not suspect
2016-08-11 11:37:09 +01:00
Keir Nellyer
09b458af68
Mega-hack to remove unwanted whitespace (allowing the page to render
...
correctly)
2016-08-11 11:37:09 +01:00
Keir Nellyer
ebea70d078
Remove echo port debug line
2016-08-11 11:35:13 +01:00
Keir Nellyer
735eccca37
Move font styling over to stylesheet
2016-08-11 11:35:13 +01:00
cnr
4562b00dcb
Repurpose MAC reports pref for GWEN reports
2016-08-11 04:01:14 -04:00
cnr
7b1ac5ded2
Merge branch 'update/clans' into develop
2016-08-10 21:27:43 -04:00
samczsun
7de9da3d1c
Complete rework of disguising and antihack hook
...
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.
Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.
Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines
The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
2016-08-10 21:03:30 -04:00
Sam
82b2541e34
PC-827
...
Team SSM - Teammates can no longer cancel each other's Blaze Firefly
2016-08-10 21:47:13 +01:00
Sam
df646b0659
PC-897
...
SG - Spectators can no longer punch fireballs from the world border
2016-08-10 21:46:37 +01:00
Sam
a02699d84a
PC-898
...
SSM - Fixes an issue where kit armor would not appear correctly in your
inventory.
2016-08-10 21:46:02 +01:00
Sam
933861176d
PC-662
...
Castle Siege - Fixes the game not ending if the whole of one team left.
2016-08-10 21:45:27 +01:00
Sam
e05f90372a
Add kit upgrade details
2016-08-10 19:05:40 +01:00
Keir Nellyer
ff7a427787
Handle party chat correctly
2016-08-10 16:57:44 +01:00
Keir Nellyer
cbdce80483
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-08-10 16:01:47 +01:00
xGamingDudex
907ac7473f
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698
2016-08-10 16:52:37 +02:00
Keir Nellyer
e43c241338
Display suspect username in red in chat log
2016-08-10 15:30:17 +01:00
Sam
87dd4c5632
Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple
2016-08-09 20:23:58 +01:00
Sam
c19825cbb0
Remove unused imports
2016-08-09 20:23:50 +01:00
Alexander Meech
5fca64b86b
Remove safezone requirement for observer mode
2016-08-09 15:10:45 -04:00
Keir Nellyer
84d7838e13
Allow setting of alternative MySQL port
2016-08-09 15:37:45 +01:00
Keir Nellyer
bc1265a828
Remove custom font on player ranks to match rest of site
2016-08-09 15:23:15 +01:00
Keir Nellyer
d627c6e98e
Improve css styling slightly
2016-08-09 15:20:49 +01:00
Keir Nellyer
31800ee1e7
Colour suspect messages
2016-08-09 15:17:19 +01:00
Sam
950a46ad12
Fix Throwable Dirt's velocity
2016-08-09 14:06:39 +01:00
Sam
5fd5245978
Use attack name
2016-08-09 13:07:17 +01:00
Sam
95c23585c8
Missed a file
2016-08-09 12:53:54 +01:00
Sam
acd5e0c1d2
Added minecart colors
2016-08-09 12:53:34 +01:00
AlexTheCoder
e5a96e8189
Fix incorrect casing in mapping outposts
2016-08-08 21:54:27 -04:00
