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
|
813a3833ae
|
implement temporary holograms
|
2016-03-15 00:48:50 +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
|
bdfb55d4e1
|
nevermind [revert leap change]
|
2016-03-11 21:22:01 +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
|
a27fb90c2a
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
|
2016-03-11 02:21:03 +00:00 |
|
Ben
|
0e276474c5
|
fixerroooniissssss
|
2016-03-11 02:20:18 +00:00 |
|
Ben
|
01ba099d74
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
|
2016-03-11 01:52:38 +00:00 |
|
Ben
|
c9eb2c9559
|
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
|
2016-03-11 01:52:31 +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
|
bcd250cf25
|
gitingore
|
2016-03-11 00:48:56 +00:00 |
|
Ben
|
8ec3542c1d
|
update .gitingore
|
2016-03-11 00:45:02 +00:00 |
|
Ben
|
a568db6d90
|
remove eclipse file
|
2016-03-11 00:43:30 +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 |
git
|
557b0bf978
|
Fix Wither disguise
|
2016-03-11 01:55:49 +13: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 |
|
Joseph Prezioso Jr
|
4955abb519
|
Hopefully, ELO Rating will be grabbed from the correct column now...
|
2016-03-09 17:12:04 -05: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 |