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
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
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
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
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
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
Sam
3b11a2e985
Killstreaks
2016-08-18 22:02:33 +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
