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 |
|
phobia
|
42fd210b20
|
PC-56
|
2016-04-01 21:51:31 +11:00 |
|
Jonathan Williams
|
fe41e79e8a
|
Fixes:
10 minute timer for creating clan after tutorial.
CCM with LeaveSpawnGoal
Synchronous database calls.
|
2016-04-01 01:55:08 -05:00 |
|
phobia
|
9a1e5099a4
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-01 14:04:12 +11:00 |
|
phobia
|
d0bc40b991
|
PC-56 and PC-65
|
2016-04-01 14:01:38 +11:00 |
|
Shaun Bennett
|
49441cfaf4
|
PC-63 and PC-64
|
2016-04-01 10:47:21 +11:00 |
|
Ben
|
3412082f37
|
PC-61 - Remove all diamonds from inventory after sell diamonds objective
|
2016-04-01 00:33:42 +01:00 |
|
Ben
|
da99a12b23
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-31 20:03:50 +01:00 |
|
Ben
|
d353c53524
|
remove hard-coded access to certain commands for my uuid/name
|
2016-03-31 20:03:25 +01:00 |
|
William Burns
|
4ec833727f
|
PC-20 - Detailed Objective Text
|
2016-03-31 18:45:17 +01:00 |
|
phobia
|
19b2b00a13
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-31 20:35:40 +11:00 |
|
phobia
|
86bdbbb8bc
|
PC-46 + adding in events for buttons
|
2016-03-31 20:35:21 +11:00 |
|
Shaun Bennett
|
682c365bc6
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-03-31 20:09:16 +11:00 |
|
Shaun Bennett
|
b3392e78f5
|
PC-28 - Improve Flow of Tutorials
|
2016-03-31 20:08:45 +11:00 |
|
Shaun Bennett
|
30a098c645
|
PC-49 - Kick players out of their clan when they start the tutorial if they have one (from previously playing the tutorial).
|
2016-03-31 18:24:47 +11:00 |
|