TadahTech
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
Shaun Bennett
1d365d726c
brawl fountain now displays proper info on the weekend
2016-06-09 23:40:58 -05:00
Shaun Bennett
ece08c23a9
Fix merge issues
2016-06-09 00:40:05 -05:00
Shaun Bennett
d4ac309daa
Merge remote-tracking branch 'remotes/origin/master' into feature/gems
2016-06-09 00:29:27 -05:00
Shaun Bennett
c9d5b91c52
Proper booster activation events
2016-06-08 19:22:25 -05:00
Shaun Bennett
37a412f1bf
Starting to merge boosters into arcade code
2016-06-07 17:24:24 -05:00
TadahTech
474a9dc975
Heavy UI and Command work. Begin testing
...
Time: 2hrs
2016-06-05 23:37:08 -05:00
TadahTech
e7f4f00433
Files changed that need to be edited later on with the new Party System.
...
Memory commit
2016-06-04 22:56:30 -05:00
TadahTech
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
TadahTech
22a438d5c1
Party system rewrite init. Barebones frame work: Total time - 2hrs.
2016-06-04 01:54:17 -05:00
cnr
894b7db18e
Remove remaining fake ultra tag artifacts
2016-06-02 02:25:15 -05:00
Alex-The-Coder
ff415a4569
Remove hub logitech advertisement
2016-05-30 14:44:07 -04:00
Shaun Bennett
4e9a48ab4f
Finish off the tip system
2016-05-30 12:02:12 -05:00
Shaun Bennett
e380354bad
Refactor CurrencyType
2016-05-29 16:34:21 -05:00
Shaun Bennett
1377e6724f
Merge with develop
2016-05-24 19:10:55 +10:00
Shaun Bennett
12c5ba80b7
API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation
2016-05-24 17:13:33 +10:00
LCastr0
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
cnr
7f44281441
Merge branch 'develop' into project-cosmetics
2016-05-19 10:04:19 -05:00
Ben
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
xGamingDudex
296f304d29
Changed the way UtilItem.dropItem handles despawning
2016-05-15 17:04:50 +02:00
phobia
a67fec95fc
Remove ultra tag
2016-05-15 03:21:58 -05:00
xGamingDudex
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
AlexTheCoder
fab24e2139
Allow admins to be opped on testing servers
2016-05-12 17:24:37 -04:00
Sam Sun
2ae072f5b7
Rename modules to correct name
2016-05-12 11:44:35 -04:00
Alex-The-Coder
05312a9bef
Update where players spawn upon first join...
...
...to avoid flight kick upon login
2016-05-11 21:57:42 -04:00
Conrad
8eba2c9ccb
Merge pull request #59 from Mineplex-LLC/feature/logitech-brand
...
Move billboard up 1
2016-05-09 11:55:22 -04:00
AlexTheCoder
7932258579
Move billboard up 1
2016-05-09 03:44:16 -04:00
AlexTheCoder
de1fabf53d
Disable report system as it is not ready to go live
2016-05-09 02:10:51 -04:00
Keir Nellyer
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
AlexTheCoder
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
Keir Nellyer
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
AlexTheCoder
f329051399
Changed design of billboard and fixed its centering in hubs
2016-05-05 18:25:51 -04:00
Keir Nellyer
a663cb3e01
Revert "Revert "Report system (version 1)""
...
This reverts commit d0d2de1e21
2016-05-04 15:24:29 +01:00
LCastr0
cfc6f3703d
Merge pull request #50 from Mineplex-LLC/develop
...
Merge from develop
2016-05-03 13:24:32 -03:00
AlexTheCoder
3d98c08a67
Add in missing file
2016-05-02 16:33:11 -04:00
AlexTheCoder
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
AlexTheCoder
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
Conrad
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -04:00
Keir Nellyer
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
Keir Nellyer
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
AlexTheCoder
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
Shaun Bennett
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
xGamingDudex
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
Jonathan Williams
d73b720323
Merge branch 'features/elo' into develop
2016-04-22 04:34:35 -05:00
Jonathan Williams
6d00e8b41f
Refactored Elo to work correctly.
2016-04-22 00:21:11 -05:00
Shaun Bennett
54f0b99756
Add fountain gui command
2016-04-21 11:41:16 +10:00
Shaun Bennett
cb48df6a3d
Update fountain count every 5 seconds. Display Hologram
2016-04-19 14:30:38 +10:00
xGamingDudex
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
Jonathan Williams
2b2b251548
Merge branch 'clans/beta' into develop
2016-04-15 12:41:14 -05:00
Jonathan Williams
a730b81feb
Commented out TournamentManager, moving off develop.
2016-04-15 12:38:25 -05:00
