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
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
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
c7d4b14f4c
Revert "Revert "Work on treasure............""
...
This reverts commit 49bfe385bf
2015-02-05 11:34:29 +11: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
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
Jonathan Williams
Shaun Bennett
Cheese
Aaron Brock
libraryaddict
Mini-Chiss
Ty Sayers
Shaun Bennett
libraryaddict