a27fb90c2a
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-11 02:21:03 +00:00
0e276474c5
fixerroooniissssss
2016-03-11 02:20:18 +00:00
01ba099d74
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-11 01:52:38 +00:00
c9eb2c9559
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-11 01:52:31 +00:00
57c65cf5ff
some changes and vanish fixes maybe?
2016-03-11 01:47:14 +00:00
a568db6d90
remove eclipse file
2016-03-11 00:43:30 +00:00
bcfe4a42c0
changerooonis
2016-03-11 00:41:28 +00:00
33d978c6d6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-10 22:12:41 +00:00
20ade492a8
tnt generator changes
2016-03-10 22:09:45 +00:00
76782fd420
Fix issues
2016-03-10 15:07:22 -06:00
557b0bf978
Fix Wither disguise
2016-03-11 01:55:49 +13:00
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
befb27d3db
Finalized Vanish system
2016-03-09 01:45:17 +00:00
b1c8158e2f
Added @a argument to /shard, /gem and /giveitem PC-13
2016-03-08 19:52:31 -05:00
abdf61de0a
*more fixes*
2016-03-08 21:02:25 +00:00
af8f0fff16
vanish error fixes
2016-03-08 21:00:19 +00:00
69091c079f
Merge branch 'feature/incognito' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 20:58:11 +00:00
9b65926d42
Fix rank monthly rewards description
2016-03-08 13:26:26 -06:00
1f09616784
chat packet listener
2016-03-08 18:28:54 +00:00
99c2fefed2
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-08 12:27:45 -06:00
86ef10456c
packet hnadler beginning, switching to clans to fix errors
2016-03-08 18:10:57 +00:00
f24e196efd
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-08 18:07:57 +00:00
036565abb7
more
2016-03-08 17:44:15 +00:00
0ff434cf91
progress
2016-03-08 16:49:32 +00:00
0f752fb7e3
Fix custom names in 1.9
2016-03-08 16:11:12 +13:00
280d03daa7
Fix names
2016-03-08 09:52:30 +13:00
496983ee04
Untested bugfixes
2016-03-07 22:29:14 +13:00
ae2da31544
Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-05 23:14:32 +00:00
d92f817efc
fixed some teleportation bugs and a bit of cleanup
2016-03-05 22:50:06 +00: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
73d8870daf
nether work (forgot to commit days ago oops)
2016-03-02 19:42:53 +00:00
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06: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
2956b18821
some hologram work
2016-02-23 18:45:04 +00:00
70260754ff
Reset these files to their previous state (IDE added tabs).
2016-02-23 00:26:10 +00:00
c923745f5f
Add required import.
2016-02-23 00:25:37 +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
33b3d121b3
Merge branch 'develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatLovestruck.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSecretPackage.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHeart.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java
2016-02-20 15:30:26 +01: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
82d51a896f
Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS
2016-02-19 19:54:06 -06:00
67c355bf65
remove more eclipse files
2016-02-19 07:22:54 +00:00
441cf702c7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-19 07:22:09 +00:00
d5583b93f2
remove eclipse files
2016-02-19 07:14:13 +00:00
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
eab992e621
Delete SimpleStats
2016-02-18 23:01:23 -06:00
6d81e43b30
Don't print db config to System.out
2016-02-19 15:30:30 +11:00
8507bb1bd8
all progress over this week
2016-02-18 21:29:42 +00: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
9e2840b3b5
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-16 21:28:07 -05:00
10e89a228e
Added some extra checks to Blood
...
Should resolve possible NPE and Material.AIR issues along
2016-02-16 18:48:27 +01:00
8893db60d7
Fix highly annoying exception in Reindeer mount.
2016-02-16 12:46:39 +11: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
95c22a59fd
Use DNS for chat filter
2016-02-15 16:30:57 -06:00
15ed2570e2
Valentines final changes, Change Gift Giver achievement
2016-02-15 20:43:46 -06:00
85b8937801
Hats, supposed to go in the previous one
2016-02-15 16:39:04 +01:00
7d8ffa1311
Small stuff
2016-02-15 16:38:18 +01:00
e25accfba4
outpost saving and loadi9ng
2016-02-15 11:24:29 +00: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
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
e6eb43ada8
PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK
2016-02-12 19:58:40 +00:00
0d19a8017f
Update Featured arcade game, various bug fixes
2016-02-12 06:51:30 -06:00
1e596a6969
Valentines rewards
2016-02-12 04:54:09 -06:00
66aa89b5e0
Fix sheep look bug, valentines gift effects, valentines achievements
2016-02-12 04:32:26 -06:00
dfd61833b7
Valentines changes
2016-02-12 03:03:47 -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
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
57638ff684
More work on valentines
2016-02-09 16:26:17 -06:00
a868b8b2b8
Valentines gifts
2016-02-08 22:26:33 -06:00
c4da8ef636
Cosmetic Update
...
+ Set Storm
+ Set Shadow
+ Set Music
+ Set Emerald
+ Set Blood
+ Set Enchant
+ Particle Ying and Yang
+ Particle Wings Angel
+ Particle Wings Infernal
+ Particle Wings Pixie
+ Shape Utils
* Particle Party Time
* Particle Heart
* Double Jump Firecracker
2016-02-08 00:21:47 +01:00
008fc587b0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-07 15:33:37 -05:00
c059425e9d
Remove GiveawayManager (not used anymore)
2016-02-07 13:18:29 -06:00
f502c2a693
Fix filtermessage sync calls
2016-02-07 12:15:08 -06:00
a8ff714ee4
Added love potion and hub sheep thing.
2016-02-07 10:19:40 -05:00
c1393697f8
Started on Love Potion system. Switching branches.
2016-02-06 14:08:17 -05:00
b414642990
Varius tweaks and changes.
2016-02-04 21:58:55 -05:00
a76e570b8a
Moar fixes
2016-02-04 21:43:17 -05:00
e94222a68e
Added sheep mount to index.
2016-02-04 13:13:22 -05: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
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
a8f9c91534
ReportServer: update package name and configure Maven to generate a META-INF file with the main class name included.
2016-02-02 22:28:18 +00:00
86917fb146
Fix treasure stair orientation
2016-02-02 05:50:03 -05:00
af27944a39
add a shard queue to DonationManager, use that for TreasureShardReward
2016-02-02 05:34:33 -05:00
1a9c36d0a1
Merge pull request #153 in MIN/mineplex from master to bugfix/duplicates
...
* commit '3a945f190dca9f558cbcb6052b3eaa2816d112b3': (308 commits)
Commons codec is not included in BungeeCord.
Pooling with later jedis versions doesn't work on Bungee.
Gitignore redundant Eclipse files.
Add Eclipse magic.
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
Prep for update
Update CB.jar
Prevent hearts changing colors in UHC tab.
Fixed ForTheKing achievement.
...
2016-02-01 15:49:34 -06: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
cc857da88e
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
2016-01-31 16:27:14 +00:00
002be01ef1
MAVEN TEST COMMIT
2016-01-31 16:21:04 +00:00
c23855bd65
Merge with develop
2016-01-30 02:44:24 -05:00
7ed0ab442f
Emergency patch to slow down redis player count updates.
2016-01-30 12:36:20 +11: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
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
50fc1f5a10
merge with develop
2016-01-29 03:44:04 -05:00
a1f9f41910
Merge remote-tracking branch 'origin/develop' into develop
2016-01-29 03:37:03 -05:00
2e2a08bea8
Merge pull request #142 in MIN/mineplex from bugfix/coal-particles to develop
...
* commit 'd1d3382ec065bb7c508044d53124266fda142c00':
Prevented Coal particles from showing during the game
2016-01-29 02:33:57 -06:00
d1d3382ec0
Prevented Coal particles from showing during the game
2016-01-28 22:44:33 -05:00
60ee5d1da0
Move disable custom inside of IsActive check
2016-01-28 22:33:48 -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
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
a0cc0b7ec9
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java
2016-01-28 13:28:00 +00:00
b5f04011e5
fixed chatslow not working + filter not working for players not in clan
2016-01-28 13:24:30 +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
a1eec79b3b
Make dependable require 50 perfect builds instead of 10.
2016-01-25 16:43:43 -05:00
616be8aea7
Fix messages, fix /stats
2016-01-25 03:59:37 -06:00
2dcc356aab
Make achievement category classics
2016-01-25 04:33:25 -05:00
33845cbc72
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-25 08:48:13 +00:00
5b32911a42
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-25 08:46:26 +00:00
0252436990
cannons updates
2016-01-24 20:56:47 +00:00
650d586e0f
Add perfect build count to stats
2016-01-23 02:49:08 -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
ddc86f0897
Add Speediest Builderizer achievement
2016-01-22 19:13:23 -05:00
5c83f5c1e5
Renamed to Speed Builders from Speed Builder.
2016-01-22 00:20:58 -05: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
877ec4710e
Removing duplicate NCP hooks
2016-01-21 17:22:10 -05:00
3803a3d82e
Add player heads back to friends lsit
2016-01-21 17:19:51 -05:00
0fd5540de6
Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop
...
* commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16':
Give item fix for offline players
2016-01-21 15:44:34 -06:00
a41816ca22
Include version.properties in Mineplex.Core
2016-01-21 16:37:35 -05:00
a0f39bf36e
Merge remote-tracking branch 'origin/develop' into develop
2016-01-21 16:31:52 -05:00
64ec092d09
Rename coin command to shard command
2016-01-21 09:10:39 -05: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
359655f417
Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop
...
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
Fix some misc suspicious calls to Collection methods.
2016-01-20 12:23:55 -06:00
0a5791a92f
Go back to compile scope, need to talk to md_5 about this
2016-01-20 13:13:20 -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
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
77d9f7cf32
Merge branch 'master' into develop
2016-01-20 10:12:20 -05:00
376f719c26
fixes important bug, fixed a scary typo!
2016-01-19 18:52:54 -08:00
bb4091c7a6
Use Maven for Compilation
2016-01-20 11:20:58 +11:00
2b6074a210
Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command'
2016-01-17 22:46:56 -05:00
4927bb8c0b
Fix some misc suspicious calls to Collection methods.
2016-01-17 20:20:48 +11:00
4a5d6b5f2a
Mysticates OCD....
2016-01-17 02:48:15 +01:00
6e6f46671b
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilColor.java
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
2016-01-16 14:46:47 +01:00
8ee485e44c
Progress
2016-01-16 14:43:14 +01:00
404e049c31
Give item fix for offline players
2016-01-14 08:06:27 -05: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
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
f3003e795e
Implemented Outpost MK III
2016-01-12 18:59:01 +00:00
d3452772ed
outposts work (grr git is weird trying to switch over to clans/beta)
2016-01-12 07:02:03 +00:00
3693a2b2c5
Merge pull request #122 in MIN/mineplex from bugfix/thanos to develop
...
* commit 'ed439569453dc248623834af6fb553341779e46c':
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
Remove unused imports.
Prevent players from stacking others with a menu inventory opened.
Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
2016-01-11 16:26:09 -06:00
025b87c806
Merge pull request #121 in MIN/mineplex from feature/mutedsign to develop
...
* commit 'fa7eef504597011da14093fb76a8e088524eafd0':
Muted players can't write on signs.
2016-01-11 16:23:34 -06:00
1c49e3a111
Make chat log clickable, only close report instruction line suggests command.
2016-01-10 21:28:57 +00:00
fa7eef5045
Muted players can't write on signs.
2016-01-10 13:13:38 -05:00
ed43956945
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
2016-01-10 16:37:51 +02:00
83e5c7399e
Fix YOUTUBE_SMALL preferences
2016-01-09 18:41:19 -05:00
cd3037e7e5
Fix treasure purchases
2016-01-09 18:37:24 -05:00
bd865c7e64
Fix command permissions.
2016-01-09 23:12:08 +00:00
5f362a878a
Run some Redis functions async (as it sometimes blocks).
2016-01-09 22:21:15 +00:00
8b3bc7ca18
Fix timezone, correct url prefix and remove old debug code.
2016-01-09 21:51:54 +00:00
942460b471
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-09 13:05:44 -08:00
f8e8669b5c
Added Party and Cupid set (arrow, jump, death, particle + full set
...
effect)
2016-01-09 14:07:40 +01:00
ba3e7cb197
Merge branch 'master' into bugfix/thanos
2016-01-09 12:23:54 +02: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
43fb04b482
Import clean up
2016-01-08 13:46:57 +00:00
78405749a4
Changed TreasureShard rewarding, removed Queue
2016-01-08 13:46:39 +00:00
a75e2c15b8
Merge remote-tracking branch 'origin/develop' into develop
2016-01-08 06:35:37 -05:00
15109707f3
Merge pull request #119 in MIN/mineplex from clans/alpha to develop
...
* commit '025615d080b8b925f319a2f7707d2c3fa4755a88':
Clans Alpha 0.18b fixes
2016-01-08 05:34:35 -06:00
025615d080
Clans Alpha 0.18b fixes
2016-01-08 11:24:36 +00:00
0a56a838d2
Fix ClansLoginManager, Remove pointless code in CoreClientManager
2016-01-08 05:45:49 -05:00
1d2f61db8c
Disable purchasing Christmas Treasure
2016-01-08 03:15:05 -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
6bf0970dbe
Unused import removed
2016-01-07 19:52:04 +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
52c4a55180
outpost changes, and some other things
2016-01-06 22:32:36 +00:00
c920d4efa1
Modify MapText to actually work, modify UtilText to save the images of characters
2016-01-07 04:48:44 +13:00
99f0404fff
Queue speed up
2016-01-05 21:05:02 +00:00
e2824dd0e0
Debugs removed
2016-01-05 21:01:51 +00:00
d4fd6a6bf7
Treasure not giving Shards when dupes occur, fixed.
2016-01-05 21:00:43 +00:00
101caf12ff
Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
2016-01-05 20:48:28 +02:00
db2cddc443
Fixing Join/Quit messages
2016-01-05 19:10:40 +01:00
d819671d16
Queue implemented for duplicate shard reward
2016-01-05 16:21:34 +00:00
a73309fc11
Merge remote-tracking branch 'origin/develop' into develop
2016-01-04 18:14:10 -05:00
f749300d48
Fix team stats not displaying properly
2016-01-04 18:13:54 -05: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
ed81411373
Fix carl bonus messages
2016-01-04 15:58:27 -05:00
7d16aeb84d
Cache private messages for chatsnap reports.
2016-01-04 18:04:47 +00:00
80c389faf4
Make private message event implement cancellable.
2016-01-04 17:59:16 +00:00
b47665e115
lots of work on outposts,
...
fixed gold dupe glitch,
fixed clans ban gui title being "Customize New Gear".
2016-01-02 14:02:50 +00:00
7e1b0b9110
Love you Sarah <3
2016-01-02 03:19:39 +01:00
8232d11cd1
Remove in game notifications, change sale message
2015-12-31 15:07:26 -06:00
456b0dbeb7
Merge pull request #110 in MIN/mineplex from feature/MasterBuilder-Unban to develop
...
* commit 'f83016e0074ce810f727276a0feb127ecd69098f':
Also really quickly fixed the Invisibility in lobby bug (hopefully)
Removed a weird query :/
Finished up the Unban feature...
Added a feature to unban clients across the network But there still a bug when you type a username of a none registered member. Will fix ASAP - likely after Mineware
2015-12-31 11:27:08 -06:00
3496abe227
Java 8 goodness.
2015-12-30 21:41:24 +00:00
92c4450eea
Update the dual version
2015-12-30 21:12:11 +13:00
2716039d07
Small cleanup.
2015-12-29 23:49:57 +00: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
dffd7d95ec
Don't include sender in recipients.
2015-12-29 23:35:54 +00:00
55cdf4148a
Merge branch 'develop'
2015-12-29 03:21:03 -06:00
7104f1363a
Give YT rank access to extra preferences
2015-12-29 00:34:18 -06:00
278932b9b8
Use CST timezone.
2015-12-29 05:23:18 +00:00
912b4aa4c8
Get Redis connection data from redis-servers.dat file.
2015-12-29 05:19:56 +00: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
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
369687b5dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
...
Conflicts:
Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
2015-12-23 18:31:51 +00:00
ff24ebc9f4
lots of changes that i can't remember at this point
2015-12-23 18:22:20 +00:00
8c399f03da
Removed a weird query :/
...
Status: Finished
2015-12-22 21:36:19 +01:00
9336eb19fa
Finished up the Unban feature...
2015-12-22 21:31:57 +01:00
0ac2158988
i before e!
2015-12-22 11:02:57 -08:00
255dd0bdb3
fixed cosmetic menu item dropping bug
2015-12-22 11:02:37 -08:00
592fcbd282
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-22 10:55:11 -08:00
a8d9956846
more grammatical errors hast been fixed
2015-12-22 10:35:20 -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
2ccd7a5de0
Fix Type Wars stat icon
2015-12-21 13:20:04 -05:00
c63014b51f
Type-Wars merge
2015-12-21 12:49:10 -05:00
a5436d63c0
Updating Holiday Achievements
2015-12-21 18:45:26 +01:00
7c66bdbbde
Updating Stats GUI
2015-12-21 18:25:44 +01:00
010b1b0a5d
Achievements....
2015-12-21 18:08:11 +01:00
6e3274ff2f
changing Category
2015-12-21 18:06:00 +01:00
f15c318e5c
adding PM message.
2015-12-21 18:02:25 +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
1726aa2530
Added a feature to unban clients across the network
...
But there still a bug when you type a username of a none registered member.
Will fix ASAP - likely after Mineware
2015-12-21 12:58:19 +01:00
fae2a5d2bf
Update game display
2015-12-21 04:40:30 -05:00
a235103066
Merge pull request #106 in MIN/mineplex from update-menu to develop
...
* commit 'f4050fb1ff54dbe4639b0258eff53360d800d0b9':
Adjust GUI, fix beta button
Yo shaun debug this m8 ty
2015-12-21 03:36:46 -06: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
0f5be6444b
Yo shaun debug this m8 ty
2015-12-21 02:23:59 -05:00
fe658b30a1
Grammatical errors hath been fixed!
2015-12-19 15:03:42 -08: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
a5c18f4677
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-18 20:05:03 -05:00
c2e88c2794
Merge branch 'develop' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data
2015-12-18 18:16:32 +00:00
13cfc0e12a
Updated to a better check
2015-12-18 18:16:20 +00:00
1840572c49
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.
2015-12-18 11:13:38 +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
2bf734a15c
DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D
2015-12-17 23:08:07 -05:00
806b656dcf
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-17 21:56:01 -05:00
7621fe793d
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-17 21:50:32 -05:00
066d0a861f
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-17 21:00:15 -05:00
c2fb6e6c15
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-17 18:34:25 -05:00
2953fe395f
Changed dns api key to new key.
...
Prevent server monitor redis calls to cause restarts.
Added winter chests to customer support.
2015-12-17 18:33:49 -05:00
3e8c3cb928
Changed to setData in PlayerCustomData
2015-12-17 22:16:05 +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
ee202bc7f5
Add MineplexPlayer -> ArcadePlayer
2015-12-16 22:32:34 +00:00
370c59ce75
Added custom data
2015-12-16 21:52:41 +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
db5327d2e4
Online reports can now be updated without re-sending all the data (ie we don't want to update all the chat messages when a member of staff handles a report).
...
Misc. changes and fixes.
2015-12-16 15:51:01 +00:00
cd18d2a94f
ReportServer fixes and improvements.
2015-12-16 15:05:00 +00:00
baf0f254bb
Custom data, waiting for JLO
2015-12-16 14:41:57 +00:00
6f82f8349d
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/.idea/modules.xml
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
2015-12-16 14:07:56 +00:00
7fa1963268
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-15 23:06:13 -05:00
d16dd4a9d2
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-15 19:35:55 -05:00
b5149d2da7
Implemented williams frontend design.
2015-12-16 00:22:55 +00:00
b36bf37197
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-15 19:22:38 -05:00
6d9bcb8e66
Reworked serialization and store more data in json files for later parsing.
...
Internally store UUIDs for reports and convert them as needed for display to user.
Many other misc. changes and refactorings.
2015-12-15 21:30:45 +00:00
211e440e67
Merge remote-tracking branch 'remotes/origin/master' into develop
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
2015-12-15 15:00:14 -05:00
aef704d972
Slight winter reward rarity changes
2015-12-15 14:58:09 -05:00
5f14d6675f
Fix shard values
2015-12-15 14:56:19 -05:00
07f610d4bd
More Fixes
2015-12-15 14:45:12 -05:00
607c164753
Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop
2015-12-15 13:55:01 -05:00
b9a688c4e7
Update monthly bonuses
2015-12-15 13:07:49 -05:00
e3e757da8a
Fix mounts owned count
2015-12-15 13:06:11 -05:00
3edba0fac6
Fix Grinch Hat
2015-12-15 12:28:06 -05:00
f2107b7b79
Merge remote-tracking branch 'origin/develop' into develop
2015-12-15 12:07:40 -05:00
2216fdc52c
Dont disable new gadgets in games
2015-12-15 12:07:34 -05:00
c63bac6433
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-15 11:42:16 +00:00
47ad563596
Spawn nametags far far away from players
2015-12-15 22:46:30 +13:00
871c97f7af
changed chest %'s
2015-12-15 09:25:44 +11:00
9137fcfe40
loads of changes (pvp timer, unsafe stuff)
2015-12-14 12:39:00 +00:00
73c84c530e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2015-12-14 06:40:16 -05:00
0f38c7b287
increased minimum coal
2015-12-14 22:12:50 +11:00
951cd65903
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 22:05:22 +11:00
045bc760c2
increassed cooldown, people getting trapped perm
2015-12-14 22:05:08 +11:00
809ff649be
lowered rarities a bit
2015-12-14 22:03:09 +11:00
7181a26e58
Remove pointless equals()
2015-12-14 05:56:39 -05:00
9e72e5adf1
nicer text
2015-12-14 21:43:11 +11:00
daa9f165b1
removed coins from gadgets
2015-12-14 21:41:47 +11:00
0ecd5a05f5
fixed hat ownership
...
reduced coal cost
2015-12-14 21:32:06 +11:00
00de6880ba
fixed wrong types
2015-12-14 21:25:30 +11:00
342e9f2345
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 20:53:49 +11:00
1189535748
icon fixes
2015-12-14 20:53:34 +11:00
816c057eb3
Notify server about opening chest
2015-12-14 04:49:44 -05:00
daf1d29ce0
Fix Carl
2015-12-14 04:44:11 -05:00
50bf97ae4a
Fancy treasure changes
2015-12-14 04:19:15 -05:00
670eaa1954
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 19:16:03 +11:00
e4fd97467f
More treasure changes
2015-12-14 03:14:52 -05:00
288c20fc74
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 19:13:05 +11:00
9e35399d1d
rarities tweaked + shards
2015-12-14 19:09:55 +11:00
db9db558a0
Update GUI slots
2015-12-14 02:56:07 -05:00
4afca01ad0
Treasures!
2015-12-14 02:49:51 -05:00
c508b5ea96
chest visuals
2015-12-14 18:13:19 +11:00
063c87c4fe
Merge remote-tracking branch 'origin/master'
2015-12-14 00:29:11 -05:00
cdbcae7e3e
Cosmetic Menu Update
2015-12-14 00:28:28 -05:00
048a9a81b8
gadget ammo should no logner be purchasable
2015-12-14 16:20:39 +11:00
09643d3e61
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-14 00:08:32 -05:00
7f9e5c4ec9
more coal
2015-12-14 16:06:49 +11:00
f6f04fe256
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 16:04:05 +11:00
55fffdad59
fixed some colors
2015-12-14 16:03:51 +11:00
b3b41e453b
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-14 00:01:41 -05:00
e8b0e5dd8e
Fix IntellIJ Files
2015-12-13 23:51:47 -05:00
Ben
Shaun Bennett
git
Virizion
Keir Nellyer
xGamingDudex
AlexTheCoder
md_5
Cheese
Mysticate
fooify
Sarah
Thanos paravantis
Teddy
William Burns
Jonathan Williams