JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,335 Commits 1 Branch 0 Tags 481 MiB
13220e267c
Commit Graph

4045 Commits

Author SHA1 Message Date
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
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
cnr
f6db5393a3 Merge branch 'project-cosmetics' into develop 2016-09-02 00:08:23 -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
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
53846acbf6 Dont let Minestrike use NextBestGame 2016-09-01 05:39:47 -05:00
TadahTech
46053e82e1 Mavs changes. 2016-09-01 02:35:31 -05:00
cnr
9cd5b73432 Merge branch 'update/basketball-game' into develop 2016-08-31 23:19:51 -05:00
Sam
57292414c6 Gems for winners 2016-08-31 22:55:13 +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
b1faecea49 Kit Fire incorrect values 2016-08-31 12:07:25 +01: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
TadahTech
94bfc9aa15 Use proper server group / remove testing. 2016-08-29 22:33:01 -05: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
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
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
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
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
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
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
TadahTech
3b9d6adfbc Lobby Update 2016-08-23 01:37:07 -05: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
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
Sam
dc5c2430cd Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-19 17:58:27 +01:00
Sam
c4cb5d8db4 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-19 12:56:24 +01:00
LCastr0
84c6720d1c Fix merging errors 2016-08-18 18:30:32 -03:00
Sam
3b11a2e985 Killstreaks 2016-08-18 22:02:33 +01: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
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
Sam
0176f31f1e Complete implementation of kit progression 2016-08-16 18:55:26 +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
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
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
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
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
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
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
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
Sam
2f3ff052ff Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-08 22:59:55 +01:00
Sam
4c825cf80b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-08 22:48:33 +01:00
Sam
3bab7ffe44 Use attack name for Snowballs and Eggs 2016-08-08 22:48:13 +01:00
Sam
239761962d Now 1.9! 2016-08-08 20:49:24 +01:00
Sam
93e49bc8a6 Stop placing and dropping of skill items 2016-08-08 16:44:13 +01:00