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
|
c92d291e96
|
Shift clicking TNT into the cannon + iron doors fixed
|
2016-04-03 21:32:56 +10: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
|
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 |
|
Shaun Bennett
|
7c70092f3b
|
PC-48 - Create a hologram saying "Jump Off" at the edge of spawn island
|
2016-03-31 18:19:06 +11:00 |
|
Shaun Bennett
|
e7b9d866ae
|
PC-57 - Rename Identify Fields to Identify Fields on Map
|
2016-03-31 17:10:56 +11:00 |
|
Shaun Bennett
|
c51830145e
|
PC-58 - Close gate to the fields after you sell diamonds
|
2016-03-31 17:09:51 +11:00 |
|
Shaun Bennett
|
f229da1327
|
PC-55 - Remove all potatoes from inventory when player completes "Sell Potatoes"
|
2016-03-31 17:08:26 +11:00 |
|
Shaun Bennett
|
25975e47b8
|
PC-54 - Rename Identify Shops to Identify Shops on Map
|
2016-03-31 17:07:08 +11:00 |
|
Shaun Bennett
|
7867da277d
|
PC-52 - Rename Identify Enemy Clan to Identify Enemy on Map
|
2016-03-31 17:05:59 +11:00 |
|
Shaun Bennett
|
50518250de
|
PC-51 - Rename randomClan to EnemyClan
|
2016-03-31 17:02:38 +11:00 |
|
Shaun Bennett
|
44abf8f1e2
|
Naming fixes
|
2016-03-31 16:47:16 +11:00 |
|
Ben
|
62280a8fa5
|
Fix diamond from flying far away when breaking diamond blocks in the fields
|
2016-03-31 01:11:30 +01:00 |
|
Ben
|
622843ca8e
|
PC-47 - Remove item drops from tutorial cannon hit
|
2016-03-31 01:08:01 +01:00 |
|
Ben
|
0fd39e1300
|
missing event
|
2016-03-31 00:47:06 +01:00 |
|
Ben
|
36caf16c9a
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-31 00:03:12 +01:00 |
|
Ben
|
0f22c4359d
|
PC-19 - Remove World Event messages for players in Tutorial
|
2016-03-31 00:02:51 +01:00 |
|
phobia
|
978f978023
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-30 23:01:55 +11:00 |
|
phobia
|
d6560fcf5c
|
Fixes to Clan info goal
|
2016-03-30 23:01:39 +11:00 |
|
Shaun Bennett
|
5652eb75cf
|
Fix NPE in MountCannonGoal
|
2016-03-30 22:33:23 +11:00 |
|
William Burns
|
5149043d14
|
PC-38 - Don't open gate until player is 12 blocks away
|
2016-03-30 01:09:29 +01:00 |
|
William Burns
|
ed65f19417
|
PC-42 - Fireworks and Effects at end of tutorial
|
2016-03-29 23:41:31 +01:00 |
|
William Burns
|
1d4472255f
|
PC-40 - Add cooldown to Tutorial /c home
|
2016-03-29 18:50:28 +01:00 |
|
William Burns
|
0bbfbff0b8
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-29 18:03:49 +01:00 |
|
William Burns
|
2fcd809447
|
PC-34 - Effects/Particles when you blow up enemy
|
2016-03-29 18:03:28 +01:00 |
|
phobia
|
cd2d4c0f37
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-29 22:47:39 +11:00 |
|
phobia
|
e75c7a3c91
|
PC-29 + fixes
|
2016-03-29 22:47:03 +11:00 |
|
phobia
|
eab7cbe385
|
PC-35
|
2016-03-29 16:29:03 +11:00 |
|
William Burns
|
f2d450d26b
|
PC-30 - Claim land objective should use clan GUI
|
2016-03-29 00:07:50 +01:00 |
|
William Burns
|
fc473275b0
|
PC-37 - Move Identify shops objective before go to shops
|
2016-03-29 00:02:07 +01:00 |
|
William Burns
|
f8211f26cc
|
PC-18 - Remove PVP Safety Message in Tutorial
|
2016-03-28 13:36:43 +01:00 |
|
William Burns
|
3d0d7f9d71
|
PC-43 - Remove join/quit messages while in tutorial
|
2016-03-28 12:38:57 +01:00 |
|
phobia
|
fd3a04e794
|
Fixes for tutorial
PC-39 "about energy"
PC-32 Tutorial set home bed
PC-27 Change /c GUI for creating clan
PC-41 Disband via gui not command in tutorial
|
2016-03-28 22:13:28 +11:00 |
|
Shaun Bennett
|
fa0594b5db
|
PC-24 - Update Spawn Island Hologram
|
2016-03-28 13:55:37 +11:00 |
|
Shaun Bennett
|
9ff7e2da82
|
PC-21 - Combine Tutorial 1 and 2
|
2016-03-28 11:52:18 +11:00 |
|
Shaun Bennett
|
f7c57a7699
|
PC-22 - Update Scoreboard Text
|
2016-03-28 11:47:16 +11:00 |
|
Shaun Bennett
|
8c1b91cbf5
|
PC-23 - Hotbar Flashing Text
|
2016-03-28 11:37:35 +11:00 |
|
Shaun Bennett
|
2d30983711
|
Adjust visuals
|
2016-03-28 11:29:15 +11:00 |
|
Ben
|
1aa4b4a47d
|
remove player from tutorial on kick
|
2016-03-27 15:36:54 +01:00 |
|
Ben
|
e4e40baf52
|
final stuff
|
2016-03-27 06:48:23 +01:00 |
|
Ben
|
b4d340a655
|
cb fixed
|
2016-03-27 06:21:32 +01:00 |
|
Ben
|
a175ead44a
|
finished tutorial!
|
2016-03-27 05:43:31 +01:00 |
|
Ben
|
a30a591b58
|
disable certain clans commands whilst in tutorial
|
2016-03-27 02:04:33 +01:00 |
|
Ben
|
a8bd0e4406
|
add current Clan Outpost to travel shop
|
2016-03-26 23:20:03 +00:00 |
|
Ben
|
2070f0925d
|
teleport to spawn after tutorial ends
|
2016-03-26 22:49:06 +00:00 |
|
Ben
|
0559ad9567
|
remove "you have not set a home" message and added a set home message
|
2016-03-26 22:45:20 +00:00 |
|
Ben
|
23cfa8ec25
|
mine diamonds fix (have to mine 11 instead of 10)
|
2016-03-26 22:36:27 +00:00 |
|
Ben
|
f201898420
|
mine diamond fix
|
2016-03-26 22:35:06 +00:00 |
|
Shaun Bennett
|
970d5a307c
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-03-27 09:17:39 +11:00 |
|
Shaun Bennett
|
bace0b2557
|
Add Mining shop Location
|
2016-03-27 09:14:12 +11:00 |
|
Ben
|
9e0ba029b4
|
uhhh what
|
2016-03-26 22:10:19 +00:00 |
|
Shaun Bennett
|
caf8170a32
|
Tutorial Changes
|
2016-03-27 08:47:34 +11:00 |
|
Ben
|
a35bbeefdd
|
attack enemy goals
|
2016-03-25 12:38:01 +00:00 |
|
Ben
|
dade54e5fe
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-25 04:02:16 +00:00 |
|
Ben
|
195c990e29
|
further tutorial progress
|
2016-03-25 04:01:57 +00:00 |
|
Shaun Bennett
|
8c7d653cca
|
Store location for teleport home
|
2016-03-25 13:13:15 +11:00 |
|
Shaun Bennett
|
8afed30c5a
|
basic classes objectives
|
2016-03-25 13:07:53 +11:00 |
|
Ben
|
d23804be70
|
fixes for shaun
|
2016-03-25 01:33:55 +00:00 |
|
Ben
|
87b1bf7dd0
|
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
|
2016-03-25 01:30:46 +00:00 |
|
Ben
|
3cd7a5f12a
|
NPE fix for cannons and more
|
2016-03-25 01:29:55 +00:00 |
|
Shaun Bennett
|
c221e0e24f
|
Fix potatoes
|
2016-03-25 12:26:13 +11:00 |
|
Ben
|
17c214c282
|
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/ClanObjective.java
|
2016-03-25 00:08:28 +00:00 |
|
Ben
|
88b0ea1b72
|
tutorial progressss es
|
2016-03-25 00:06:51 +00:00 |
|
Shaun Bennett
|
d5a89dc7fe
|
Push for ben again
|
2016-03-25 11:05:05 +11:00 |
|
Shaun Bennett
|
7c06186a4f
|
Fix cleanup and setup
|
2016-03-25 09:42:41 +11:00 |
|
Shaun Bennett
|
628604c353
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-03-25 08:44:08 +11:00 |
|
Shaun Bennett
|
051539dbf6
|
Add cleanup and setup
|
2016-03-25 08:43:37 +11:00 |
|
Ben
|
af87dc9384
|
unsynchronized siege weapon support
|
2016-03-24 21:26:40 +00:00 |
|
Ben
|
c381cc8fd7
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-24 21:14:34 +00:00 |
|
Ben
|
cfb84dd545
|
fixes for shaun
|
2016-03-24 21:14:13 +00:00 |
|
Shaun Bennett
|
85511b4c26
|
Fixes for ben
|
2016-03-25 08:13:30 +11:00 |
|
Ben
|
f000360565
|
missing a few files
|
2016-03-24 19:29:45 +00:00 |
|
Ben
|
2ef604aeaf
|
attack enemy goal
|
2016-03-24 19:11:05 +00:00 |
|
Ben
|
7920f2729b
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-24 08:59:09 +00:00 |
|
Ben
|
2eb4d89875
|
i think clans ban is broken in this commit, and i removed some unnecessary spammy debug messages.
|
2016-03-24 08:58:48 +00:00 |
|
Shaun Bennett
|
4e26d2c7f1
|
Push code for ben
|
2016-03-24 19:37:56 +11:00 |
|
Shaun Bennett
|
2a89896084
|
Tutorial
|
2016-03-24 17:32:44 +11:00 |
|
Shaun Bennett
|
dbd9567abb
|
Tutorial work
|
2016-03-24 15:22:07 +11:00 |
|
Ben
|
2e41f906d0
|
moved completely to database managed clan blacklist, instead of the old hard-coded way
|
2016-03-21 22:37:35 +00:00 |
|
Ben
|
264e5d34b2
|
missing some files
|
2016-03-21 05:52:02 +00:00 |
|
Ben
|
723f62b8f9
|
incognito fixes and loads of other fixes
|
2016-03-20 01:06:46 +00:00 |
|
Ben
|
ef1d6ede24
|
many fixes
|
2016-03-19 06:31:37 +00:00 |
|
Ben
|
a21d43e58f
|
fix NPE
|
2016-03-19 06:13:39 +00:00 |
|
Ben
|
c4fbae4bd1
|
added clan name blacklist and changed clans ban GUI
|
2016-03-19 06:11:32 +00:00 |
|
Ben
|
6172be5d76
|
few changes
|
2016-03-19 00:13:31 +00:00 |
|
Ben
|
2e9562fc50
|
fixed NPE with one of the tutorial goals. fixed silent chest. fixed invsee, updated regions for new map
|
2016-03-18 22:31:36 +00:00 |
|
Ben
|
8c7da5e98a
|
some goals didn't commit
|
2016-03-18 03:01:42 +00:00 |
|
Ben
|
3ba138a8d7
|
some more objectives.
|
2016-03-18 03:01:11 +00:00 |
|
Ben
|
995d454f87
|
tutorial additions.
|
2016-03-18 02:47:51 +00:00 |
|
Ben
|
3b764920e1
|
duplicate messages
|
2016-03-18 01:22:15 +00:00 |
|
Ben
|
a4cbe54c78
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-18 01:21:25 +00:00 |
|
Ben
|
2cf59ced8b
|
new pvp timer management, fixed build house task, fixed incognito
|
2016-03-18 01:18:35 +00:00 |
|
Ben
|
a3db70ad9c
|
clear player inventory on tutorial start (and give map)
|
2016-03-17 09:44:03 +00:00 |
|
Ben
|
e6f4375041
|
build house goal [still broken]
|
2016-03-17 02:23:05 +00:00 |
|
Ben
|
929981419e
|
disable item dropping & block breaking
|
2016-03-17 01:52:36 +00:00 |
|
Ben
|
add651780b
|
priority chat filters, fixed siege weapon clicking listeners being incorrect
|
2016-03-17 01:06:07 +00:00 |
|
Ben
|
b164ff0729
|
Update res pack
|
2016-03-16 23:56:39 +00:00 |
|
Ben
|
1c1ed1613a
|
allow kill command while in void/after other damage methods
|
2016-03-16 23:56:30 +00:00 |
|
Ben
|
d625b20ea8
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
|
2016-03-16 22:48:04 +00:00 |
|
Ben
|
93767b7a90
|
tutorial changes, chat filter system, commented out all web stuff for analytics.
|
2016-03-16 22:46:18 +00:00 |
|
Ben
|
2c9021fb81
|
some chat formatting
|
2016-03-16 22:31:35 +00:00 |
|
Joseph Prezioso Jr
|
7cf49dbe3b
|
Refactored code to correct errors from previous commit
|
2016-03-15 20:46:30 -04:00 |
|
Joseph Prezioso Jr
|
5fdd3e0872
|
Updated North, South, East, and West Spawns and Centers
|
2016-03-15 20:12:09 -04:00 |
|
Ben
|
0d237370e1
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-15 23:33:09 +00:00 |
|
Ben
|
7589c63904
|
analytics progress
|
2016-03-15 23:32:56 +00:00 |
|
Ben
|
8897f2e86e
|
fixed NPE
|
2016-03-15 23:11:08 +00:00 |
|
Ben
|
4638ba909d
|
siege weapon finalizations & analytics (wip)
|
2016-03-15 22:52:13 +00:00 |
|
Shaun Bennett
|
4e85a315f9
|
Objectives!
|
2016-03-15 11:50:35 -05:00 |
|
Shaun Bennett
|
e53b8616d1
|
A ton of tutorial work
|
2016-03-15 10:29:43 -05:00 |
|
Ben
|
d7de4381a3
|
add 200ms damage delay to cannon damages. and add temporary damage holograms
|
2016-03-15 00:49:37 +00:00 |
|
Ben
|
13bbcc51dc
|
remove cannon pickup feature
|
2016-03-15 00:23:59 +00:00 |
|
Ben
|
3ae89e12a8
|
improve cannon UI
|
2016-03-15 00:21:37 +00:00 |
|
Ben
|
c556d7b3c3
|
fix ConcurrentModificationException
|
2016-03-15 00:21:15 +00:00 |
|
Ben
|
864b12adbf
|
make cannons explode chest items
|
2016-03-15 00:20:40 +00:00 |
|
Ben
|
e08ba29ac1
|
Final fixing of cannon saving/loading
|
2016-03-14 22:48:31 +00:00 |
|
Ben
|
422df69335
|
incognito async stuff and updated alpha holograms
|
2016-03-11 21:50:48 +00:00 |
|
Ben
|
bfdb7add2e
|
run siege weapon queries async
|
2016-03-11 21:04:22 +00:00 |
|
Ben
|
1008c58e91
|
removed catapult code as it's very out of date at this point (and it's not being used hehe)
|
2016-03-11 19:33:02 +00:00 |
|
Ben
|
eb0da6552c
|
add C.cBlue to name of Outposts & Cannons.
|
2016-03-11 19:31:24 +00:00 |
|
Ben
|
523c194c56
|
Fix data values not being correct in shop page.
|
2016-03-11 19:31:05 +00:00 |
|
Ben
|
d1c7879224
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-11 19:08:40 +00:00 |
|
Ben
|
45a0853564
|
remove test classes
|
2016-03-11 19:07:11 +00:00 |
|
Ben
|
86c50cc3cd
|
updates
|
2016-03-11 19:03:32 +00:00 |
|
Shaun Bennett
|
1228ca227e
|
Add support for 1.9 resource packs, Text Tutorials
|
2016-03-11 11:50:08 -06:00 |
|
Ben
|
2aa68d3e16
|
final stuff and map
|
2016-03-11 04:14:16 +00:00 |
|
Ben
|
0e276474c5
|
fixerroooniissssss
|
2016-03-11 02:20:18 +00:00 |
|
Ben
|
57c65cf5ff
|
some changes and vanish fixes maybe?
|
2016-03-11 01:47:14 +00:00 |
|
Ben
|
8ce32fcdfa
|
little tweakers
|
2016-03-11 00:58:47 +00:00 |
|
Ben
|
bcfe4a42c0
|
changerooonis
|
2016-03-11 00:41:28 +00:00 |
|
Ben
|
33d978c6d6
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-10 22:12:41 +00:00 |
|
Ben
|
20ade492a8
|
tnt generator changes
|
2016-03-10 22:09:45 +00:00 |
|
Shaun Bennett
|
76782fd420
|
Fix issues
|
2016-03-10 15:07:22 -06:00 |
|
Ben
|
c2f6217d9f
|
allowed sr. mods to use /we (TEMP)
|
2016-03-10 17:38:16 +00:00 |
|
Ben
|
0fd0a7fb44
|
mak esupply drop beacons more specific
|
2016-03-10 17:38:03 +00:00 |
|
Ben
|
2d2e88e069
|
some fixes and updates
|
2016-03-10 02:47:48 +00:00 |
|
Ben
|
9b40496a1e
|
siege weapon picking up
|
2016-03-09 23:56:25 +00:00 |
|
Ben
|
1532abcc62
|
disable nether and legendary fixes
|
2016-03-09 21:12:02 +00:00 |
|
Ben
|
70aa5d63fd
|
touched up on some messages
|
2016-03-09 13:10:39 +00:00 |
|
Ben
|
51e5552e2d
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-09 11:56:25 +00:00 |
|
Ben
|
cf6645cec7
|
Legendaries and other preparation for beta
|
2016-03-09 11:55:40 +00:00 |
|
phobia
|
e3fb40805c
|
all siege items shouldn't be able to be placed or used while on PvP timer.
Fixes to Jagged prefix
|
2016-03-09 22:46:45 +11:00 |
|
Ben
|
5b3da3d06f
|
Consistency. (Changed Vanish to Incognito)
|
2016-03-09 01:53:01 +00:00 |
|
Ben
|
befb27d3db
|
Finalized Vanish system
|
2016-03-09 01:45:17 +00:00 |
|
Joseph Prezioso Jr
|
ac91ba690c
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-08 16:08:14 -05:00 |
|
Joseph Prezioso Jr
|
b8f06374cd
|
Made changes to accommodate for Clan ELO's
|
2016-03-08 16:07:52 -05:00 |
|
Shaun Bennett
|
99c2fefed2
|
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-08 12:27:45 -06:00 |
|
Shaun Bennett
|
3283b873e7
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-03-08 12:19:28 -06:00 |
|
Ben
|
26b7ea2d59
|
fixes
|
2016-03-08 18:19:12 +00:00 |
|
Shaun Bennett
|
876a568bd0
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/OutpostRepository.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
|
2016-03-08 12:17:07 -06:00 |
|
Shaun Bennett
|
ffd9d98d2e
|
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-08 12:15:47 -06:00 |
|
Shaun Bennett
|
e39b3de237
|
Fix errors
|
2016-03-08 12:12:44 -06:00 |
|
Shaun Bennett
|
890a3f4bc9
|
Merge develop into clans/beta
|
2016-03-08 12:09:04 -06:00 |
|
Ben
|
d86ef81056
|
weaps oops
|
2016-03-08 01:11:16 +00:00 |
|
Ben
|
9953388b92
|
iunvseeeeeeeeeeee
|
2016-03-08 00:32:36 +00:00 |
|
Ben
|
48cfe4d91c
|
fixed & inv see?
|
2016-03-08 00:27:06 +00:00 |
|
NewGarbo
|
ae42aaaab1
|
Sammy changes + cleanup
|
2016-03-07 03:25:22 +00:00 |
|
NewGarbo
|
7e2086df1c
|
flash fix, rares update, and outpost fixes
|
2016-03-06 19:55:58 +00:00 |
|
NewGarbo
|
ae2da31544
|
Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-05 23:14:32 +00:00 |
|
NewGarbo
|
8cfbe20a08
|
re-added delay to /spawn
|
2016-03-05 23:09:57 +00:00 |
|
NewGarbo
|
d92f817efc
|
fixed some teleportation bugs and a bit of cleanup
|
2016-03-05 22:50:06 +00:00 |
|
NewGarbo
|
e88736c1aa
|
changes to scepter, NPE fix
|
2016-03-05 20:46:24 +00:00 |
|
NewGarbo
|
d79107eaaa
|
new legendary weapons and nether finzlizations
|
2016-03-05 03:07:25 +00:00 |
|
NewGarbo
|
7b9ff288f3
|
nether progresssisiannsnsssss
|
2016-03-03 23:23:20 +00:00 |
|
NewGarbo
|
73d8870daf
|
nether work (forgot to commit days ago oops)
|
2016-03-02 19:42:53 +00:00 |
|
NewGarbo
|
d524645ddd
|
placed the clan name hologram thingy correctly because it's inside the outpost!!!
|
2016-02-23 19:11:29 +00:00 |
|
NewGarbo
|
d65bf965c4
|
fix only some blocks of outpost being reset and explosion particles not showing up
|
2016-02-23 18:51:34 +00:00 |
|
NewGarbo
|
2956b18821
|
some hologram work
|
2016-02-23 18:45:04 +00:00 |
|
NewGarbo
|
879a211a41
|
change siege weapon damage indicator display length
|
2016-02-23 17:00:14 +00:00 |
|
NewGarbo
|
deb22fd4e7
|
add 'time till despawn' hologram on outposts and the owner clan of the outpopsts above doors
|
2016-02-23 16:54:07 +00:00 |
|
NewGarbo
|
205e3885b8
|
disallow players on pvp timer to use bows
|
2016-02-23 16:14:56 +00:00 |
|
NewGarbo
|
41e140d5ca
|
stop players from placing water in outposts
|
2016-02-23 16:07:12 +00:00 |
|
NewGarbo
|
bcd4480f23
|
stop recruits from opening trapped chests
|
2016-02-23 15:57:12 +00:00 |
|
NewGarbo
|
306e56980c
|
remove weapon teleport fix
|
2016-02-23 14:44:07 +00:00 |
|
NewGarbo
|
de4568d448
|
accurate-ish weapon damage tracking
|
2016-02-23 13:03:50 +00:00 |
|
NewGarbo
|
f0fc2fd519
|
progress [testing github]
|
2016-02-22 20:44:00 +00:00 |
|
Keir Nellyer
|
99150db2d7
|
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
|
2016-02-22 19:02:54 +00:00 |
|
NewGarbo
|
76cf65c267
|
siege system changes
|
2016-02-22 09:34:04 +00:00 |
|
NewGarbo
|
db7382d01e
|
testing github?
|
2016-02-21 01:34:13 +00:00 |
|
NewGarbo
|
67c355bf65
|
remove more eclipse files
|
2016-02-19 07:22:54 +00:00 |
|
NewGarbo
|
441cf702c7
|
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
|
2016-02-19 07:22:09 +00:00 |
|
NewGarbo
|
d5583b93f2
|
remove eclipse files
|
2016-02-19 07:14:13 +00:00 |
|
Shaun Bennett
|
7714e4960c
|
Use DBPool for everything
|
2016-02-19 00:17:38 -06:00 |
|
NewGarbo
|
dc5fe21f3d
|
more npe checking
|
2016-02-18 21:53:55 +00:00 |
|
NewGarbo
|
24b834370b
|
null pointers with siege weaponl oading
|
2016-02-18 21:37:13 +00:00 |
|
NewGarbo
|
8507bb1bd8
|
all progress over this week
|
2016-02-18 21:29:42 +00:00 |
|
NewGarbo
|
e25accfba4
|
outpost saving and loadi9ng
|
2016-02-15 11:24:29 +00:00 |
|
phobia
|
d7ad2cdc58
|
moar undead fixes
|
2016-02-14 12:37:37 +11:00 |
|
NewGarbo
|
93a5ca6777
|
weapons need to be centered
|
2016-02-14 00:45:54 +00:00 |
|
phobia
|
24254635a8
|
Fixes to observer settings
|
2016-02-14 09:51:59 +11:00 |
|
NewGarbo
|
e6eb43ada8
|
PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK
|
2016-02-12 19:58:40 +00:00 |
|
NewGarbo
|
90570c1185
|
progress on saving outposts/wepaons so far. not finished. probably going to change it to a different format
|
2016-02-12 07:00:21 +00:00 |
|
NewGarbo
|
67b12f3ae2
|
loads of progress
|
2016-02-10 19:24:57 +00:00 |
|
NewGarbo
|
b308d1759f
|
renamed stuff to more sensible stuff. :}
|
2016-02-10 13:02:55 +00:00 |
|
NewGarbo
|
2be917e623
|
give enemy info about time before siege and after outpost is built, the health of the outpost
|
2016-02-10 13:01:31 +00:00 |
|
NewGarbo
|
69bdbdde70
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-02-10 11:54:36 +00:00 |
|
NewGarbo
|
35f0162882
|
make catapults rideableeeeeee
|
2016-02-10 11:09:17 +00:00 |
|
NewGarbo
|
43cf4d38ef
|
give player arrow back after failed territory siege declaration arrow thingy fire thingy ehh grammar is not needed at night :}
|
2016-02-09 21:36:58 +00:00 |
|
NewGarbo
|
e74cefeee8
|
increased siege weapon placement area, and made outposts handle siege weapons that are placed within them
|
2016-02-09 19:59:01 +00:00 |
|
NewGarbo
|
e782097563
|
shouldn't be able to fire weapons whilst in siege wait time
|
2016-02-09 19:49:25 +00:00 |
|
NewGarbo
|
2b44b88ea2
|
not being able to fire bow without the correct class and changed arrow to actually be an arrow
|
2016-02-09 19:48:48 +00:00 |
|
NewGarbo
|
67d1bffe82
|
npe and clan minimum players set for siege
|
2016-02-09 19:47:42 +00:00 |
|
NewGarbo
|
9342bee371
|
das ist gut
|
2016-02-09 17:05:59 +00:00 |
|
NewGarbo
|
99ece6eaea
|
add chest with arrwos to outpost. test for clans in area
|
2016-02-09 05:53:37 +00:00 |
|
NewGarbo
|
dd2fe36a3d
|
added "Borderlands" to Clan name blacklist
|
2016-02-08 22:23:26 +00:00 |
|
NewGarbo
|
052d3c3380
|
siege system updates
|
2016-02-08 21:33:12 +00:00 |
|
NewGarbo
|
b8471d7a8e
|
getter for crater size
|
2016-02-08 20:46:15 +00:00 |
|
NewGarbo
|
3ee3059bc7
|
against clan needs to have a getter
|
2016-02-08 18:38:30 +00:00 |
|
NewGarbo
|
9379c4190a
|
add against clan to outpsots and also renamed "clan" to "owner" to make it more obvious
|
2016-02-08 18:31:03 +00:00 |
|
Shaun Bennett
|
4f5625d63e
|
Clans Alpha 1.0 changes
|
2016-02-05 18:42:22 -05:00 |
|
phobia
|
27e4ef784c
|
WP Evade
|
2016-02-06 08:44:37 +11:00 |
|
NewGarbo
|
9dc34b5a60
|
better damage calculation and fixed messages for siege weapon damaging
|
2016-02-05 19:12:12 +00:00 |
|
phobia
|
b0888208d1
|
More alphs bug fixes
|
2016-02-05 23:55:38 +11:00 |
|
NewGarbo
|
e448046e4f
|
made inv get cleared on fire
|
2016-02-05 10:40:53 +00:00 |
|
NewGarbo
|
bef898afc1
|
final fixes (? (still broken))
|
2016-02-05 01:01:10 +00:00 |
|
phobia
|
6291decf87
|
Fixes to flame and broadsword
|
2016-02-05 11:42:39 +11:00 |
|
NewGarbo
|
1b92871b93
|
remove annoying debug messages
|
2016-02-04 23:50:44 +00:00 |
|
NewGarbo
|
62d45d5419
|
fix flip starngesness
|
2016-02-04 23:49:02 +00:00 |
|
NewGarbo
|
f5d826a2cb
|
two parentheses. all it took to fix it. GRRR
|
2016-02-04 23:42:27 +00:00 |
|
NewGarbo
|
8c1ae12d19
|
beta stuff
|
2016-02-04 23:29:48 +00:00 |
|
phobia
|
73d4ff2639
|
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
|
2016-02-05 10:12:31 +11:00 |
|
phobia
|
6fd9cffb01
|
Clans alpha bug fixes
|
2016-02-05 10:12:18 +11:00 |
|
NewGarbo
|
16012285e0
|
rotation fix
|
2016-02-04 23:11:51 +00:00 |
|
NewGarbo
|
6c7d08a8f9
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
|
2016-02-04 22:55:53 +00:00 |
|
NewGarbo
|
e61b36f55c
|
Fixed /c stuck timer taking 7 seconds instead of 2 minutes
|
2016-02-04 22:55:37 +00:00 |
|
NewGarbo
|
03da4485b3
|
pushing to switch to clans/alpha
|
2016-02-04 22:54:43 +00:00 |
|
NewGarbo
|
bc19cf01f7
|
hopefully that fixes the location offset =/
|
2016-02-04 22:48:11 +00:00 |
|
NewGarbo
|
fa460dbd45
|
catapult rotatyyyy
|
2016-02-04 21:50:47 +00:00 |
|
NewGarbo
|
50c2da2a95
|
forgot to include this; version getter thingy in Clans
|
2016-02-04 16:10:14 +00:00 |
|
NewGarbo
|
5a8fae4974
|
stop catapult projectile from getting stuck on bounding box
|
2016-02-04 16:09:32 +00:00 |
|
NewGarbo
|
ecdd21a800
|
version or plugin command now shows version of clans
|
2016-02-04 16:09:13 +00:00 |
|
NewGarbo
|
b13494f399
|
more modifications to siege weapons.
|
2016-02-04 16:00:41 +00:00 |
|
NewGarbo
|
c17849b751
|
fixed some autoboxing stuff
|
2016-02-03 17:30:07 +00:00 |
|
NewGarbo
|
4e2da061bb
|
added protection around siege weapon
|
2016-02-03 17:07:06 +00:00 |
|
NewGarbo
|
4488b73e93
|
change catapult bounding box to 3
|
2016-02-03 17:02:31 +00:00 |
|
NewGarbo
|
0cb557d922
|
moved some stuff around and slight changes
|
2016-02-03 17:02:06 +00:00 |
|
NewGarbo
|
38cae1e3a2
|
catapult implemented using new siege weapon system, cannons polished up. not tested completely. don't expect this code to work fully haaha
|
2016-02-03 15:28:53 +00:00 |
|
NewGarbo
|
6bba486385
|
Added message if cannon is not loaded correctly
|
2016-02-03 11:20:11 +00:00 |
|
NewGarbo
|
d4388870c1
|
fixed inventory opening on mount
|
2016-02-03 11:19:33 +00:00 |
|
NewGarbo
|
8004d0dc3c
|
fixed npes
|
2016-02-03 11:06:58 +00:00 |
|
NewGarbo
|
95741e3029
|
fixed siege weapon base
|
2016-02-03 10:53:53 +00:00 |
|
phobia
|
5fd089c768
|
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
|
2016-02-03 17:43:43 +11:00 |
|
phobia
|
f011fdad5f
|
Fixes to TntProtection
|
2016-02-03 15:10:56 +11:00 |
|
phobia
|
0e0582a1a7
|
Added safe zone protection for flame
|
2016-02-03 10:39:21 +11:00 |
|
NewGarbo
|
9086188280
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-02-02 22:02:06 +00:00 |
|
NewGarbo
|
6fea76a8e4
|
finalized alpha patches
|
2016-02-02 21:38:38 +00:00 |
|
NewGarbo
|
23883148dd
|
alpha fixes
|
2016-02-02 20:55:23 +00:00 |
|
NewGarbo
|
cfbfb1fa3b
|
raised war points for invasion to 25
|
2016-02-02 20:42:20 +00:00 |
|
NewGarbo
|
9fa5927240
|
siege weapon base progress
|
2016-02-02 19:41:25 +00:00 |
|
phobia
|
59e564cdc6
|
Fixes to war point evasion
|
2016-02-02 23:18:05 +11:00 |
|
phobia
|
f1c49fa5ee
|
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
|
2016-02-02 22:13:38 +11:00 |
|
phobia
|
8a0f585432
|
Added fix to WarPoint evasion bug + 1 dmg bug
|
2016-02-02 22:11:52 +11:00 |
|
NewGarbo
|
84b887fe89
|
that's not needed
|
2016-02-01 19:53:59 +00:00 |
|
NewGarbo
|
b4ed912f7d
|
siege weapon modular system beginnings
|
2016-02-01 19:52:53 +00:00 |
|
NewGarbo
|
45aacd626e
|
this isn't used anymore
|
2016-01-31 19:20:15 +00:00 |
|
Keir Nellyer
|
9601eabfeb
|
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
|
2016-01-31 17:38:08 +00:00 |
|
NewGarbo
|
cc857da88e
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
|
2016-01-31 16:27:14 +00:00 |
|
NewGarbo
|
002be01ef1
|
MAVEN TEST COMMIT
|
2016-01-31 16:21:04 +00:00 |
|
phobia
|
9c83c64d01
|
Fixed issues with Broadsword
Added max building height of 100
|
2016-01-30 21:34:06 +11:00 |
|
phobia
|
4612550ba5
|
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
|
2016-01-30 19:24:42 +11:00 |
|
phobia
|
aa0cfc7710
|
Fixes to TnTGeneration
Fixes to Broadsword giving Generation and slowness 42 instead of 4
|
2016-01-30 19:23:59 +11:00 |
|
Shaun Bennett
|
c23855bd65
|
Merge with develop
|
2016-01-30 02:44:24 -05:00 |
|
Keir Nellyer
|
8cf32ef8bf
|
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
|
2016-01-30 00:46:43 +00:00 |
|
NewGarbo
|
fe01c9b8d5
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
|
2016-01-29 20:57:10 +00:00 |
|
NewGarbo
|
d10266c4d1
|
sapling fix
|
2016-01-29 20:56:38 +00:00 |
|
NewGarbo
|
7d28bc69c9
|
collision boxes on siege weapons and other stuff
|
2016-01-29 20:55:56 +00:00 |
|
NewGarbo
|
76dba421b4
|
sapling fix [THIS NEEDS TO GET PUT ONTO CLANS/ALPHA]
|
2016-01-29 20:54:31 +00:00 |
|
Shaun Bennett
|
1c3c800a66
|
Update fixes - @Teddy!
|
2016-01-29 14:05:09 -05:00 |
|
Shaun Bennett
|
50fc1f5a10
|
merge with develop
|
2016-01-29 03:44:04 -05:00 |
|
NewGarbo
|
7860ca24c8
|
disallow all staff from using /we
|
2016-01-28 23:33:06 +00:00 |
|
NewGarbo
|
f86262dc0e
|
catapult and cannon progress
|
2016-01-28 23:32:23 +00:00 |
|
NewGarbo
|
37fb656279
|
dispenser
|
2016-01-28 13:31:45 +00:00 |
|
NewGarbo
|
f645c4d6f8
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
|
2016-01-28 13:30:50 +00:00 |
|
NewGarbo
|
88c1391ba2
|
disallow sapling in dispensers (grrr working in two different branches is really strange)
|
2016-01-28 13:30:16 +00:00 |
|
NewGarbo
|
8cb5591218
|
merge conflicts
|
2016-01-28 13:28:39 +00:00 |
|
NewGarbo
|
a0cc0b7ec9
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java
|
2016-01-28 13:28:00 +00:00 |
|
NewGarbo
|
b5f04011e5
|
fixed chatslow not working + filter not working for players not in clan
|
2016-01-28 13:24:30 +00:00 |
|
NewGarbo
|
ceeeb3bc45
|
no tnt from dispensers
|
2016-01-28 10:58:46 +00:00 |
|
NewGarbo
|
682a243c31
|
fixed catapult state being mapped to incorrect blocks
|
2016-01-28 09:18:58 +00:00 |
|
Keir Nellyer
|
ac37417fca
|
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
# Conflicts:
# Plugins/.idea/modules.xml
|
2016-01-27 21:44:04 +00:00 |
|
Shaun Bennett
|
3d4cd9ee27
|
Fix tutorial command, add tutorial info to scoreboard, message manager, transitioning to a visual manager
|
2016-01-26 17:47:01 -06:00 |
|
NewGarbo
|
7f7e73a101
|
more catapults!
|
2016-01-26 21:10:58 +00:00 |
|
NewGarbo
|
3d7a371d1d
|
catapults
|
2016-01-26 20:18:53 +00:00 |
|
Shaun Bennett
|
155d8bff1b
|
Fix cannon angles
|
2016-01-26 13:36:30 -06:00 |
|
NewGarbo
|
63f9622876
|
cannon correctly loadded title + fixed rotation being all wrong
|
2016-01-26 17:51:29 +00:00 |
|
NewGarbo
|
7c85fe62ca
|
charred blocks updates
|
2016-01-26 17:36:12 +00:00 |
|
NewGarbo
|
2445e73623
|
better cannon crater particles
|
2016-01-26 13:06:47 +00:00 |
|
NewGarbo
|
3b18b93286
|
fixed top right slot in cannon not counting as an empty slot.
|
2016-01-26 09:26:51 +00:00 |
|
NewGarbo
|
467af4b835
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
|
2016-01-26 09:24:53 +00:00 |
|
NewGarbo
|
e68dea65e1
|
stop dispensers being used for flint-andsteal, bonemeal etc etc
|
2016-01-25 17:46:39 +00:00 |
|
NewGarbo
|
18e892c4ec
|
finally fixed that windblade dupe
|
2016-01-25 17:41:07 +00:00 |
|
NewGarbo
|
71bb1ed3d6
|
this is just really slowing down startup time by A LOT
|
2016-01-25 17:22:56 +00:00 |
|
NewGarbo
|
9d77632fcc
|
allow clans moderators to use /cb
|
2016-01-25 17:18:00 +00:00 |
|
NewGarbo
|
2bf2050844
|
increased sapling cooldown to 20 minutes from one second.
|
2016-01-25 17:13:53 +00:00 |
|
NewGarbo
|
7f1c74ced5
|
bumped version up to 0.19
|
2016-01-25 17:11:08 +00:00 |
|
NewGarbo
|
2b70daf8df
|
allowed clans mods to use /cban
|
2016-01-25 17:02:49 +00:00 |
|
NewGarbo
|
5a5dc9925e
|
set spawning rate of charred blocks a 10% lower
|
2016-01-25 17:02:26 +00:00 |
|
NewGarbo
|
208df93739
|
fixed fire particles not showing up in craters
|
2016-01-25 17:02:02 +00:00 |
|
NewGarbo
|
ce36cf79bf
|
added a tnt limit, set to 1 as it makes gameplay better
|
2016-01-25 17:01:46 +00:00 |
|
NewGarbo
|
9b88683fdc
|
fix cannon tnt exploding prematurely, added cooldown rather than using Recharge.
|
2016-01-25 17:00:38 +00:00 |
|
NewGarbo
|
fde5a5af28
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
|
2016-01-25 08:47:08 +00:00 |
|
NewGarbo
|
d82a7b353f
|
allow C.Mods to join all server regardless of home servers
|
2016-01-25 08:42:38 +00:00 |
|
NewGarbo
|
54fa1449f6
|
cannon crater changes
|
2016-01-25 08:40:59 +00:00 |
|
NewGarbo
|
c43c09fd3c
|
the cannons shouldn't explode instantly! also added fire effects to craters + clan tips when hopping on a cannon
|
2016-01-24 21:45:46 +00:00 |
|
NewGarbo
|
0252436990
|
cannons updates
|
2016-01-24 20:56:47 +00:00 |
|
NewGarbo
|
a41521d6a9
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/SafeLog.java
|
2016-01-23 13:42:25 +00:00 |
|
NewGarbo
|
1f7e1fb6cf
|
fix dupe bug and safelog
|
2016-01-23 13:40:49 +00:00 |
|
NewGarbo
|
24011c4af4
|
cannons work
|
2016-01-23 12:46:52 +00:00 |
|
NewGarbo
|
bf6f1a1701
|
sapling stuff messed up oops
|
2016-01-22 15:28:12 +00:00 |
|