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
311d42db30
Use Garbo's description changes
2016-01-22 19:48:06 -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
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
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
77d9f7cf32
Merge branch 'master' into develop
2016-01-20 10:12:20 -05:00
bb4091c7a6
Use Maven for Compilation
2016-01-20 11:20:58 +11:00
044d2bac83
Fix some Invisibility preference bugs
2016-01-17 22:55:04 -05: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
4927bb8c0b
Fix some misc suspicious calls to Collection methods.
2016-01-17 20:20:48 +11:00
410bc1c74b
not being able to disguise as banned/muted players
2016-01-15 19:12:50 +01: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
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
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
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
46695f8449
Fix hub fly for YOUTUBE_SMALL
2016-01-09 18:44:32 -05:00
8193b5121b
Dont allow /disguise for YOUTUBE_SMALL
2016-01-09 18:39:47 -05:00
5f362a878a
Run some Redis functions async (as it sometimes blocks).
2016-01-09 22:21:15 +00:00
ce1bac8037
Remove unused imports.
2016-01-09 17:03:14 +02:00
62e1fb3688
Prevent players from stacking others with a menu inventory opened.
2016-01-09 17:01:57 +02:00
0f587ba5d9
fixing "Kicked for flying again" again...
2016-01-09 12:07:57 +01:00
ba3e7cb197
Merge branch 'master' into bugfix/thanos
2016-01-09 12:23:54 +02: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
5482d1dc40
Fixing "kicked for Flying"
2016-01-08 12:17:28 +01:00
db7d814e02
Disable hub music
2016-01-08 01:42:05 -05:00
19bb44cb9a
Disable HolidayManager and HolidayGiftManager
2016-01-08 01:41:02 -05:00
9c3b07123f
Revert to normal HubType
2016-01-08 01:39:54 -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
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
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
962efe4a61
Fix not being able to join games through portals
2016-01-04 16:41:07 -05:00
c50fb52a88
Disable New Years Countdown
2016-01-04 14:21:21 -05:00
c739ecc26d
Fix forcefield for YOUTUBE_SMALL
2016-01-04 14:20:39 -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
a06a0060aa
Fixing Disguise File
2016-01-02 01:53:19 +01:00
a30c2b0d75
update /Disguise for Hub as well
2016-01-02 00:53:56 +01:00
2e017fa5ca
Fix redis command
2015-12-31 16:11:51 -06:00
8232d11cd1
Remove in game notifications, change sale message
2015-12-31 15:07:26 -06:00
74eb04e5b4
Merge pull request #112 in MIN/mineplex from feature/new-year to develop
...
* commit '6b3a5416643389a7bcac8df93f40f492452971e5':
Accurate timings
Small edits
Flame
Made it activate in all lobbies via command.
Added a new years countdown to the hub.
2015-12-31 14:51:49 -06:00
6b3a541664
Accurate timings
2015-12-31 18:53:57 +00: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
637baed830
Small edits
2015-12-31 01:24:58 +00:00
874695cdf6
Flame
2015-12-31 00:50:53 +00:00
a64dc6a8d4
Made it activate in all lobbies via command.
2015-12-31 00:46:31 +00:00
1b40cece80
Added a new years countdown to the hub.
2015-12-30 20:04:01 +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
7ad12d0a6b
Show Host Rank in private servers
2015-12-29 00:50:20 -06:00
25d36b546a
Remove unnecessary files
2015-12-25 01:53:00 -06:00
d08cfa0c4c
Holiday Gifts
2015-12-25 01:51:36 -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
f83016e007
Also really quickly fixed the Invisibility in lobby bug (hopefully)
2015-12-23 00:39:16 +01:00
f4050fb1ff
Adjust GUI, fix beta button
2015-12-21 04:35:57 -05:00
0f5be6444b
Yo shaun debug this m8 ty
2015-12-21 02:23:59 -05:00
f80648bfbc
Update DBPool to load from file
2015-12-18 00:32:07 -05: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
66372c397b
First version of ResourcePackManager that handles all resource packs globally
2015-12-18 10:03:03 +13:00
4077aa808f
Add to Arcade and Hub
2015-12-16 22:01:51 +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
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
5be91de006
Merge master
2015-12-13 23:40:18 -05:00
0e9e8c155f
Quick fix that I don't think i caused.
2015-12-13 19:11:06 -05:00
0c383f8bf4
Remove bad message
2015-12-13 18:58:03 -05:00
90145bf8e7
Merge branch 'master' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
update-xmaschaos
Conflicts:
Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
2015-12-13 18:57:35 -05:00
35ab40727b
XMAS UPDATE OMG :O
2015-12-13 18:55:21 -05:00
e7213fdb7e
Remove project specific settings
2015-12-13 16:41:37 +13:00
9058428484
Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage
2015-12-13 16:40:46 +13:00
c470ad880d
Merge pull request #77 in MIN/mineplex from foo to master
...
* commit 'd7497ec09881047d7461630fac2c3b51bf37a06c': (23 commits)
Fixed Micro Battle icon not appearing in stats menu
Gravity's icon changed to ENDER_PORTAL_FRAME
world's smallest bugfix - admin->co-host
Fixed advertisement being able to be bypassed by spec and instant join
fixed naming pets non-alphanumeric characters
changed reference to premium ranks
removed important debug thing
fixed ssm enderman always facing south on teleport
fixed bacon blast exloding blocks
fixed shield smash and fissure affecting spectators
fixed slab issue with Assassin's Flash
Re-fixed Barbarian bug
Fixed SG Barbarian bug
SSM bug fix: magma cube flame dash doesn't make player invisible
fixed several smash bugs and one global issue
Slightly bumped Monster Maze jump time value
fixed bridge bug "Death Bomber counts suicides as well"
typo fix in legendary aura description
Update achievement kit reference text
Fixed tnt bug (SG)
...
2015-12-11 18:57:18 -06:00
6d1e4b6cab
Merge remote-tracking branch 'origin/master' into project-cosmetics
2015-12-11 18:09:09 +01:00
d7f39bdfd8
costume sets
2015-12-11 20:59:55 +11:00
95a81ef368
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
2015-12-11 01:26:20 -05:00
66011cde8c
fixed player count
2015-12-11 17:25:23 +11:00
222173ab17
Improved and implemented GameProfile caching.
2015-12-11 01:24:59 -05:00
05a80b23a1
converting gadget text. (kill me now)
2015-12-11 16:07:02 +11:00
d6aed5dff7
More work
2015-12-10 21:32:10 -05:00
4d8b8bd58b
Fix errors, update cosmetic menu
2015-12-10 19:27:32 -05:00
a9e6224eca
Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-10 19:21:33 -05:00
5d96ceb41e
Let owner+ disguise as staff - easy way to check a player's rank
2015-12-10 19:20:11 -05:00
72a8aaf556
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-10 19:18:49 -05:00
5b0909012d
Renamed GadgetActivateEvent to GadgetEnable event
...
Some files didn't make it to prev commit
2015-12-11 01:07:47 +01:00
851b613d2e
Now playing fix
2015-12-10 17:04:15 -05:00
8459cf0f95
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-09 18:13:26 +00:00
2e49611035
LinkedHashMaps, Buttons
2015-12-08 17:45:27 -05:00
ca71f1f64f
Merge remote-tracking branch 'origin/master'
2015-12-08 14:32:17 -05:00
b1536547d3
Cosmetic Update 2
...
+ Item Coal
+ Freeze Cannon
+ Party Popper / Party Bomb
+ Snowball
+ Coal Fumes Particle
+ Snowman sneak trail/glide
+ Teaked stuff
2015-12-08 00:50:08 +01:00
4ba2e8c96c
fixed old staff being stuck invis.
...
partially changed scoreboard to show playercount
2015-12-08 10:31:11 +11:00
42a0354c9e
Now Playing, Preference to disable ads
2015-12-07 18:28:05 -05:00
67b3fe1d23
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-07 18:11:40 +00:00
3cdf8c4b08
Merge remote-tracking branch 'origin/master'
2015-12-07 04:23:33 -05:00
2afbe23a7c
Load songs from update folder
2015-12-07 04:23:26 -05:00
7b11baf24b
Christmas sale bossbars
2015-12-07 20:20:49 +11:00
8c4615203c
sale message
2015-12-07 20:07:20 +11:00
7b5db2d4fb
Hub Music, HubMusic Preference
2015-12-07 00:58:44 -05:00
488895ea53
Note block player
2015-12-06 21:12:10 -05:00
d095e14b4c
Merge branch 'monster-league'
2015-12-06 16:33:21 +11:00
9880e9a3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-06 16:32:59 +11:00
32a6d572ee
Disable gadgets in arcade for player count > 40
2015-12-05 22:56:15 -05:00
5aabd00972
set hub to christmas
...
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
2015-12-06 14:55:28 +11:00
ef6fd0eaa3
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-12-05 00:05:05 +00:00
4a53667539
gadget restructure
...
converted frost lord and titan particles into 4 subcategories.
2015-12-05 10:22:00 +11:00
348f2d8e4c
Merge remote-tracking branch 'origin/master' into foo
2015-12-03 16:31:16 -08:00
b04f139883
Fixed advertisement being able to be bypassed by spec and instant join
2015-12-01 19:26:52 -08:00
9508556d57
Refactor.
2015-12-01 22:47:51 +00:00
48ae23ebff
changed reference to premium ranks
2015-11-30 19:58:41 -08:00
509835ea64
Implemented new mount data system replacing instead of entities as data.
...
+ Removed some unnecessary code
+ Made StackManager use new mount system
This system also fixes a bug allowing players "hijack" some of the
mounts as it was not properly persistent.
2015-11-29 19:08:00 +01:00
963caae719
Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'
2015-11-28 16:00:28 +11:00
e81aa72c7e
Merge branch 'rankdescriptions' of http://184.154.0.242:7990/scm/min/mineplex
2015-11-27 20:33:18 +01:00
a5ebf9b059
Fixes for release
2015-11-27 05:53:57 -05:00
ec0e2d2d64
fixed colors
2015-11-27 21:09:25 +11:00
dda0e827e1
FGIXEXFSD
2015-11-27 20:46:33 +11:00
936e61de57
gui changes :)
2015-11-27 19:42:04 +11:00
0b0710458f
Hub updates/try to fix chiss stuff
2015-11-27 03:22:17 -05:00
4e2f48b37e
Merge branch 'master' into clans-beta
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
2015-11-27 19:16:30 +11:00
edf93ec43f
Initial ChatSnap implementation.
2015-11-26 16:55:27 +00:00
3e8a53562e
Add new hologram interaction thingy so holograms can catch interactions that they would normally block
2015-11-26 15:49:28 +13:00
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
84fde1c087
Fixed double jump and entity ground tool.
...
Fixed isGrounded so that it doesn't return false positives when too
close to a wall.
Added 500ms recharge to double jump, preventing instant recharge
allowing players to jump twice before having to touch the ground again.
2015-11-25 16:42:32 +01:00
7454cf7443
MS + Champs bugs, balance and more
2015-11-24 15:23:37 +11:00
dcca67e571
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-22 13:54:16 +00:00
6eb1bef1c6
Merge branch 'master' into minestrike-update
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
2015-11-21 11:09:28 +11:00
0bc64fec16
Proxy limit fixes
2015-11-21 09:28:15 +11:00
ad16c59ab7
Forgot to commit this crucial part...
2015-11-20 22:05:10 +00:00
386032a4f5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-20 06:03:30 -05:00
f51358552a
-B
2015-11-20 05:57:29 -05:00
700e4c9a1f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-19 22:12:08 -06:00
3a5ab3f17c
Merge branch 'master' into monster-league
2015-11-20 11:51:07 +11:00
bceb69bc12
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
2015-11-19 23:52:02 +00:00
ad280c96c9
adding interactive Chat elements.
2015-11-19 20:45:40 +01:00
4620a5a162
Hub fix
2015-11-18 21:47:52 +00:00
cb5672b94c
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-18 20:34:24 +00:00
88dbe261db
Added logging for stacker.
2015-11-15 18:34:35 -06:00
e7b86b4462
hub skytext
2015-11-14 13:05:11 +11:00
9de3981dec
ms update
2015-11-13 11:24:11 +11:00
bbc7bf770c
1.8 Fixes - Still doing map fix
2015-11-12 19:18:42 -05:00
639d2d110f
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
2015-11-12 17:55:33 -05:00
0b41450603
Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""
...
This reverts commit 6c17b2926c
2015-11-12 17:51:13 -05:00
6c17b2926c
Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"
...
This reverts commit ce1c09b88f1aef7fe0b9
2015-11-12 16:35:31 -05:00
bc1b185f0e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-12 02:44:54 -05:00
ce1c09b88f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
Plugins/Libraries/craftbukkit.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
2015-11-11 19:35:44 +00:00
2722aeaaec
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-11 14:53:49 +00:00
0e6146d5c9
Added expire to Stacker throw.
2015-11-11 04:32:56 -06:00
394d680470
Merge remote-tracking branch 'origin/master' into monster-league
2015-11-10 07:09:19 -08:00
ca1177685f
totally WIP commit
2015-11-10 07:08:08 -08:00
e00c11ae28
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-10 11:17:49 +00:00
d654f1f4b1
- Fixed class edit in lobbies
...
- Fixed conflict between rave suit and assassin
2015-11-10 06:17:25 -05:00
e165cad50f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-10 04:53:32 -05:00
2707173a8b
Merge with 1.8 Branch
2015-11-10 01:48:33 -05:00
47c509c975
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-11-09 22:55:00 +00:00
7a8a5918c0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/.idea/dataSources.xml
Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
** CONFLICTS ALL FIXED **
2015-11-09 08:59:37 +00:00
2eaa326929
Merge remote-tracking branch 'origin/master'
2015-11-09 03:27:50 -05:00
2c54e9e59a
Giveaway extras
2015-11-09 03:27:42 -05:00
283a774e03
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-09 00:04:55 -06:00
ff936784d3
Remove debug code.
2015-11-08 17:27:00 -06:00
e86623c8d0
Disabled TrickOrTreatManager to test for Lobby lockups.
2015-11-08 17:26:43 -06:00
dfbf19c66a
Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-08 01:02:06 -05:00
3c82574386
Testing pushing/ignore this
2015-11-07 20:02:07 -05:00
79d0466355
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-11-07 21:36:36 +13:00
c922c3248c
disabled trick or treat
2015-11-07 13:36:16 +11:00
f4bf685e96
removed halloween hub
...
removed titan giveaway and pumpkins
2015-11-07 13:20:29 +11:00
4add7449eb
Merge remote-tracking branch 'origin/master'
2015-11-06 21:15:45 -05:00
3893617d58
Logitech Giveaway (still needs testing)
2015-11-06 21:15:37 -05:00
fafc92606c
Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
2015-11-06 18:43:11 -05:00
fd2a543418
Add "ShowUserReports" preference (however currently not visible to players nor does it get saved to the DB currently).
...
Fix variable names in ReportManager.
2015-11-06 16:46:10 +00:00
cc0f12f6c8
Fix player interactions packets not working properly on armorstand and when clicking block behind entity
2015-11-07 04:45:02 +13:00
0c0b3708c6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-06 01:34:13 +00:00
9c49ab0408
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-05 01:23:40 -05:00
7f03ca0936
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
2015-11-03 21:19:17 +00:00
975ad9e6ea
Update to master
2015-11-03 15:05:56 +13:00
3de906ab19
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
2015-11-03 14:57:25 +13:00
95c38b1939
Don't use static instances.
2015-11-02 23:30:06 +00:00
3b38302429
Optimized TaskManager task locks and calls.
...
Run all player messages on the main thread.
2015-11-02 09:35:35 -06:00
55d028d706
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-01 22:09:58 -06:00
18bdcbec62
Fixed some NPEs with TrickDialogue
...
Added debug messages for Tricks.
Cleanup of monster targets in HubManager.
2015-11-01 22:09:36 -06:00
cdb0fcae75
modified hideme a little :)
2015-11-02 14:37:12 +11:00
da6bf27c77
Staff with a higher rank can see lower rank and same ranked vanished staff.
2015-11-02 04:32:07 +01:00
d09ed2a823
Small changes and missed changes from last commit.
2015-11-01 16:47:54 +00:00
f16eee220d
Removed Debug messages.
2015-10-31 14:55:18 -05:00
073321fb14
Refactored TrickOrTreat Stuff.
2015-10-31 14:45:42 -05:00
71e49854db
Add halloween hats
2015-10-31 02:10:15 -04:00
1a6617bce1
Changes.
2015-10-31 02:05:03 -04:00
519dceb72e
Doublejumping downwards is a no no
2015-10-31 19:02:58 +13:00
23be8aa1dd
removed unncessary stuff
...
balanced rewards
2015-10-31 14:33:41 +11:00
4884032a1a
Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3
2015-10-30 23:24:32 -04:00
0486404c4b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-10-28 14:38:34 +13:00
1e4b3442fa
Conflicts:
...
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
2015-10-24 20:45:39 +01:00
394e501682
Merge branch 'master' into feature/report
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2015-10-24 17:50:26 +01:00
29587b93f7
Implement initial report interface.
...
Added getPlugin() method to CommandBase.
Changed mini-plugin name from "ReportPlugin" to "Report" to match the other mini-plugins.
This is very WIP, still a lot to be done.
2015-10-24 03:41:03 +01:00
43cd0f86a9
Fix players unable to break blocks at spawn
2015-10-24 08:40:57 +13:00
40afcaf26b
Global Packet Commands
2015-10-23 15:07:53 -04:00
f7dab72e8c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-10-23 03:23:35 -04:00
af208da953
Merge branch 'alex-testrank'
2015-10-23 18:10:59 +11:00
e3e7dd4694
Titan rewards from mythical chests
2015-10-23 02:08:31 -04:00
1512d87f9e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-23 00:28:32 -04:00
ddb8d592f8
Remove all is1_8 checks
2015-10-22 18:37:14 +13:00
12319169a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java
2015-10-18 00:54:18 -04:00
523378aae7
Clans War updates
2015-10-17 22:55:21 -04:00
3a0781b3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
2015-10-17 00:10:32 +13:00
14a524cf54
Stuff
2015-10-17 00:08:30 +13:00
d00fa856f3
Fixed Pets so they work correctly.
...
Also fixed legend benefits.
Fixed chest pet rewards.
2015-10-16 01:57:19 -05:00
3dda9352e7
Progress
2015-10-16 13:32:23 +13:00
f683e932ae
Clans merge fixes
2015-10-13 22:24:15 -04:00
88709f85b6
Merge with master
2015-10-13 18:13:01 -04:00
58a86c5abb
That's the easy stuff done..
2015-10-13 19:49:15 +13:00
f497eab633
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-10-12 17:54:11 -04:00
bef942f6da
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-12 00:47:56 -04:00
7bc3b4970b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
2015-10-10 17:34:17 +11:00
930cfa5cb8
DONE
2015-10-10 02:30:11 -04:00
245a42c8e0
animation is sexi
2015-10-10 02:13:04 -04:00
30a9196430
Done with animation.
2015-10-10 01:43:31 -04:00
9a7357e484
Work
2015-10-10 01:00:49 -04:00
1127764cc3
Secsi
2015-10-09 22:44:49 -04:00
7851cb451a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
2015-10-09 22:34:05 -04:00
aa9fd1abf3
Titan giveaway work
2015-10-09 22:14:10 -04:00
90c685617d
Animation
2015-10-09 22:14:01 -04:00
ed89f5f4cc
anim example for myst
2015-10-10 10:46:12 +11:00
43f38c18ee
animation
2015-10-10 10:40:44 +11:00
02c6eccfda
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
2015-10-10 10:36:42 +11:00
7dbd9da582
dragon sale Bar
2015-10-10 10:35:48 +11:00
586cc6e3e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-09 09:40:58 -06:00
cdb9741438
Changed the SG icon in hub, fixed EULA breaking thing in Class Shop
2015-10-08 20:36:16 -04:00
3c437925f1
halloween prep
2015-10-08 12:36:00 +11:00
e2e2356b04
stuffs
2015-10-06 13:25:15 +11:00
631bd9cfa6
Removed sale notification.
...
Removed queue create table query.
Added try-catch for ServerMonitor to prevent stat storage from affecting normal operation.
2015-10-01 07:38:59 -07:00
b4c9bfbb57
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
Plugins/Mineplex.Hub/.classpath
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
2015-09-29 18:09:52 -04:00
49908e7550
- Added game to hub text
2015-09-25 04:28:11 -04:00
a488bfab3e
- Rewritten testrank system
...
- Multiple rank improvements for real-time use
- Removed /updaterank from Jr.Dev
2015-09-24 11:44:45 -04:00
cf618abd4e
BotSpam Module
2015-09-22 01:38:45 -04:00
5e8fc77164
Add pages to spectator and in-progress server menu
2015-09-17 04:34:45 +12:00
4184fe20cf
minor fixes
2015-09-12 14:09:04 +10:00
0ac808ba43
stacker pref is now only for pvp stacking.
2015-09-05 10:30:11 +10:00
fc5ccd4a5e
fixed 'self scoring' in Soccer
...
removed silverfish on wither pet despawn
2015-09-05 10:04:54 +10:00
106a7dab2e
removed ability for entities to change blcoks in hub
2015-09-05 09:48:06 +10:00
54f910845e
Fix bug where murders were not properly taking place in certain instances of players wielding weapons or armour as well as in certain claimed areas. Fix bug where BlockToss could be exploited to break into an enemy clan's claimed base. Fixed bug where percent sign was not properly escaped in certain item attributes. Remove debug line from shop.
2015-08-30 12:28:44 -07:00
c1b356e42f
Fix asynchronous race conditions in ServerData.
2015-08-29 19:05:14 -07:00
da3810e5a3
Fix bug where any server initializing the ClanRepository was marked as a clans server in the database. Fix bug where administrative clans were being duplicated across different clans servers.
2015-08-29 17:57:18 -07:00
138a4cf638
Fix bug where transferring a clan to destination server would not load properly server-side.
2015-08-29 17:43:12 -07:00
f47c1b5c14
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-29 17:33:08 -07:00
5df7a5e0c9
Fix bugs related to multiple server UI and clan server transferring.
2015-08-29 17:31:54 -07:00
820bc1af44
Setup new module for intellij, fix field ore
2015-08-29 16:56:26 -07:00
197309b914
Commit left-over changes to merge and pull.
2015-08-29 15:44:29 -07:00
aad5942242
Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server.
2015-08-29 14:46:18 -07:00
ebd3fbe6d5
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-28 20:19:27 -06:00
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
cd145324d8
Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit
2015-08-28 12:00:23 -07:00
a9f5197c64
Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Database/src/mineplex/database/Account.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
2015-08-22 15:18:51 -04:00
bbe5b79c7e
Disabled AntiHack create table.
...
Fixed NPE with ServerManager
2015-08-19 04:11:34 -05:00
14bf8faf3a
disabled big sale
2015-08-18 09:49:53 +02:00
8ab8388344
Merge remote-tracking branch 'origin/master'
2015-08-17 05:05:36 -05:00
dc8bec340e
Rename Quick game menu for consistency
2015-08-17 03:18:35 -05:00
7a7543886f
fixed a ton of commands NPEing on no args
2015-08-17 09:04:39 +02:00
91ce9cfba7
fixed a crash with fireworks
2015-08-16 08:39:03 +02:00
a1ea03f74b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
...
Conflicts:
Plugins/.idea/misc.xml
Plugins/.idea/modules.xml
Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
Plugins/Mineplex.Database/src/mineplex/database/Routines.java
Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
2015-08-14 19:44:56 +12:00
5fa9135b08
renamed soccer to slimeball :)
2015-08-13 14:11:22 +02:00
534c91c706
remove items from inside soccer
2015-08-13 13:24:55 +02:00
a308244966
Merge pull request #29 in MIN/mineplex from foo to master
...
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
minor grammar issue
remove duplicate method
manually updating something
*crosses fingers* please work!
please work...
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Fixed double-half-slabs (line 68)
remove custom level to fix merge conflicts
squirrel!
fix getting snowballs from bedrock
add jnr_dev to updaterank
fix this agaaaaain
FOOIFY IS A NOOB OKAY
fix concurrentmodificationexception
fix turfforts bug
prevent STATIONARY_LAVA from breaking in creeper smash
fix creeper smash exploding lava and bedrock
fix spleef lava issue
ishh also wanted this :P (let me know if I should remove it)
ishh wanted it...k
...
2015-08-13 01:49:00 -05:00
fcfb2559b8
players cannot grab slime :O
2015-08-12 14:41:33 +02:00
d1302e8dc3
fixed full msg
2015-08-12 12:42:59 +02:00
5293e24469
fixed text
2015-08-12 11:58:40 +02:00
cd5c7e7110
fixed kb
2015-08-12 11:23:19 +02:00
f19efb4a93
renamed football to soccer
2015-08-12 09:23:00 +02:00
7cda53cb28
carl spinner in arcade/
...
tutorial fixes
2015-08-12 08:36:21 +02:00
07bdbdde46
minor grammar issue
2015-08-11 09:55:10 -07:00
10f979772b
Merge remote-tracking branch 'origin/master' into foo
2015-08-11 09:51:13 -07:00
fe153bee11
Fix revert issues
2015-08-11 03:19:27 -05:00
bd414cd231
Merge remote-tracking branch 'origin/master' into Myst_EVO
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
2015-08-10 19:47:53 -04:00
65b51a137c
new party tute room
2015-08-10 14:50:44 +02:00
bd2c9aa5e6
hub stuff
2015-08-10 14:00:02 +02:00
8745884153
Various fixes
2015-08-10 04:51:11 -05:00
b8b19ed4a5
Merge remote-tracking branch 'remotes/origin/master' into Bonus
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-08-10 03:24:59 -05:00
6f8d6f8a40
Move Bonus and Poll to core
2015-08-10 01:55:50 -05:00
a0be3fa964
Use atomic mysql operations for modifying tickets
2015-08-10 01:19:10 -05:00
511cc76bef
Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working)
2015-08-10 00:47:36 -05:00
28806aaf0a
Update Bonus amounts, Attempting to fix Votifier plugin for EU/US
2015-08-10 00:33:54 -05:00
d20fe54010
Disable carl features when carl can't be found
2015-08-09 16:36:48 -05:00
c2d066a576
ui fixes
2015-08-09 19:31:24 +02:00
41dcc564c9
polish polish polish
...
MAKE IT SHINE!
2015-08-09 19:02:07 +02:00
8c66ef7f15
changing Hub items and adding Profile GUI.
2015-08-09 18:33:44 +02:00
5a7de8ef3d
hub fixes
2015-08-09 17:21:56 +02:00
941e746ca9
Finalizing Poll GUI in Carl's GUI.
2015-08-09 16:47:03 +02:00
85c8e42f53
Finalizing and improving the Carl spinner and adding creeper explosion animations.
2015-08-09 15:00:54 +02:00
e6519206af
Add event to be called when a player tries to buy a carl spin
2015-08-08 16:29:03 -05:00
cbb0cb96c8
ensured white
2015-08-08 13:54:35 +02:00
e030331565
fixed some bugs
2015-08-08 13:51:37 +02:00
fa7f19bde5
removed debug
2015-08-08 13:47:30 +02:00
328c31de88
hub Update
...
fixed bad gameid
2015-08-08 13:47:09 +02:00
4f6dfdb856
Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes
2015-08-08 06:35:25 -05:00
eab7aa59f2
hub update!
2015-08-08 09:27:49 +02:00
47cb98066d
Hub fixes
2015-08-08 08:19:07 +02:00
33c96f51ae
fixed some stuff
2015-08-07 22:59:50 +02:00
090c1f135d
Merge branch 'SarahsAwesomeBugFixes'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
2015-08-07 21:48:35 +02:00
b22706e649
hub update part 1
2015-08-07 21:45:38 +02:00
a9350bfacd
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-07 11:58:53 -04:00
f76d9b0d37
Replace Consumers with Callbacks
2015-08-07 04:20:54 -05:00
5ebc7080ee
Push fixes
2015-08-07 04:13:09 -05:00
320a3efe5b
Remove some debug code.
2015-08-07 02:22:58 -05:00
e8c60e6e84
Added storage of pets in mysql. Going to have live while backend process is copying data over.
...
Updated ServerTypePage to resolve clicking issues with solo/team pages.
2015-08-07 02:22:13 -05:00
181b778a9c
Fixing some bugs and disallow MPS while disguised.
2015-08-07 07:39:40 +02:00
f37e25e9d7
Finish push for today <3
2015-08-07 07:03:15 +02:00
608e8bf693
For Sarah <3
2015-08-07 05:40:16 +02:00
5f435a079e
Update vote button
2015-08-06 21:59:21 -05:00
be18dc1bf5
Add experience rewards to reward manager
2015-08-06 21:41:56 -05:00
6311ceaa0f
Reward work for new Game reward rarity and setup for carl, work on carl spinner
2015-08-06 21:15:17 -05:00
1680b652db
Added Hat layer skin
...
Added Sneak animation
With love from Morten <3
2015-08-07 03:10:17 +02:00
44e30a0903
SimpleGui Improvements, Change daily timer to 20 hours, Add Carl Spin button, Starter code for Spin Gui
2015-08-06 15:34:56 -05:00
d8041ba582
Fixing Players can disguise as disguised Players.
2015-08-06 20:57:56 +02:00
4a10f8d71a
fixing very last bugs. Ready to push!!!
2015-08-06 13:23:38 +02:00
35d999d747
Remove some debug messages
2015-08-06 05:56:31 -05:00
9e9f9862d0
Bonus bonus bonus!
2015-08-06 05:47:32 -05:00
6947b54e66
16 char limit and Steve Skin.
2015-08-06 09:45:02 +02:00
5809359449
Random Player disguises.
2015-08-06 09:19:19 +02:00
208ce95c97
No youtuber Disguise.
2015-08-06 09:11:39 +02:00
b52a9477fe
No Staff disguises!
2015-08-06 09:07:30 +02:00
16a8164030
Fixing last bugs and disabling coin bombs while diguised.
2015-08-06 08:42:09 +02:00
4cad99eb76
Lots of bonus work, start adding Votifier plugin
2015-08-06 00:45:39 -05:00
da5387c54f
Fixed ConcurrentModification for ServerManager cooldowns.
2015-08-05 01:33:09 -05:00
bcd4f4f9e2
Open gui through npc
2015-08-05 00:41:50 -05:00
b2116cc7e8
Merge branch 'OldServerSelector'
2015-08-04 13:56:23 -05:00
813dfb26b3
Finalized revert to old server menus.
...
Tied in solo/team buttons to use old server menu as well.
2015-08-04 13:54:06 -05:00
b33b0ac935
More bonus work
2015-08-04 04:00:51 -05:00
2f571aed25
fixed bugs from my vel fixes, WHOOPS. normalisation :(
2015-08-03 18:19:31 +02:00
e200ddd777
Merge branch 'master' into Bonus
...
# Conflicts:
# Plugins/.idea/misc.xml
2015-08-03 08:32:45 -05:00
fc412b0782
Reverting old Server Menus with Team sub-menu dor SSM, Skywars and SG.
2015-08-03 14:36:51 +02:00
37b779f108
Fixes for servers.
2015-08-03 05:55:33 -05:00
6c0666c59b
Fix for server groups / teams.
2015-08-03 03:20:27 -05:00
302252f193
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-03 02:56:31 -05:00
af0d769d3d
Fixed skywars quick shop.
...
Fixed issue with skywars not opening.
Fixed chest size for MPS
2015-08-03 02:56:24 -05:00
5bb2f80b8e
fixed text
2015-08-03 09:54:34 +02:00
72c473ad6b
removed annoying mineplex thing from subtext in news
2015-08-03 09:51:10 +02:00
adcd91bf61
Servers with more than 40 max slots always send to largest server.
...
Fixed space in Solo lore.
2015-08-03 02:07:23 -05:00
6a1e5d6bfc
changed item text
2015-08-03 08:23:49 +02:00
c32074e733
Fixed MPS/Event server guis so they open up like old.
...
Changed sticks to player heads in solo/team selection.
2015-08-03 00:53:06 -05:00
bfaa0e6849
Fixed event/mps hardcode.
2015-08-02 23:51:43 -05:00
58933fc855
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 21:19:00 -04:00
944a4a9535
Fix accidental double-queueing bug when left clicking server NPCs and add two second cooldown before attempting to auto-join servers. Fix bug with server groups not properly loading server NPC names into shops. Fix bug with server key/name/npc name not being properly interchangeable during server selection and auto-joining process.
2015-08-02 21:18:24 -04:00
a561bbbf12
Added hardcode for EVENT/MPS :D
2015-08-02 19:41:42 -05:00
cadd21c18b
More bonus work
2015-08-02 19:12:39 -05:00
32a2687991
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 20:00:15 -04:00
d9a641fd92
Updated ServerManager to read server npc stuff from redis.
...
Updated ServerGroup to have NPC name in it.
2015-08-02 18:59:43 -05:00
4852e69991
Temporary un-finished changes for adding in team/solo UI pages and allowing players to select.
2015-08-02 19:19:40 -04:00
70c1b883db
Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups.
2015-08-02 18:20:52 -04:00
c2f6c402da
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-02 13:25:09 -04:00
612d967aa0
Add ability for auto-joining of gametypes to bypass manual server selection by player.
2015-08-02 13:24:59 -04:00
db15ffad72
Bonus changes + Update jooq
2015-08-02 05:17:51 -05:00
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
11e49b9678
Some updates
2015-08-02 04:28:57 -05:00
ac4755a5a9
Fixed incorrect velocity
2015-08-02 11:24:34 +02:00
fd65f27f0f
Fix some typos/formatting issues
2015-07-31 10:01:19 -05:00
b623f025ff
manually updating something
2015-07-29 14:31:11 -07:00
db5c5a9888
*crosses fingers* please work!
2015-07-29 14:12:52 -07:00
971908d38b
Stuff
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 17:52:43 -04:00
832fb4638a
More things
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-28 17:42:00 -04:00
7d9fd61c8e
Display changes
2015-07-26 22:31:40 -07:00
0b53bca385
Needed permission changes for Jr Developers (Pending approval)
2015-07-26 18:58:35 -07:00
47d410370d
Merge branch 'horus-bug-fixes'
2015-07-26 18:20:39 -07:00
6d367e3cee
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-25 01:38:54 -07:00
84be48f264
Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method.
...
Added conversion of stats to new stat table via StatHandler.
Changed stats value from int to long.
2015-07-25 01:30:50 -07:00
13f47ad903
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
2015-07-24 13:59:01 -05:00
fe80ed373a
Fix numerous trello bugs
...
- Stacker as Block morph
- Punish mistake
- Achievement mistake
- Stacking a chest opener
2015-07-22 22:28:44 -07:00
e4ecc9e858
http://pastebin.com/BRhT7pZP
2015-07-22 23:31:07 -04:00
0b49d053fe
Fix memory leak in player gear management. Update custom gear display design for title and description to fit CJ's specified design, as well as updating attribute descriptions to match google doc more closely. Fix bug with damage reduction attributes adding instead of reducing damage. Fix bug with parse errors causing defective attribute bugs and console spam with certain custom gear attributes. Fix bug where legend was not being properly displayed for /c map command. Fix bug where chunks could be claimed diagonally to opposing enemy clans. Fix bug with redstone not properly being disabled. Fix bug with attribute effects taking place even when damage events were cancelled, such as in safe zones. Fix bug with dispensers being able to place lava and water blocks. Fix bug where holding a book caused debug chat spam for players in regards to custom damage events.
2015-07-20 15:57:57 -05:00
d38fc1a603
Reverted things
2015-07-20 16:40:37 -04:00
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
2b2e5e5c97
Spelling fixes + Observer mode
2015-07-16 15:51:21 -05:00
5c5e7dd4a9
Merge master into clans
2015-07-13 20:42:10 -05:00
e36b0440a4
Merge branch 'bench'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
Plugins/Mineplex.StaffServer/.classpath
2015-07-08 13:55:01 +10:00
9ccc85a79e
Improved block restore for Events
2015-06-30 22:30:49 -05:00
4ff456b722
Merge remote-tracking branch 'origin/master' into foo
2015-06-29 11:29:22 -07:00
2963f7a61c
stacker wont give too many msgs
2015-06-29 10:13:33 +10:00
0ea388379a
reduced win req for skywars ach
...
enabled beenfit for 40k reward
2015-06-28 15:16:05 +10:00
4b634d1bc3
Fix slashes (this won't affect windows users, right?)
2015-06-26 10:14:37 -07:00
8c427bee24
Fix _gameDisplay bug.
...
Fix Skywars quickmenu link.
2015-06-26 03:57:39 -05:00
1aa0832bb9
SkyWars to Skywars
2015-06-26 17:55:49 +10:00
17af562f19
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-26 17:36:25 +10:00
59f730ae9d
changed sky text and icon to feather
2015-06-26 17:36:12 +10:00
f906f08a18
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-26 02:34:36 -05:00
60901cc17e
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2015-06-26 02:32:51 -05:00
7c698f65cf
Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads
2015-06-26 02:31:35 -05:00
c78ef9d93d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-26 02:30:01 -05:00
015ba53bbe
skywars hub text
2015-06-26 16:39:25 +10:00
efa06d370b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-26 01:13:42 -05:00
86e2514e37
Fixed callbacks for gem/coin rewards.
2015-06-26 01:13:28 -05:00
2bf1faa70d
fixed a few skywars bugs
...
added ore generation (but theres some wierd bug, still working on it)
2015-06-25 20:24:31 +10:00
91b5beaff2
Fixed new Chat constructor requirement.
2015-06-20 03:43:38 -05:00
da981980df
Added world.setThundering(false);
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 01:35:11 -04:00
61494f93ba
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench
2015-06-19 18:13:48 -04:00
8a224950b3
Added sale notifications
...
Added 3s chat delay
2015-06-19 13:27:59 +10:00
b0ca5ca4aa
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-17 20:54:28 -04:00
37c6593753
Hub: Fix rulebook
2015-06-10 05:27:19 +12:00
574dd16022
Hub: Modify rulebook
2015-05-30 10:20:28 +12:00
f0c7f2fe76
Merge branch 'MSSQL_Conversion'
...
Conflicts:
Website/LOCWebsite.suo
2015-05-17 23:11:50 -07:00
5a8f93f3db
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-05-14 00:12:22 -07:00
b7cdc82cd2
Fixed server sorter for UHC.
...
Work on converting to UltraDNS api.
2015-05-14 00:12:13 -07:00
2c020d10a6
Merge remote-tracking branch 'origin/master'
2015-05-13 22:52:22 -05:00
84c53347f8
[Hub] Add UHC to Quick server menu. Better formatting coming soon!
2015-05-13 22:52:14 -05:00
2c3116a7a6
removed firework and sound from legend join
2015-05-13 15:45:29 -05:00
1c6a12528c
Added ability for LT to modify Admin ranks.
...
Added Twithc rank to the updateRank list.
Fixed server sorting issues with UHC Generating servers.
2015-05-13 00:58:45 -07:00
98dcb9747a
Added UHC support to server sorter.
2015-05-13 00:10:17 -07:00
f9735006b8
removed hub uhc hourly announcements
2015-05-13 00:05:00 -05:00
53555a42cd
[Core] Add MB Stats in gui, Add MB Achievement, Update stat gui layout, add ability to display combined stats
2015-05-12 17:14:50 -05:00
643ed2c047
Fixed most enchants not working
...
added commands to event
minor update to snowfight to make it more fun
2015-05-11 19:55:26 -05:00
a558995e12
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-12 09:52:21 +12:00
b1a46d0f0d
Converted TaskManager
2015-05-11 01:21:27 -07:00
46c07665e1
Merge remote-tracking branch 'origin/master'
2015-05-11 00:44:34 -05:00
800ce68637
Add Beta Games and Player Servers to Quick game menu (text probably needs tweaking)
2015-05-10 16:58:04 -05:00
241935ef63
SurvivalGames: Removed description of deep freeze and updated to beware of borders
2015-05-11 09:13:04 +12:00
822718095d
cannot PM from spawn
...
first push of cards game
2015-05-09 12:23:07 -05:00
a7407d8b8c
Added all minigames standalones into mixed arcade player count.
2015-05-04 22:51:21 -05:00
4252bf70df
Fix Master Builder game button in quick menu.
2015-05-04 01:40:57 -05:00
c8b5c84aa6
Added Master Builder quick game menu option.
...
Added player counts to quick game menu
2015-05-04 00:42:49 -05:00
4f4aeac12c
fixed typo
2015-05-03 23:34:09 -05:00
e013f8af8a
sky text for hub change
2015-05-03 19:49:16 -05:00
40d56c3500
Converted all code to updated UtilParticle methods
...
/suicide
2015-05-03 16:37:00 -05:00
283d550903
Added Wizards to quick game menu.
2015-05-01 01:24:01 -05:00
fa4466b6a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-05-01 00:13:39 -05:00
d161d62773
Added chat filtering to private messages.
2015-04-30 23:56:08 -05:00
9f8fe3bf78
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-04-22 03:45:59 +12:00
c79432c8b9
Fixed projectile hitboxes and specific values
2015-04-04 10:54:03 +11:00
ff0883e7d7
fixed easter egg duration
...
parser list improvement
2015-04-03 21:47:43 +11:00
ed35d2a992
April Fools update
2015-04-01 16:56:13 +11:00
50c38dc467
April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA
2015-03-31 17:22:50 -04:00
f4061854cd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-25 15:11:17 -07:00
6472194d44
Optimized queries to retrieve and update player information by removing inner join calls on the account.
...
Added account id retrieval on login.
Added account id caching in redis.
2015-03-25 15:10:59 -07:00
09fe3ad6a8
NewsManager : Reduced dynamic string generation every time news changes
2015-03-25 15:04:00 -07:00
5fded981d9
Timings for Visibility
2015-03-23 16:38:17 +11:00
28b3828007
slowed hub invis update
2015-03-20 23:48:17 +11:00
52f0941fb9
Add resourcepack options
2015-03-17 23:59:24 +13:00
73c66fa93f
Merge branch 'SpecRemoveCreative'
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-17 14:57:17 +11:00
4581f49948
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-16 13:39:54 +11:00
420c4e7229
More work on Event game
2015-03-16 13:39:33 +11:00
cb93769e03
Converted Bungee to redis.
...
Increased DBPool maximum connections to 5.
2015-03-13 17:53:36 -07:00
c5d48a82a3
Fixed invisibility bug
2015-03-13 11:34:45 +11:00
bf87cfd0cd
Merge remote-tracking branch 'remotes/origin/sql_pooling'
2015-03-11 18:30:52 -07:00
626bfc35fc
Revert "Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections.""
...
This reverts commit 215ec7b00d
2015-03-11 18:05:13 -07:00
0b2ce48b3e
Fix dead lobbies bug.
2015-03-11 17:27:21 -07:00
215ec7b00d
Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections."
...
This reverts commit adfe5fb74e
2015-03-07 19:38:06 -05:00
adfe5fb74e
Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections.
2015-03-07 19:36:54 -05:00
09ecb994f6
Pooled Friend/Ignore/Preferences/Poll/Elo repositories.
...
Removed ArcadeRepository as its unused.
Removed target server check for RedisCommand because it breaks other commands.
2015-03-06 01:36:25 -08:00
5e78b43860
Added StaffOnly code to ServerConfiguration
2015-03-02 12:33:04 -08:00
90ebbd9962
More refactors
2015-02-27 22:53:55 -05:00
efce714375
DEVP-66 Refactor commonly used classes to Java conventions
...
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
bfb0c157a2
Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths
2015-02-25 13:56:32 +13:00
56e03221ad
Improve party system
2015-02-24 13:03:51 +13:00
d29b43d645
Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages.
2015-02-17 15:17:14 +13:00
9bdf248643
Add cross-server message and adminmessage commands. Fixed casing on messagecommands package.
2015-02-12 04:08:06 +13:00
29f3241098
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-10 02:32:13 +13:00
ce7db289a7
Add commands /ignore and /unignore. Fixed mutes not working with private messaging
2015-02-10 02:31:33 +13:00
26463ba75d
Treasure changes :O
2015-02-09 20:24:20 +13:00
c285fae035
Merge remote-tracking branch 'origin/master'
2015-02-06 23:40:14 -05:00
ed8638ae9f
Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it
2015-02-06 23:39:22 -05:00
8851cccff4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-07 03:53:17 +13:00
68d1ba4507
Add API to create walls of maps to create a giant image. Please use responsibly.
2015-02-07 03:52:19 +13:00
922f2d5ee9
Merge remote-tracking branch 'origin/master'
2015-02-05 23:20:45 -05:00
fcb3d20778
Move tablist stuff to portal, show current server on tablist
2015-02-05 23:20:39 -05:00
14fc6f2145
Chest Update
2015-02-06 14:16:10 +11:00
dbd6f449eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2015-02-05 11:37:35 +11:00
c7d4b14f4c
Revert "Revert "Work on treasure............""
...
This reverts commit 49bfe385bf
2015-02-05 11:34:29 +11:00
b0a2e655c1
Changes to IntellIJ Files
2015-02-03 14:12:52 -05:00
49bfe385bf
Revert "Work on treasure............"
...
This reverts commit 50a8fb03a9
2015-01-29 22:28:41 -08:00
505dcc1e8e
Add friends gui, deprecate the old chatbased friends display
2015-01-30 13:46:07 +13:00
50a8fb03a9
Work on treasure............
2015-01-29 18:37:29 -05:00
7f4bcd1210
Smash Update
...
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
08078c1622
Removed Logger
2015-01-22 23:18:38 -08:00
c8be08e5b9
Merge remote-tracking branch 'origin/master'
2015-01-16 15:30:16 -05:00
b395508f0e
54b7f21604c94e9ad2f53956 Flag for Poll DIsplay
2015-01-16 15:30:06 -05:00
78cd5e7070
Changed hub to normal.
2015-01-15 00:39:07 -08:00
c83643564b
Fixed scoreboards reading from file.
...
Fixed scoreboard server name length
Changed how we pull server group on startup.
2015-01-13 12:22:47 -08:00
ac709d09ce
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-11 00:42:55 -08:00
8e04a2a5f2
Portal now checks server status and player's rank before sending them to a server to prevent login spam.
...
Refactored portal method names.
2015-01-11 00:42:31 -08:00
47fc6e3b94
Revert "Added pool based repository and converted everything but account and donation repositories to it."
...
This reverts commit 8de8d31eec
2015-01-11 00:41:40 -08:00
8de8d31eec
Added pool based repository and converted everything but account and donation repositories to it.
2015-01-10 11:53:25 -08:00
8ce097d837
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-04 13:21:35 +11:00
aca7fd6849
Removed all create calls
2014-12-31 09:38:41 -05:00
5f36c8e424
minor scoreboard changes
...
legend loot bonus
2014-12-30 08:50:37 +11:00
97f57b655b
Prevent horses from spawning in Clans
...
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
008980d9ca
Slowed Server page update speed.
2014-12-24 01:36:33 -05:00
cff63ca3e3
Phinary needs some sleep!
2014-12-23 08:07:46 -06:00
9c1e3aa7aa
Ignore full or dead servers
2014-12-23 06:26:51 -06:00
c40a5a8eac
Another bugfix
2014-12-23 06:20:36 -06:00
582ed34d21
Fix for staff hosted
2014-12-23 05:48:45 -06:00
5f509ca488
Rank fixes, visual fixes, lets hope things work!
2014-12-23 04:55:00 -06:00
d8311d860e
Ignore private servers
2014-12-23 04:21:37 -06:00
c41b5b0cfb
private server gui, i think?
2014-12-23 04:15:33 -06:00
7ef2edd498
Removed extra enjin message.
...
Added retrieval of servergroups to identify if server is a player server or not.
2014-12-23 04:19:24 -05:00
f00854ee4c
Removed bad code thats bad from the bad birdy.
...
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.
Updated Enjin to handle more versatile inventory purchases.
2014-12-23 03:43:56 -05:00
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
48fdfbb8f0
Hub changes for private servers
2014-12-23 00:30:15 -06:00
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
0e85b7e6cc
Added HostName to server groups.
...
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
2014-12-23 00:49:52 -05:00
1957db25d9
Add player head button
2014-12-22 23:20:20 -06:00
224d1bbf63
blizzard particle redo
...
hub text
2014-12-23 10:36:48 +11:00
98b614848d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:54:31 +11:00
679f7909b0
Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers
2014-12-18 12:45:56 +11:00
d19431a47f
Rename Clicked to onClick
2014-12-17 18:40:44 -06:00
6e42894d5c
Refactor button again
2014-12-17 18:33:24 -06:00
0e7adab3eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-17 18:32:50 +13:00
17ac36d9ae
Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub
2014-12-17 18:31:51 +13:00
a433ad764d
Wither Morph
...
Legend Particle
2014-12-16 16:18:09 +11:00
c43ee95c55
Added 1.8 hooks for disguise setName and getName
...
Refactored method names in some disguise classes.
2014-12-15 21:46:14 -05:00
5b67e2182a
Added disguise to Pet Manager for eventual wither disguised pet.
2014-12-14 02:30:39 -05:00
4fd6ed80c4
final xmas Updates
...
xmas hub
2014-12-12 19:44:04 +11:00
2be4d7d6d2
XMAS UPDATE
2014-12-12 10:03:25 +11:00
c4fee8e681
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/.classpath
2014-12-10 03:34:53 -08:00
ea034812b9
Fixed path finder crap in UtilEnt
...
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
2014-12-10 03:32:35 -08:00
0aba82eee6
fixed some eclipse java6 stuff with mail
...
Christmas game update
2014-12-10 15:38:57 +11:00
b99da44873
Disable mail and notifications
2014-12-06 01:00:02 -06:00
54d8fe21fb
Notifications and stuffs?
2014-12-04 22:48:54 -06:00
f48085d5ca
Merge remote-tracking branch 'origin/master'
2014-12-04 17:41:40 -06:00
0bb2d1db5b
Some changes *_*
2014-12-04 17:29:47 -06:00
59f93d46ec
Refactored IButton
...
Added ComplexButton
Added Clans farming.
Added Clans Recipes.
Added Clans gameplay.
Added shop files structure.
2014-12-04 05:05:27 -08:00
abaf9f4693
Refactored IRelation method names
...
Added support for negative amounts in Support server.
Clans in core testing state.
2014-12-03 13:06:50 -08:00
e7cf4eb51d
Removed use of Gem Boosters
...
Cleaned up some unused imports.
2014-12-01 02:27:39 -08:00
f507db7664
Reworked spawn to save to database.
...
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
2014-11-29 03:16:37 -08:00
cded2c7d8f
Update Polls to use new MiniDbClientPlugin
2014-11-26 12:07:06 -06:00
7c9226d6de
Fix mail to work with recent changes
2014-11-26 11:55:28 -06:00
c73a9f3bd5
Merge remote-tracking branch 'origin/master'
2014-11-26 11:39:13 -06:00
9928811a71
Merge pull request #2 from Better-Holograms to master
...
* commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89':
Remove the 'Made by Shaun'
Fix up mistakes in the previous modifications
You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly
Ignore wither skulls for CustomTagFix
Remove old holograms and add new holograms
2014-11-26 06:07:57 -06:00
ef59cb7a9d
Merging changes from master to Better-Holograms
...
* master:
Antistack replacement
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-27 01:01:19 +13:00
03075fecae
You have your HologramManager presented in a light most fair.
...
Should be worth noting I didn't test it thoroughly
2014-11-26 10:28:37 +13:00
484dfaaea9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-25 13:25:41 -08:00
3b54789767
Optimized logins dealing with mysql with multiqueries.
...
Added lazy loading of Pool data and Loaded check before performing anything.
Refactored MiniClientPlugin and created MiniDbClientPlugin
Renamed RankBenefitManager9000 to BenefitManager
Removed /send ability for now.
2014-11-25 13:25:13 -08:00
f1fbc21570
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-11-23 20:02:09 -06:00
c7f2a8072e
Antistack replacement
2014-11-23 19:51:23 -06:00
6efa416d81
Fixed glitching dom items in Hub due to portal throw.
2014-11-21 18:30:26 -08:00
6c63552480
Refactored RankBenefitsGiver9000
...
Added Thanksgiving benefits (1 treasure key).
ServerMonitor now ignores Testing group.
2014-11-20 21:24:23 -08:00
a73ee4e306
Structure for Mail system, not finished yet.
2014-11-20 14:41:25 -06:00
972911fe05
set achievement skills
2014-11-20 18:01:46 +11:00
d1a4080cbd
Added GUI support for achievement skills.
2014-11-19 22:47:10 -08:00
2384b91b06
game timer > advertisement
2014-11-16 14:45:18 +11:00
2e58342032
Removed MS from beta.
2014-11-15 19:27:37 -08:00
ca4eec20ed
Wither Assault update
2014-11-15 19:31:56 +11:00
1372f74921
Refactored some names in MiniPlugin
...
Work on clans.
2014-11-12 19:21:12 -08:00
c61ad8907a
set minimum MP level for staff
2014-11-08 09:15:27 +11:00
3309c0406b
Added ∞ for admin/owners as player level.
...
Fixed customer support issue where it wasn't totaling coins correctly.
Fixed Recharge memory leak.
2014-11-07 13:54:11 -08:00
c93862f299
updated player level
...
added /givestat command for owners (must use full string; Global.ExpEarned)
2014-11-07 22:10:41 +11:00
fadaa59526
added mineplex level
...
removed ability to go into negative gems as villager morph
2014-11-07 19:20:15 +11:00
a67842b504
returned hub to normal
...
removed flaming pumpkins from arcade
2014-11-07 12:54:38 +11:00
f931bd26e6
Updated ServerConfiguration to support resourcepack and Arcade settings.
2014-11-06 00:25:49 -08:00
6f2a6a6ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-05 14:45:54 -08:00
1a09c14642
Reverted database connection pooling because it caused severe login delays.
2014-11-05 14:39:22 -08:00
b00fb0952a
Updated Sheep Quest to be 1.8 comptible.
...
Fixed fissure not working on slabs
Fixed a bug in recharge
Added ability for admins to give other people creative (they lose it when the admin quits)
2014-11-05 11:26:39 +11:00
a2f7a84120
Fix Hub Rule Book
2014-11-03 18:46:49 -06:00
Keir Nellyer
Shaun Bennett
Teddy
md_5
Sarah
Thanos paravantis
NewGarbo
Morten
William Burns
libraryaddict
xGamingDudex
Cheese
Jonathan Williams
Shaun Bennett
fooify
AlexTheCoder
Ty Sayers
Mini-Chiss
Aaron Brock
Ben Sihota
libraryaddict