05312a9bef
Update where players spawn upon first join...
...
...to avoid flight kick upon login
2016-05-11 21:57:42 -04:00
8eba2c9ccb
Merge pull request #59 from Mineplex-LLC/feature/logitech-brand
...
Move billboard up 1
2016-05-09 11:55:22 -04:00
7932258579
Move billboard up 1
2016-05-09 03:44:16 -04:00
de1fabf53d
Disable report system as it is not ready to go live
2016-05-09 02:10:51 -04: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
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
f329051399
Changed design of billboard and fixed its centering in hubs
2016-05-05 18:25:51 -04:00
a663cb3e01
Revert "Revert "Report system (version 1)""
...
This reverts commit d0d2de1e21
2016-05-04 15:24:29 +01:00
cfc6f3703d
Merge pull request #50 from Mineplex-LLC/develop
...
Merge from develop
2016-05-03 13:24:32 -03:00
3d98c08a67
Add in missing file
2016-05-02 16:33:11 -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
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
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -04: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
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
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
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
d73b720323
Merge branch 'features/elo' into develop
2016-04-22 04:34:35 -05:00
6d00e8b41f
Refactored Elo to work correctly.
2016-04-22 00:21:11 -05:00
54f0b99756
Add fountain gui command
2016-04-21 11:41:16 +10:00
cb48df6a3d
Update fountain count every 5 seconds. Display Hologram
2016-04-19 14:30:38 +10: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
a730b81feb
Commented out TournamentManager, moving off develop.
2016-04-15 12:38:25 -05:00
cf3141ddc0
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-15 12:30:32 -05:00
85f4ff1299
Starting on Tournaments.
2016-04-13 17:14:48 -05:00
a04f7c23c6
Disable incognito for staff in hub invisibility, and vice-versa
2016-04-08 20:18:56 +01:00
390b2878dc
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-07 14:28:30 +01:00
876a7a8eb6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-05 12:37:23 +01:00
23232efd63
Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 13:04:39 +10:00
7f92a3c048
incognito changes
2016-04-05 00:38:27 +01:00
cd5ad89f51
Made clans sort by server number.
2016-04-04 17:46:51 -05:00
2b3e466469
Removed pesky '?' causing login query to stall.
2016-04-04 16:30:57 -05:00
60010f90b4
Load simple clan token on player login to reduce overhead.
...
Increased dbpool connections to 4
2016-04-04 13:47:45 -05:00
781c4bfdbd
Removed db call off main thread for ClanServerPage
2016-04-04 10:31:13 -05:00
ff929a8515
Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 00:57:28 +10:00
fecd3c1eaa
Final changes
2016-04-04 23:28:38 +10:00
ee22274ef5
Removed Stacker debug messages.
2016-03-23 16:02:06 -05:00
e8dcc4a3e2
Merge branch 'develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-03-23 11:02:20 +11:00
2cff7003e6
Added more debug to Stacker interaction.
2016-03-21 20:30:54 -05:00
faf6834e23
Added some protection for stacker and offline players.
2016-03-20 16:27:59 -05:00
1228ca227e
Add support for 1.9 resource packs, Text Tutorials
2016-03-11 11:50:08 -06:00
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
befb27d3db
Finalized Vanish system
2016-03-09 01:45:17 +00:00
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
99150db2d7
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2016-02-22 19:02:54 +00:00
c811906a7e
REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a)
2016-02-19 18:21:01 +11:00
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
1c5ae77329
Fix Valentines quick server menu button
2016-02-16 16:54:05 -06:00
15ed2570e2
Valentines final changes, Change Gift Giver achievement
2016-02-15 20:43:46 -06:00
0d19a8017f
Update Featured arcade game, various bug fixes
2016-02-12 06:51:30 -06:00
e8559d423a
Add Valentines Vendetta to quick server menu
2016-02-12 05:27:50 -06:00
960a0cdabb
Fix constructor error, add ValentinesGiftManager to Arcade
2016-02-12 05:06:13 -06:00
66aa89b5e0
Fix sheep look bug, valentines gift effects, valentines achievements
2016-02-12 04:32:26 -06:00
4f0f81c8df
Update Courtship messages
2016-02-12 01:47:20 -06:00
d8965179f7
More valentines adjustments/fix gladiators tutorial being enabled
2016-02-11 23:01:59 -06:00
00f7880dd2
Fix compile error
2016-02-09 21:15:15 -06:00
f6e091f029
Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop
...
* commit '57638ff68496b6f10012f8782633066b52a8a715':
More work on valentines
Valentines gifts
Added love potion and hub sheep thing.
Started on Love Potion system. Switching branches.
Varius tweaks and changes.
Added sheep mount to index.
Added various cosmetic items for Valentines day.
2016-02-09 20:28:37 -06:00
a868b8b2b8
Valentines gifts
2016-02-08 22:26:33 -06:00
c059425e9d
Remove GiveawayManager (not used anymore)
2016-02-07 13:18:29 -06:00
a8ff714ee4
Added love potion and hub sheep thing.
2016-02-07 10:19:40 -05:00
c1393697f8
Started on Love Potion system. Switching branches.
2016-02-06 14:08:17 -05:00
c0d6cbbb85
Added various cosmetic items for Valentines day.
...
- Heart arrow trail
- Heart death animation
- Heart double jump animation
- Heart set
- Cupid's bow gadget
- Pink Sheep mount
2016-02-04 13:12:53 -05:00
8cf32ef8bf
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-30 00:46:43 +00:00
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
c1f91cbfb0
Final changes
2016-01-29 03:56:49 -05:00
863be023d9
Prep for update
2016-01-29 03:36:52 -05:00
eb29c6b367
Fix constructor
2016-01-28 22:28:18 -05:00
0177cf91bb
Merge with develop
2016-01-28 22:23:17 -05:00
051d70771b
Facebook Command
2016-01-28 22:15:35 -05:00
63cea58f05
Waiting for a testing session.
2016-01-28 17:18:24 +00:00
ac37417fca
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/.idea/modules.xml
2016-01-27 21:44:04 +00:00
311d42db30
Use Garbo's description changes
2016-01-22 19:48:06 -05:00
a41816ca22
Include version.properties in Mineplex.Core
2016-01-21 16:37:35 -05:00
1e72ebcbe6
Merge branch 'master' into rankdescriptions
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-01-21 12:54:12 +00:00
dd0fc23467
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-21 10:12:02 +00:00
447583624e
Fix ascii.png duplication.
2016-01-21 17:47:21 +11:00
359655f417
Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop
...
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
Fix some misc suspicious calls to Collection methods.
2016-01-20 12:23:55 -06:00
037a2f8353
Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command
2016-01-20 13:04:31 -05:00
8977735baf
Include a version.properties in maven build
2016-01-20 11:57:21 -05:00
ea315a1447
Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop
...
# Conflicts:
# Plugins/Libraries/craftbukkit.jar
2016-01-20 10:19:09 -05:00
77d9f7cf32
Merge branch 'master' into develop
2016-01-20 10:12:20 -05:00
bb4091c7a6
Use Maven for Compilation
2016-01-20 11:20:58 +11:00
044d2bac83
Fix some Invisibility preference bugs
2016-01-17 22:55:04 -05:00
2b6074a210
Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command'
2016-01-17 22:46:56 -05:00
5ed9295944
updating Hub command as well
2016-01-17 18:10:16 +01:00
4927bb8c0b
Fix some misc suspicious calls to Collection methods.
2016-01-17 20:20:48 +11:00
410bc1c74b
not being able to disguise as banned/muted players
2016-01-15 19:12:50 +01:00
53133d51ee
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-01-13 11:47:13 +00:00
4e9a4c87d4
Merge pull request #123 in MIN/mineplex from bugfix/disguise-command to develop
...
* commit '0f587ba5d908afdccb877358d71e56a3edda49cd':
fixing "Kicked for flying again" again...
2016-01-11 17:20:51 -06:00
3693a2b2c5
Merge pull request #122 in MIN/mineplex from bugfix/thanos to develop
...
* commit 'ed439569453dc248623834af6fb553341779e46c':
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
Remove unused imports.
Prevent players from stacking others with a menu inventory opened.
Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
2016-01-11 16:26:09 -06:00
ed43956945
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
2016-01-10 16:37:51 +02:00
46695f8449
Fix hub fly for YOUTUBE_SMALL
2016-01-09 18:44:32 -05:00
8193b5121b
Dont allow /disguise for YOUTUBE_SMALL
2016-01-09 18:39:47 -05:00
5f362a878a
Run some Redis functions async (as it sometimes blocks).
2016-01-09 22:21:15 +00:00
ce1bac8037
Remove unused imports.
2016-01-09 17:03:14 +02:00
62e1fb3688
Prevent players from stacking others with a menu inventory opened.
2016-01-09 17:01:57 +02:00
Alex-The-Coder
Conrad
AlexTheCoder
Keir Nellyer
LCastr0
Shaun Bennett
xGamingDudex
Jonathan Williams
Ben
Keir Nellyer
Shaun Bennett
md_5
Mysticate
teddy
Sarah
Thanos paravantis