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 |
|