a04f7c23c6
Disable incognito for staff in hub invisibility, and vice-versa
2016-04-08 20:18:56 +01:00
876a7a8eb6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-05 12:37:23 +01:00
23232efd63
Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 13:04:39 +10:00
7f92a3c048
incognito changes
2016-04-05 00:38:27 +01:00
cd5ad89f51
Made clans sort by server number.
2016-04-04 17:46:51 -05:00
2b3e466469
Removed pesky '?' causing login query to stall.
2016-04-04 16:30:57 -05:00
60010f90b4
Load simple clan token on player login to reduce overhead.
...
Increased dbpool connections to 4
2016-04-04 13:47:45 -05:00
781c4bfdbd
Removed db call off main thread for ClanServerPage
2016-04-04 10:31:13 -05:00
ff929a8515
Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 00:57:28 +10:00
fecd3c1eaa
Final changes
2016-04-04 23:28:38 +10:00
ee22274ef5
Removed Stacker debug messages.
2016-03-23 16:02:06 -05:00
e8dcc4a3e2
Merge branch 'develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-03-23 11:02:20 +11:00
2cff7003e6
Added more debug to Stacker interaction.
2016-03-21 20:30:54 -05:00
faf6834e23
Added some protection for stacker and offline players.
2016-03-20 16:27:59 -05:00
1228ca227e
Add support for 1.9 resource packs, Text Tutorials
2016-03-11 11:50:08 -06: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
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
c811906a7e
REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a)
2016-02-19 18:21:01 +11:00
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
1c5ae77329
Fix Valentines quick server menu button
2016-02-16 16:54:05 -06:00
15ed2570e2
Valentines final changes, Change Gift Giver achievement
2016-02-15 20:43:46 -06:00
0d19a8017f
Update Featured arcade game, various bug fixes
2016-02-12 06:51:30 -06:00
e8559d423a
Add Valentines Vendetta to quick server menu
2016-02-12 05:27:50 -06:00
960a0cdabb
Fix constructor error, add ValentinesGiftManager to Arcade
2016-02-12 05:06:13 -06:00
66aa89b5e0
Fix sheep look bug, valentines gift effects, valentines achievements
2016-02-12 04:32:26 -06:00
4f0f81c8df
Update Courtship messages
2016-02-12 01:47:20 -06:00
d8965179f7
More valentines adjustments/fix gladiators tutorial being enabled
2016-02-11 23:01:59 -06:00
00f7880dd2
Fix compile error
2016-02-09 21:15:15 -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
a868b8b2b8
Valentines gifts
2016-02-08 22:26:33 -06:00
c059425e9d
Remove GiveawayManager (not used anymore)
2016-02-07 13:18:29 -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
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
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
c1f91cbfb0
Final changes
2016-01-29 03:56:49 -05:00
863be023d9
Prep for update
2016-01-29 03:36:52 -05:00
eb29c6b367
Fix constructor
2016-01-28 22:28:18 -05:00
0177cf91bb
Merge with develop
2016-01-28 22:23:17 -05:00
051d70771b
Facebook Command
2016-01-28 22:15:35 -05:00
63cea58f05
Waiting for a testing session.
2016-01-28 17:18:24 +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
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
Ben
Shaun Bennett
Jonathan Williams
md_5
Mysticate
teddy