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
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
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
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
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
