6c0d18662f
Added /e clear <player or @a> PC-16
2016-03-08 20:45:23 -05:00
befb27d3db
Finalized Vanish system
2016-03-09 01:45:17 +00:00
c89669aec9
Add /e announce <text> PC-15
2016-03-08 20:23:33 -05:00
496983ee04
Untested bugfixes
2016-03-07 22:29:14 +13:00
d108679d43
Fix compile error
2016-03-04 14:09:20 -06:00
6d0ca4f813
Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-03-03 13:49:31 +13:00
0ffa67dfb8
Ring game
2016-03-03 13:48:22 +13:00
b18f2d8682
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-03-02 20:02:09 +00:00
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
a3b7a3269c
Merge branch 'develop' into Dual_1.9
2016-03-01 15:14:59 -06:00
923e51483c
Remove fill line
2016-02-26 04:29:27 -06:00
4472c52432
Fix bucket
2016-02-26 04:21:26 -06:00
268536ce68
push 4 shaun
2016-02-26 08:13:28 +00:00
e4ba5d9723
Fix colour targeting FINALLY!
2016-02-25 19:48:15 +00:00
dead7a0850
Use a different method for targeting blocks.
2016-02-25 16:09:00 +00:00
a97409b64a
Adjust max distance for targeting.
2016-02-25 15:04:19 +00:00
7f6517a823
Ignore barrier blocks when drawing.
2016-02-25 14:23:16 +00:00
2a9d49ccd9
Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:11:12 +13:00
19b6c3d95f
Make sure the blocks are in the canvas.
2016-02-24 21:37:22 +00:00
a5060e014b
Replace old paint bucket recursive filling.
2016-02-24 21:34:41 +00:00
35a853a198
Remove redo/undo system as per request of @mightysigils.
2016-02-24 08:17:13 +00:00
33bf3e2e6e
Merge branches 'develop' and 'feature/dmt-update' of github.com:Mineplex-LLC/Minecraft-PC into feature/dmt-update
2016-02-24 08:03:42 +00:00
700f5ec44a
Add Redo/Undo system (WIP).
2016-02-24 07:58:50 +00: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
3b7a7e457c
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-20 03:20:27 -05:00
0a6cdfa779
- chiss' requested changes
2016-02-20 03:18:59 -05: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
8b1b63c8b3
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9
...
Conflicts:
Patches/craftbukkit.jar
2016-02-18 16:45:37 +13:00
d3884bd090
- Spawn regen
2016-02-17 22:12:23 -05:00
fe849576f7
- Spawn protection
2016-02-17 22:04:20 -05:00
4158c12227
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-17 21:44:51 -05:00
1a1c64dc51
Fix PerkMadScientist on non game zombies.
2016-02-17 18:44:49 +11:00
b5f4055269
Fix command stack trace on unitialized arcade games.
2016-02-17 18:40:24 +11:00
3fad9c639a
Fix stack trace in master builders when clicking on a watch.
2016-02-17 18:39:26 +11:00
50f58ba3a5
Don't stack entities when a game isn't running.
2016-02-17 18:33:40 +11:00
628e77a701
Don't process empty chat messages.
2016-02-17 18:32:43 +11:00
e6c00b06ee
Fix exception in GameChatManager if an Arcade game has not been initialized.
2016-02-17 18:29:47 +11:00
e3861d3bc0
Fix NPE in TnTGenerator
2016-02-17 18:22:37 +11:00
9e2840b3b5
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-16 21:28:07 -05:00
efb63ee824
- fixes
2016-02-16 21:27:50 -05:00
35b9e01aff
Added FlySpeed Cap to WitherAssault game
2016-02-16 19:26:00 +01:00
d10dc3d7be
Fixed NPE in KillsWhileEvolvingTracker for game Evolution
2016-02-16 19:22:18 +01:00
9c1e574f6a
Fixed ConcurrentModificationException in PerkDeadlyBones:99
2016-02-16 19:09:06 +01:00
2f302f4892
Fixed NPE for Gladiators death event
2016-02-16 18:54:13 +01:00
2436b7084a
Fixed some chat issues, especial one at GameChatManager:125
2016-02-16 18:52:18 +01:00
2d5868657a
Fixed NPE in PerkVanish
2016-02-16 18:35:42 +01:00
2d3956175b
Should have fixed PerkFishFlurry Block NPE on update (132)
2016-02-16 18:32:17 +01:00
ad6c506361
Concurrency Exception in PerkDeathsGrasp fix
2016-02-16 18:18:47 +01:00
d33905e174
Fixed NPE in MiscManager regarding hub clock tp fix for Master Builders
2016-02-16 18:09:07 +01:00
f551703d9c
SkyWars TNTGenerator NPE fix
2016-02-16 17:57:00 +01:00
16c03ebb48
- Silly skeletons! Swimming is for players!
2016-02-15 21:54:18 -05:00
37757ad7de
Add TypeWars to MPS
2016-02-15 18:55:13 -06:00
53ac1827bc
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-15 19:13:20 -05:00
8d1b270089
- Balancing and bugs
2016-02-15 19:12:25 -05:00
15ed2570e2
Valentines final changes, Change Gift Giver achievement
2016-02-15 20:43:46 -06:00
f0d59755d2
- Update
2016-02-14 03:31:36 -05:00
f6c38903f2
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-13 14:34:11 -05:00
6385aacbac
- Updates
2016-02-13 14:28:39 -05:00
138c900484
- Fixed up for more universal damage switching
2016-02-13 12:46:57 -05:00
8b39d7ba43
- Void damage fix
2016-02-12 23:16:56 -05:00
ea893bfa48
- Fixed update
2016-02-12 23:03:38 -05:00
197bcc9dbf
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
2016-02-12 21:23:58 -05:00
9595a0ffae
- Lot of stuff
2016-02-12 21:22:00 -05:00
960a0cdabb
Fix constructor error, add ValentinesGiftManager to Arcade
2016-02-12 05:06:13 -06:00
d51e26a5a4
Valentines game adjustments
2016-02-12 01:34:29 -06:00
d8965179f7
More valentines adjustments/fix gladiators tutorial being enabled
2016-02-11 23:01:59 -06:00
2eeddb828b
Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop
...
* commit '51d152d48473f820ab6d03586fb41f890750f645':
Perfect build all fix
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
Stop mid game joiners from getting participation gems.
Mob egg baby fix. Also fixed non build entities from being "broken"
spec command add guardian
The infamous look direction bounce bug
Chiss' double jump mechanic
Moar fixes
Hopper item pickup fix.
2016-02-11 22:59:35 -06:00
790ed4f993
Fix tools for block type/colour selections.
2016-02-11 08:11:40 +00:00
b3045d38e7
Add colour selection for multiple block types.
2016-02-10 16:34:00 +00:00
eebe25040e
cleaned the particle effects a bit
2016-02-10 16:31:25 +11:00
e3ff25526b
Merge pull request #164 in MIN/mineplex from valentines/game to develop
...
* commit '6800e4ef478e2d1eea5c19ec52a8368ec0bd520a':
valentines final push
bug fixes
more valentines :)
many valentine, such wow
val1
2016-02-09 20:28:58 -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
6800e4ef47
valentines final push
2016-02-09 20:43:24 +11:00
51d152d484
Perfect build all fix
2016-02-07 19:05:53 -05:00
aaf1fd42f3
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
2016-02-07 18:16:36 -05:00
b40f018ee2
Stop mid game joiners from getting participation gems.
2016-02-07 17:20:58 -05:00
e96b4c4a7f
Mob egg baby fix. Also fixed non build entities from being "broken"
2016-02-07 15:59:59 -05:00
008fc587b0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-07 15:33:37 -05:00
7e9ff95ae3
spec command add guardian
2016-02-07 15:27:39 -05:00
a5c5a7c536
Merge pull request #157 in MIN/mineplex from bugfix/bridges-ore-mining to develop
...
* commit '465f12e210120e316e9252dc4e5b7207b4ae0279':
Fixed NPE
Made sure that a valid tool is used before dropping any items.
2016-02-07 14:00:46 -06:00
c059425e9d
Remove GiveawayManager (not used anymore)
2016-02-07 13:18:29 -06:00
465f12e210
Fixed NPE
2016-02-07 13:27:38 -05:00
2ab1b51401
bug fixes
2016-02-07 14:09:02 +11:00
a35a9ea31f
more valentines :)
2016-02-07 13:27:53 +11:00
2ac7840d71
The infamous look direction bounce bug
2016-02-04 23:54:54 -05:00
b0b43524da
Chiss' double jump mechanic
2016-02-04 22:05:46 -05:00
a76e570b8a
Moar fixes
2016-02-04 21:43:17 -05:00
690c2acce8
many valentine, such wow
2016-02-05 13:25:57 +11: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
5c22c841fe
val1
2016-02-04 10:55:29 +11:00
699a26f630
Merge pull request #159 in MIN/mineplex from master to feature/dmt-update
...
* commit '70d41b074f9256b4ac0b6fb51b68fb24dcf10e24': (328 commits)
Fix treasure stair orientation
add a shard queue to DonationManager, use that for TreasureShardReward
mac fix
Commons codec is not included in BungeeCord.
Pooling with later jedis versions doesn't work on Bungee.
Gitignore redundant Eclipse files.
Add Eclipse magic.
Fixed various ways of players going invisible through Spec mode.
Speed up LobbyBalancer to 500ms
Add example maven settings.xml
Remove setTestOnBorrow
Tone down lobby balancer too.
Emergency patch to slow down redis player count updates.
Fixed explosions dropping right items.
sapling fix
Update fixes - @Teddy!
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
Final changes
...
2016-02-03 16:06:59 -06:00
af5cf309ca
Made sure that a valid tool is used before dropping any items.
2016-02-03 14:43:14 -05:00
27fc81dd8b
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-02-03 17:23:40 +00:00
41ea96d505
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-01 16:42:55 -05:00
989c324a37
Hopper item pickup fix.
2016-02-01 16:18:40 -05:00
9601eabfeb
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-01-31 17:38:08 +00:00
ace7d1764c
Fixed various ways of players going invisible through Spec mode.
2016-01-31 10:22:59 -05:00
52b6779a4f
Merge pull request #146 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
...
* commit 'b45e00796d66cf8aeb39510e0bd23bc5bd59327b':
Fixed explosions dropping right items.
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
2016-01-30 01:45:00 -06: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
b45e00796d
Fixed explosions dropping right items.
2016-01-29 15:58:49 -05:00
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
1e29bd6936
Made block define its own drops.
2016-01-29 11:44:40 -05:00
447583aa2a
Removed an nunnecesarry method
2016-01-29 09:41:45 -05:00
075a1141f1
Fixed items not dropping their regular counterpart.
2016-01-29 09:36:09 -05:00
a1f9f41910
Merge remote-tracking branch 'origin/develop' into develop
2016-01-29 03:37:03 -05:00
863be023d9
Prep for update
2016-01-29 03:36:52 -05:00
ba0dd3da44
Merge pull request #141 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
...
* commit 'b92ddc75759bc848b409b5626f0fbeb9d71154b5':
Added proper ore pickup delay.
2016-01-29 02:33:23 -06:00
a0e9a82327
Merge pull request #143 in MIN/mineplex from bugfix/achievements-misc to develop
...
* commit '7d33e76055eb160e58d63443a72117e654df9468':
Fixed ForTheKing achievement.
Made sure Sniper achievement in Bridges is always fulfilled.
Fixed + Tidied Gladiators Precision achievement.
2016-01-29 02:32:50 -06:00
63fa942789
Merge pull request #144 in MIN/mineplex from bugfix/uhc-hearts to develop
...
* commit 'caa5d922b520da30223230b58754a77dd3b72186':
Prevent hearts changing colors in UHC tab.
2016-01-29 02:27:20 -06:00
caa5d922b5
Prevent hearts changing colors in UHC tab.
2016-01-28 22:54:20 -05:00
7d33e76055
Fixed ForTheKing achievement.
2016-01-28 22:51:19 -05:00
733ba067fe
Made sure Sniper achievement in Bridges is always fulfilled.
2016-01-28 22:49:51 -05:00
fffa1d5926
Fixed + Tidied Gladiators Precision achievement.
2016-01-28 22:48:52 -05:00
b92ddc7575
Added proper ore pickup delay.
2016-01-28 22:39:48 -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
40f6969413
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-01-28 22:16:15 -05:00
051d70771b
Facebook Command
2016-01-28 22:15:35 -05:00
251fb53f29
Merge pull request #124 in MIN/mineplex from bugfix/morph to develop
...
* commit '2e433d8b0654507a9a41d9bbae313ab90e92471f':
Made sure that the active morph gets disabled on clear
2016-01-28 21:08:32 -06:00
bf273708f9
Merge pull request #136 in MIN/mineplex from feature/entity-spectating to develop
...
* commit '53132a248f9d899e2b4b275a31cfd69376533688':
the L
Updateting spectator Menu layout.
fixing spec item in menu
Removing right clicking.
removing switching players until spigot patch is on.
adding spectator rotation.
adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-28 21:08:13 -06:00
015cca57b6
Merge pull request #138 in MIN/mineplex from bugfix/gladiators-hotbar-editor to develop
...
* commit '75629055d851265e91eb7d0679a40a1357552e17':
Un-register HotbarEditor MiniPlugin and fix /spec bug.
Un-register the hotbar page listener on disable.
2016-01-28 21:03:48 -06:00
f72ee95759
Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop
...
* commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits)
Remove debug message.
Fix flickering judge laser.
Borders for spec are fixed.
Leaves fix.
Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
Make dependable require 50 perfect builds instead of 10.
Multiply by less
negative!
Trying different hologram location
Fix messages, fix /stats
Center hologram
Make achievement category classics
hologram changes
Holograms maybe?
Chiss' checklist.
Remove unnecessary tabs. Make the judge guardian use it's own laser again.
Fixed builds with only mobs not loading.
Fixed mobs.
TICK TICK TICK TICK.
all players equal, no one loses
...
2016-01-28 21:02:23 -06:00
b6db99806a
Remove debug message.
2016-01-28 18:28:43 -05:00
96ea001291
Clean up
2016-01-28 23:05:27 +00:00
da8a55f99c
Final edits
2016-01-28 22:57:54 +00:00
75629055d8
Un-register HotbarEditor MiniPlugin and fix /spec bug.
2016-01-28 20:43:58 +00:00
04544c2b8d
Fix flickering judge laser.
2016-01-28 14:28:47 -05:00
d44d4c2278
Un-register the hotbar page listener on disable.
2016-01-28 19:21:42 +00:00
63cea58f05
Waiting for a testing session.
2016-01-28 17:18:24 +00:00
eed55b48ac
Descriptions changed
2016-01-28 09:55:48 +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
70be135a40
Merge branch 'feature/hoverable-chat' of http://dev.mineplex.com:7990/scm/min/mineplex into rankdescriptions
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
2016-01-27 19:42:11 +00:00
b84ec01597
- Huge amount of stuff
2016-01-26 22:52:45 -05:00
40113f99d3
Borders for spec are fixed.
2016-01-26 17:14:21 -05:00
2f4146c243
Leaves fix.
2016-01-25 21:12:28 -05:00
c5dfddd710
Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
2016-01-25 20:54:01 -05:00
53132a248f
the L
2016-01-25 12:28:21 +01:00
c7733bb068
Updateting spectator Menu layout.
2016-01-25 12:27:19 +01:00
91b6ae8b09
fixing spec item in menu
2016-01-25 12:14:56 +01:00
4314f35f80
Multiply by less
2016-01-25 04:46:47 -06:00
b143ec7c19
negative!
2016-01-25 04:42:09 -06:00
6ff7c83d3e
Trying different hologram location
2016-01-25 04:17:58 -06:00
616be8aea7
Fix messages, fix /stats
2016-01-25 03:59:37 -06:00
bc8f6e511c
Center hologram
2016-01-25 03:44:22 -06:00
61f1a58b1c
hologram changes
2016-01-25 03:29:53 -06:00
181cce4774
Holograms maybe?
2016-01-25 03:08:56 -06:00
219b86ae55
Chiss' checklist.
2016-01-25 03:01:54 -05:00
31ef7ffe19
Removing right clicking.
2016-01-25 07:45:38 +01:00
f722831e6a
removing switching players until spigot patch is on.
2016-01-25 05:44:06 +01:00
9e63c9000a
adding spectator rotation.
2016-01-25 04:30:42 +01:00
bfe9aa7a59
Remove unnecessary tabs. Make the judge guardian use it's own laser again.
2016-01-24 21:55:57 -05:00
0eda813d41
Fixed builds with only mobs not loading.
2016-01-24 19:14:34 -05:00
00f01e09af
adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-24 20:00:05 +01:00
a747426fa0
Fixed mobs.
2016-01-23 05:00:14 -05:00
a359c4f8b6
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-23 03:42:50 -05:00
1e732b08e7
TICK TICK TICK TICK.
2016-01-23 03:42:36 -05:00
790e2e8f73
Merge branch 'virizion_speed_builder' of ssh://184.154.0.242:7999/min/Mineplex into virizion_speed_builder
2016-01-23 19:32:37 +11:00
c1ff7f4fc2
all players equal, no one loses
2016-01-23 19:32:23 +11:00
a75770b0a6
Change build to load from top instead of bottom.
2016-01-23 03:15:41 -05:00
f82a408f30
Build time modifiers
2016-01-23 02:43:41 -05:00
5dc773032b
Add joining players to guardians team instead of spectator.
2016-01-23 02:10:11 -05:00
245cc1ed93
Limit Perfectionist achievement to 1.
2016-01-22 22:18:29 -05:00
311d42db30
Use Garbo's description changes
2016-01-22 19:48:06 -05:00
231b8cb19a
Merge pull request #133 in MIN/mineplex from bugfix/foo to develop
...
* commit '376f719c261bd2152a6646a152472a2485e1b689':
fixes important bug, fixed a scary typo!
Lots of typo fixes and such
i before e!
fixed cosmetic menu item dropping bug
more grammatical errors hast been fixed
Grammatical errors hath been fixed!
2016-01-22 18:38:26 -06:00
b2e4dff9e5
Add time to perfect build message
2016-01-22 19:18:23 -05:00
02b45bd302
Forgot to register stat tracker
2016-01-22 19:14:25 -05:00
ddc86f0897
Add Speediest Builderizer achievement
2016-01-22 19:13:23 -05:00
d0e5be9c93
Guardian is impressed (untested!)
2016-01-22 18:35:18 -05:00
3f715ab4dd
Enable inventory click.
2016-01-22 02:23:58 -05:00
4bbd956e14
Don't use the same build twice (untested!)
2016-01-22 01:37:47 -05:00
49e439af55
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-22 01:28:09 -05:00
6bb60ddebd
Ignore empty builds (untested!)
2016-01-22 01:27:29 -05:00
c66f37817e
Fixed invis bug.
2016-01-22 01:22:31 -05:00
5c83f5c1e5
Renamed to Speed Builders from Speed Builder.
2016-01-22 00:20:58 -05:00
0da921f3d2
Removed debug thing.
2016-01-21 23:52:59 -05:00
a38319147a
Stopped physics which fixed the torch bug.
2016-01-21 23:49:49 -05:00
582fa4c915
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-21 22:42:33 -05:00
c38596a09f
Name the guardian, 10 seconds to view builds
2016-01-21 22:42:25 -05:00
24e97176cc
Call clear build area method on eliminate.
2016-01-21 22:05:30 -05:00
d37b8b40fc
Disable item merge to (hopefully) fix phantom rails.
2016-01-21 20:41:28 -05:00
50c9b33701
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-21 20:13:53 -05:00
636da8f4fa
Mob destroying. Removed a debug change that only selected builds with mobs in them.
2016-01-21 20:13:32 -05:00
5675aed698
velocity the drops to the player
2016-01-22 11:56:52 +11:00
69825893c9
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-01-21 19:11:36 -05:00
6ab6307f74
Pushing all my stuff for Shaunpai.
2016-01-21 19:08:38 -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
c0d4fa1bea
Merge pull request #125 in MIN/mineplex from bugfix/mb-wins to develop
...
* commit '4924d652f555392c9e36feb05a64cccd61b6c594':
Store winner UUID instead of Player object to avoid leaking excess data
Fixed who the winner is in MB Games.
2016-01-20 12:33:56 -06:00
4924d652f5
Store winner UUID instead of Player object to avoid leaking excess data
2016-01-20 13:33:40 -05: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
bb4091c7a6
Use Maven for Compilation
2016-01-20 11:20:58 +11:00
573d0dd67d
Stats added for all other games
2016-01-19 23:10:45 +00:00
7af8d78fc3
Add resource pack and other fixes
2016-01-19 14:00:23 +00:00
951c27123a
Remove /disguise for YOUTUBE_SMALL in arcade
2016-01-18 22:10:01 -05:00
c52bc8024c
Halloween, added kit to stats
2016-01-18 11:41:30 +00:00
740eeae9bd
Halloween, added stats
2016-01-18 11:40:46 +00:00
3fc25359be
Gravity, added stats
2016-01-18 11:38:43 +00:00
b22f452b1f
Gladiators, added stats
2016-01-18 11:36:16 +00:00
297e9baf41
Evolution, added stats
2016-01-18 11:34:43 +00:00
f3d27c9d93
Draw my thing, added stats
2016-01-18 11:32:40 +00:00
3d88f5aaae
Dragons, added stats
2016-01-18 11:11:32 +00:00
ba50b5fdb1
Dragon Riders, added default registery
2016-01-18 11:09:19 +00:00
c3d9be2123
Dragon Escape Teams, added stats
2016-01-18 11:05:09 +00:00
85f4ee50f0
Dragon Escape, added stats + implemented kit display for stats
2016-01-18 11:04:12 +00:00
66f484760e
Death Tag, added stats
2016-01-18 10:53:56 +00:00
96d16932dd
Christmas Chaos, added stats
2016-01-18 10:50:04 +00:00
dc44207d7a
Champ TDM, added stats
2016-01-18 10:48:10 +00:00
4e09aa4c34
Champ Dominate,added stats
2016-01-18 10:45:48 +00:00
f79acaaa2a
Champ CTF,added stats
2016-01-18 10:43:46 +00:00
508c4e99d2
Castle Siege,added stats
2016-01-18 10:41:10 +00:00
b0eb5a6d4e
Cards Against Humanity, skipped/left blank
2016-01-18 10:34:43 +00:00
56b3e482f2
Master Builders, added stats
2016-01-18 10:32:38 +00: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
52bda30f85
Mysts OCD again......
2016-01-17 03:03:00 +01:00
4a5d6b5f2a
Mysticates OCD....
2016-01-17 02:48:15 +01:00
f22297418c
Clear full canvas at start fix
2016-01-15 19:08:25 +00:00
733bfadf68
Added spray can tool
2016-01-15 18:52:26 +00:00
410bc1c74b
not being able to disguise as banned/muted players
2016-01-15 19:12:50 +01:00
c16a719be1
Bridges, added stats
2016-01-15 13:37:55 +00:00
9cd7240b61
BouncyBalls, giving errors when Loading, skipping chat stats
2016-01-15 13:28:42 +00:00
ec75169b70
BossBattles, giving errors when Loading, removed chat stats.
2016-01-15 13:07:21 +00:00
3315a510dc
Barbarians stats added + Block break stat tracker added
2016-01-15 13:01:26 +00:00
6a3e9ac19f
BaconBrawl stats added
2016-01-15 12:10:53 +00:00
cf7f5af9ca
Fixed who the winner is in MB Games.
2016-01-14 07:41:36 -05:00
2e433d8b06
Made sure that the active morph gets disabled on clear
2016-01-14 07:17:40 -05:00
d33d682ebb
Implementing stats for every game, got all stat names ready
2016-01-13 18:40:29 +00:00
26246604a7
This should've gone with the previous commit :/
2016-01-13 11:48:18 +00: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
ee6425bbaf
Removed extra blank lines.
2016-01-12 23:31:35 -05:00
dfd5a63b78
More changes and fixes.
2016-01-12 23:29:08 -05:00
63897b9b54
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-12 20:05:34 -08:00
528a7435e7
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2016-01-12 20:25:08 -05:00
b27d5849d8
General fixes.
2016-01-12 20:23:25 -05:00
f1314d5c26
JSON now handled by JsonMessage Builder
2016-01-12 13:25:47 +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
88c53bf464
Added default ChatStat for all games to prevent my server from dying when testing
2016-01-11 19:35:00 +00:00
02ff8bdbdb
Custom stats working, escaping bug fix and List reset bug
2016-01-11 12:59:57 +00:00
40d913beaf
Changed a List to reset each time its registered to prevent stats copying to the next game, automatic string escaping, party colour name changed to original colour
2016-01-11 12:35:44 +00:00
b9d44d9a24
not updating properly, fixed
2016-01-11 12:14:29 +00:00
78eaee98df
Typo mistake
2016-01-11 12:09:08 +00:00
ec6e916c7b
more stable, progress for making 'easier-to-use'
2016-01-11 12:06:30 +00:00
5caeb8bee0
even nicer visual
2016-01-10 17:34:15 +00:00
c814132b24
ratio's and nicer visuals
2016-01-10 17:33:18 +00:00
83375a6883
stats not updating
2016-01-10 16:01:40 +00:00
1bce624ab3
Finally got rid of MalformedJSON
2016-01-10 15:13:11 +00:00
5f362a878a
Run some Redis functions async (as it sometimes blocks).
2016-01-09 22:21:15 +00:00
942460b471
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-09 13:05:44 -08:00
263e1326cd
JSON progress
2016-01-09 20:22:29 +00:00
0f587ba5d9
fixing "Kicked for flying again" again...
2016-01-09 12:07:57 +01:00
2df626b35e
Fix CustomDataManager crash
2016-01-08 18:06:33 -05:00
511b39caa7
Merge branch 'master' into develop
2016-01-08 17:05:54 -05:00
7ce028203b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-08 13:59:43 +00:00
5cb91bb315
Allow reuse of ReportManager instance (for later use).
2016-01-08 13:59:30 +00:00
5482d1dc40
Fixing "kicked for Flying"
2016-01-08 12:17:28 +01:00
6096fcad42
Fix hotbar issues
2016-01-08 04:06:11 -05:00
504d9d508c
Slightly reduce Squid's Ink Blast damage in SSM
2016-01-08 03:15:30 -05:00
d361ce948e
Merge branch 'develop' into william-gladiators
...
# Conflicts:
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
2016-01-08 02:21:32 -05:00
19bb44cb9a
Disable HolidayManager and HolidayGiftManager
2016-01-08 01:41:02 -05:00
003af1b87c
Disable Holiday Words in DMT and Build
2016-01-08 01:38:49 -05:00
b6b455c1c0
Merge pull request #117 in MIN/mineplex from clans/alpha to develop
...
* commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits)
Added C.Mod rank, and started on rank info.
changed outpost forcefields to be a bit larger to surround the outpost more.
made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
fixed outpost being built instantly on output block place.
holograms above outpost block should be centered in the block and made them despawn on outpost death
legendary pickkup message fix (FINALLY FIXED NOW )
quick modification to outposts, and fixed the legendary announcements being weird
updated clans version
quikc change
outpost changes, and some other things
lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".
fixes (?)
lots of changes that i can't remember at this point
Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players.
player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
a couple more prettificatons to pvp timer messages.
one more quick message change/fix
qa changes to pvp safety
...
2016-01-08 00:35:15 -06:00
fff6d8e03f
added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
2016-01-07 19:36:52 +00:00
d88b14d9d6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-07 09:35:07 +00:00
de6f6cf5f0
Add a IsLive check in Spleef
2016-01-07 08:49:26 +13:00
db2cddc443
Fixing Join/Quit messages
2016-01-05 19:10:40 +01:00
10eb65a8d6
Merge pull request #114 in MIN/mineplex from bugfix/disguise-command to develop
...
* commit 'dd6d7b1b96947a400911bc5fa310039ab147c159':
updating denial message
Love you Sarah <3
Fixing Disguise File
update /Disguise for Hub as well
updating /disguise
2016-01-04 15:58:43 -06:00
652084d071
Merge pull request #115 in MIN/mineplex from bugfix/thanos to develop
...
* commit '3770211e66b41e16440609a0a79b3999b9b6cca7':
Turf Wars: Include Teddy's border fix.
Turf Wars: Undo bracket formatting.
Turf Wars: Apply knockback on all players when there are only two in the match.
Turf Wars: Add comment on block physics event.
Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
2016-01-04 15:56:32 -06:00
3770211e66
Turf Wars: Include Teddy's border fix.
2016-01-04 22:58:11 +02:00
982e684a45
Turf Wars: Undo bracket formatting.
2016-01-04 21:42:58 +02:00
47c78bcba1
Turf Wars: Apply knockback on all players when there are only two in the match.
2016-01-04 17:19:40 +02:00
f6ce98f65b
Turf Wars: Add comment on block physics event.
2016-01-02 23:33:08 +02:00
03c6395a30
Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
2016-01-02 23:30:27 +02:00
2b365e4afd
- Fixed blacklisting to stop join spam
2016-01-02 14:35:05 -05:00
dd6d7b1b96
updating denial message
2016-01-02 16:45:15 +01:00
7e1b0b9110
Love you Sarah <3
2016-01-02 03:19:39 +01:00
8ef1a524c1
updating /disguise
2015-12-31 12:01:24 +01:00
efbd1c52d2
Merge remote-tracking branch 'origin/master' into feature/typewars-antimacrorekter
2015-12-31 03:01:23 -05:00
5ff9d1985b
Monitoring for josh + the mods
2015-12-31 03:00:40 -05:00
a4853e667c
- Gameplay edits and disabling broadcaster code
2015-12-30 03:23:21 -05:00
5841ab1101
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-12-29 23:47:00 +00:00
f1c7424939
Fixing hotbar
2015-12-29 15:19:09 +00:00
7ad12d0a6b
Show Host Rank in private servers
2015-12-29 00:50:20 -06:00
8a8d5b088b
Switch to 7x7 builds.
2015-12-28 16:48:03 -05:00
3d9a252868
Added auto pickup and fixed some stuff.
2015-12-27 15:26:43 -05:00
162b3eb33f
Stopped a bunch of block events.
2015-12-27 14:34:24 -05:00
1066becd68
push
2015-12-26 20:21:46 +00:00
c680d91b56
Nerf TypeWars gems (again)
2015-12-25 03:12:04 -06:00
cc421c1435
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-12-24 21:19:30 +00:00
41f56e9853
Lots of typo fixes and such
2015-12-24 11:13:54 -08:00
b356bce177
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-24 11:09:08 -08:00
2d974a781f
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-12-24 14:06:59 +13:00
b0f8edb0f9
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-23 18:25:52 -05:00
aa50c4762f
fixes (?)
2015-12-23 18:55:44 +00:00
1d4a5e5804
Clean up imports, set resource pack on clans.
2015-12-24 07:47:05 +13:00
79dea726aa
Added check for falling from map.
2015-12-23 10:59:12 +00:00
c48df36459
Canvas reset with starting picture.
2015-12-23 10:26:14 +00:00
ad1d444af8
Kit changes and new words.
2015-12-23 09:52:52 +00:00
08b5e7b4db
Working loadouts.
2015-12-23 09:21:43 +00:00
592fcbd282
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-22 10:55:11 -08:00
0322ae1217
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-12-22 00:02:21 -05:00
b255c58653
Merge branches 'develop' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-21 21:56:08 +00:00
c63014b51f
Type-Wars merge
2015-12-21 12:49:10 -05:00
082b5e156c
fixing Kit NPEs
2015-12-21 17:48:17 +01:00
ff5761cc1d
Fixing ending Stats.
2015-12-21 17:44:15 +01:00
590da2128c
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-12-21 17:43:51 +01:00
5469289d82
Wrong iterator!
2015-12-21 06:57:56 -05:00
99285b2ac8
Merge remote-tracking branch 'remotes/origin/type-wars' into develop
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-12-21 03:50:55 -05:00
816da0f633
Fixing Gems
2015-12-20 12:00:32 +01:00
fe658b30a1
Grammatical errors hath been fixed!
2015-12-19 15:03:42 -08:00
f1188529f2
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 13:09:26 +01:00
c56cd0d56e
adjusting some timings
2015-12-19 13:08:53 +01:00
35966d88cf
Fixing Tutorial Minion
2015-12-19 13:05:39 +01:00
7327d9463f
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 13:00:49 +01:00
8a54388480
fixing last commit
2015-12-19 13:00:12 +01:00
32a0dd6668
adding Tutorial notification
2015-12-19 12:59:37 +01:00
152e759c10
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 12:56:05 +01:00
7cb002ca86
Adding Tutorial notification
2015-12-19 12:55:28 +01:00
f8bffc9f88
nuke delay and Stats
2015-12-19 12:45:06 +01:00
c0ab31fdac
Finished up fixes.
2015-12-19 00:19:50 -05:00
66c9fa122c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2015-12-18 21:33:59 -05:00
09528a9262
- Initial broadcast stuff
2015-12-18 21:33:40 -05:00
a5c18f4677
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-18 20:05:03 -05:00
b3afa0094e
Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes
2015-12-19 00:59:15 +01:00
dab2416ccd
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 00:49:16 +01:00
6c5e3d7509
Fixing visibility.
2015-12-19 00:48:42 +01:00
f57304764c
Added a hotbar layout editor
2015-12-18 15:16:00 +00:00
298ea1e5e6
Merge pull request #101 in MIN/mineplex from update-paintball to develop
...
* commit 'd561915fd32885036b55cc6a05899934a544e131':
FORMATTING CHANG EI'M GOING TO CRY UGH
DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D
Changed dns api key to new key. Prevent server monitor redis calls to cause restarts. Added winter chests to customer support.
Epic chnage that saved the day omg
Die player cache
Quick changes to improve things.
Uncommented bouncy balls
Final tweaks to random armorstand
Quick thing before merge
Worked on double.
Switching branches
Formatting
Reformatted
Fixed paintball to the max. :>>
Class
Switching branches c:
Sniper work
Work. Deemed unsuitable due to an issue with the paintballs flying wide.
Added a sniper kit! :D
2015-12-17 23:32:22 -06:00
f80648bfbc
Update DBPool to load from file
2015-12-18 00:32:07 -05:00
d561915fd3
FORMATTING CHANG EI'M GOING TO CRY UGH
2015-12-17 23:16:57 -05:00
2bf734a15c
DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D
2015-12-17 23:08:07 -05:00
2c09fd969b
Attempt at fixing spectator page
2015-12-17 22:24:44 -05:00
806b656dcf
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-17 21:56:01 -05:00
53f9a051c5
Fix spectator page sorting team list
2015-12-17 21:52:34 -05:00
5f506e3810
Moved team generation.
2015-12-17 21:49:15 -05:00
e7243d4b9c
Re-add getArcadePlayer(Player player)
2015-12-17 22:19:45 +00:00
2ac28c4fd5
Merge branches 'develop' and 'feature/player-data' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-12-17 21:44:31 +00:00
5c045bfce4
Changes to core client manager, and finishing custom data!
2015-12-17 21:27:44 +00:00
7f188072ad
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2015-12-18 10:03:41 +13:00
66372c397b
First version of ResourcePackManager that handles all resource packs globally
2015-12-18 10:03:03 +13:00
7d9b97180d
Testing ArcadePlayer implementation
2015-12-17 01:48:55 +00:00
d28c2be1c3
Epic chnage that saved the day omg
2015-12-16 20:26:04 -05:00
ee202bc7f5
Add MineplexPlayer -> ArcadePlayer
2015-12-16 22:32:34 +00:00
4077aa808f
Add to Arcade and Hub
2015-12-16 22:01:51 +00:00
4e9e0243cd
Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
2015-12-16 18:16:08 +01:00
Virizion
Ben
git
Shaun Bennett
Keir Nellyer
William Burns
Keir Nellyer
AlexTheCoder
md_5
xGamingDudex
Cheese
Mysticate
teddy
Sarah
fooify
Thanos paravantis