Ben
|
744d8891b4
|
import
|
2016-04-05 22:58:03 +01:00 |
|
Ben
|
be63012d18
|
make trainees+ not count to kicked player count
|
2016-04-05 12:43:19 +01:00 |
|
Ben
|
876a7a8eb6
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-05 12:37:23 +01:00 |
|
Ben
|
cfac41f216
|
full server trainee+ fix
|
2016-04-05 12:37:04 +01:00 |
|
Jonathan Williams
|
dd5b2d5e3f
|
Fixed NPE with poison condition effect.
|
2016-04-05 00:36:18 -05:00 |
|
Jonathan Williams
|
e23362bd6f
|
Fixed NPE in OrderedObjective
|
2016-04-05 00:36:00 -05:00 |
|
Jonathan Williams
|
b34a175a2b
|
Fixed error in Outpost throwing NPE.
|
2016-04-05 00:35:44 -05:00 |
|
Shaun Bennett
|
ae87db1742
|
Fix TNT generator timings
|
2016-04-05 13:04:52 +10:00 |
|
Shaun Bennett
|
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 |
|
phobia
|
b0dd51843b
|
Ride horse delay
|
2016-04-05 10:58:31 +10:00 |
|
Ben
|
7f92a3c048
|
incognito changes
|
2016-04-05 00:38:27 +01:00 |
|
Jonathan Williams
|
cd5ad89f51
|
Made clans sort by server number.
|
2016-04-04 17:46:51 -05:00 |
|
Jonathan Williams
|
53b25e6ee0
|
Fixed diamonds not selling in shops.
|
2016-04-04 17:46:35 -05:00 |
|
Jonathan Williams
|
6558b16004
|
Fixed endless loop crash bug with Gear attributes.
|
2016-04-04 17:46:22 -05:00 |
|
Jonathan Williams
|
8ea0051181
|
Fixed customer support menu not showing if monthly bonus hasn't been claimed.
|
2016-04-04 17:46:03 -05:00 |
|
Jonathan Williams
|
2d296d9226
|
Removed debug ResourcePack Message
|
2016-04-04 17:45:34 -05:00 |
|
Jonathan Williams
|
efa18d394b
|
Fixed Incognito not saving status.
|
2016-04-04 17:45:10 -05:00 |
|
Jonathan Williams
|
2fa0787792
|
Clans now load, added connection property to null zero date timestamps.
|
2016-04-04 16:31:37 -05:00 |
|
Jonathan Williams
|
2b3e466469
|
Removed pesky '?' causing login query to stall.
|
2016-04-04 16:30:57 -05:00 |
|
Ben
|
7de23216f6
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-04 20:41:10 +01:00 |
|
Ben
|
b3b72f1ca0
|
commenting out clans bans
|
2016-04-04 20:40:58 +01:00 |
|
Jonathan Williams
|
02459c6a10
|
Fixed bad implementation of IncognitoManager that was locking up threads.
Temporarily disabled MessageManager's handling of Incognito.
|
2016-04-04 13:48:26 -05:00 |
|
Jonathan Williams
|
60010f90b4
|
Load simple clan token on player login to reduce overhead.
Increased dbpool connections to 4
|
2016-04-04 13:47:45 -05:00 |
|
Jonathan Williams
|
a91ef68978
|
Fixed CCM in WarPointEvasion.
Removed debug message; NOT RIDER
|
2016-04-04 13:46:39 -05:00 |
|
Jonathan Williams
|
e2baf2b56c
|
Updated Clans to use the new ResourcePackManager.setResourcePack method.
|
2016-04-04 13:46:00 -05:00 |
|
Jonathan Williams
|
1b1e6f6ef5
|
Moved the redis operation before asking for a mysql connection
|
2016-04-04 13:45:20 -05:00 |
|
Jonathan Williams
|
781c4bfdbd
|
Removed db call off main thread for ClanServerPage
|
2016-04-04 10:31:13 -05:00 |
|
Jonathan Williams
|
91ddac9643
|
Added world checking for boundary stuff.
|
2016-04-04 10:30:59 -05:00 |
|
Jonathan Williams
|
e8da5ca0f2
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-04 10:02:01 -05:00 |
|
Jonathan Williams
|
228a001696
|
Added Shift Left clicking to the ban list for Cannon :D
|
2016-04-04 10:01:50 -05:00 |
|
Shaun Bennett
|
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 |
|
Ben
|
14207c2073
|
clansbans
|
2016-04-04 14:56:20 +01:00 |
|
Ben
|
8330ef560d
|
not rider spam
|
2016-04-04 14:55:47 +01:00 |
|
Shaun Bennett
|
fecd3c1eaa
|
Final changes
|
2016-04-04 23:28:38 +10:00 |
|
Ben
|
02cb0e1f7e
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
|
2016-04-04 13:52:44 +01:00 |
|
Ben
|
1dde17b9cc
|
shooters still shotting fix
|
2016-04-04 13:51:05 +01:00 |
|
phobia
|
e85a1e6a3b
|
fixes to breakingand placing in claim
|
2016-04-04 22:22:07 +10:00 |
|
phobia
|
4262a4d4b7
|
Increase radius + delete iron doors after done
|
2016-04-04 22:07:58 +10:00 |
|
phobia
|
963bba06f7
|
fix for displaying territorial movements
|
2016-04-04 17:47:58 +10:00 |
|
phobia
|
2e0c9d3965
|
Remove potatoe message
|
2016-04-04 17:34:39 +10:00 |
|
phobia
|
aaccb6fd48
|
Join/leave/death messages
|
2016-04-04 17:20:21 +10:00 |
|
Shaun Bennett
|
15c4b2dd58
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-04-04 17:11:15 +10:00 |
|
Shaun Bennett
|
23e116f9b5
|
Region fixes
|
2016-04-04 17:10:52 +10:00 |
|
phobia
|
56a087612b
|
Changes to explain energy goal
|
2016-04-04 16:58:16 +10:00 |
|
Shaun Bennett
|
be8ed78caa
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-04-04 16:46:17 +10:00 |
|
Shaun Bennett
|
02f774ce94
|
A lot of bug fixes
|
2016-04-04 16:45:20 +10:00 |
|
Jonathan Williams
|
85fabd525a
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-04 00:59:25 -05:00 |
|
Jonathan Williams
|
400d2f0cca
|
Added bonus log view for customer support.
|
2016-04-04 00:59:13 -05:00 |
|
Shaun Bennett
|
543719b95d
|
More tutorial fixes
|
2016-04-04 14:47:33 +10:00 |
|
Cheese
|
040026724b
|
renamed tutorials
|
2016-04-04 14:10:26 +10:00 |
|
Cheese
|
29bcd6aeea
|
more text cahnges
|
2016-04-04 13:30:15 +10:00 |
|
Cheese
|
88e56f2ffb
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java
|
2016-04-04 13:03:24 +10:00 |
|
Cheese
|
6c92b42335
|
text changes
|
2016-04-04 13:01:54 +10:00 |
|
Shaun Bennett
|
29f2442be8
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-04-04 12:53:07 +10:00 |
|
Shaun Bennett
|
8dee8eab0a
|
Bug fixes
|
2016-04-04 12:52:52 +10:00 |
|
phobia
|
3173adca53
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-04 12:49:00 +10:00 |
|
phobia
|
5ad877f864
|
So many fixes <3
|
2016-04-04 12:47:23 +10:00 |
|
Shaun Bennett
|
0a39b7b756
|
Fix objective ordering
|
2016-04-04 12:36:47 +10:00 |
|
Shaun Bennett
|
e11a9379b9
|
More tutorial tweaking
|
2016-04-04 12:32:22 +10:00 |
|
phobia
|
5195e4a13d
|
Message fixes
|
2016-04-04 10:15:15 +10:00 |
|
phobia
|
c3a119cfe4
|
Display completion only to player who completes
|
2016-04-04 10:11:26 +10:00 |
|
Ben
|
a1f284670a
|
make zombie npcs actually look at the player
|
2016-04-03 23:49:22 +01:00 |
|
Ben
|
3ff5e6d337
|
npc fixes
|
2016-04-03 18:47:31 +01:00 |
|
Ben
|
7558bd01b7
|
ensure zombies don't burn to death, by losing equipment
|
2016-04-03 18:29:13 +01:00 |
|
Ben
|
40361acc9b
|
fixed cannon becoming off-center
|
2016-04-03 17:51:56 +01:00 |
|
Ben
|
ccdd1f901f
|
cannon 1.9 fixes
|
2016-04-03 17:23:55 +01:00 |
|
Ben
|
f4d4b5c5df
|
siege weapon interaction fix
|
2016-04-03 14:08:40 +01:00 |
|
Ben
|
66a18dcc87
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
|
2016-04-03 13:55:17 +01:00 |
|
Ben
|
c1b659e738
|
npcs on enemy base
|
2016-04-03 13:50:11 +01:00 |
|
Ben
|
f5623f00f9
|
blacklist npe fix
|
2016-04-03 13:47:57 +01:00 |
|
phobia
|
3ae347653a
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-03 21:33:13 +10:00 |
|
phobia
|
c92d291e96
|
Shift clicking TNT into the cannon + iron doors fixed
|
2016-04-03 21:32:56 +10:00 |
|
Jonathan Williams
|
8f58a456b1
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-03 01:37:40 -05:00 |
|
Jonathan Williams
|
401127caa9
|
Reworked Monthly bonuses so they always succeed and it logs them.
|
2016-04-03 01:36:30 -05:00 |
|
phobia
|
759911396a
|
More clans bug fixes + message tweaks
|
2016-04-03 16:11:47 +10:00 |
|
phobia
|
5e41c22fc7
|
- The "WARNING: Clan energy is running very low" message should appear after I get the Buy Energy objective
- Need a congrats message/title when tutorial is completed
- Force user to claim via gui
|
2016-04-03 13:39:32 +10:00 |
|
phobia
|
45cbeef83d
|
- /c sethome shows the wrong message when the bed can't be placed
|
2016-04-03 13:32:49 +10:00 |
|
phobia
|
9f4a2ff7ce
|
- Shift clicking TNT into the cannon does not work
- /c map doesn't work in tutorial (could just remove /c map completely)
|
2016-04-03 13:31:13 +10:00 |
|
phobia
|
664d8b1a4e
|
Fixes for clans tutorial
|
2016-04-03 11:04:57 +10:00 |
|
phobia
|
b4cfbebf3f
|
Fix issue with seeling potatoes
|
2016-04-02 22:53:41 +11:00 |
|
phobia
|
d4e9f638da
|
Fixed a crash bug with title message being too long + other fixes
|
2016-04-02 22:26:21 +11:00 |
|
phobia
|
cc09bf6b51
|
Fixes to Bull Charge + Adding more instructins to purchasing
|
2016-04-02 21:43:33 +11:00 |
|
William Burns
|
15cf7f574d
|
Fix join/quit messages.
|
2016-04-02 11:08:40 +01:00 |
|
William Burns
|
6072753624
|
Fix shop objective description.
|
2016-04-02 10:50:46 +01:00 |
|
Shaun Bennett
|
b960925522
|
Fixes
|
2016-04-02 20:42:41 +11:00 |
|
phobia
|
5a31be1138
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-02 20:33:09 +11:00 |
|
phobia
|
673dd327ff
|
Push for shaun Fireworks
|
2016-04-02 20:29:56 +11:00 |
|
Jonathan Williams
|
e4b2492b35
|
Fixed ObjectiveGoal's finish from creating CCMs.
|
2016-04-02 03:03:17 -05:00 |
|
Jonathan Williams
|
ff41ad248a
|
Removed PvpTimer
Fixed issue where StatManager and FriendManager were created twice.
|
2016-04-02 02:47:17 -05:00 |
|
Jonathan Williams
|
a6710280fb
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-02 00:45:10 -05:00 |
|
Jonathan Williams
|
01d9c1cd09
|
Finished the <?> for Objective and ObjectiveGoal.
|
2016-04-02 00:45:01 -05:00 |
|
Shaun Bennett
|
d161d83d12
|
Maps and other various fixes
|
2016-04-02 15:43:03 +11:00 |
|
Shaun Bennett
|
5739b1b87b
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-04-02 15:13:16 +11:00 |
|
Jonathan Williams
|
3bc1908b57
|
Fix player quit staying in _active list for Objectives.
|
2016-04-01 23:10:15 -05:00 |
|
Shaun Bennett
|
758004f207
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-04-02 14:55:14 +11:00 |
|
Jonathan Williams
|
fa6d18b0fa
|
Fix sync db call inside sendMessage
|
2016-04-01 22:43:09 -05:00 |
|
Cheese
|
8f959a73eb
|
debug
|
2016-04-02 12:46:25 +11:00 |
|
Cheese
|
9969b7d783
|
support for resource packs for different MC versions
|
2016-04-02 11:39:40 +11:00 |
|
Shaun Bennett
|
0abcd0044b
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-04-02 10:53:28 +11:00 |
|
phobia
|
90e336b18e
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-01 21:51:51 +11:00 |
|