Keir Nellyer
bce218a65e
Merge branch 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-04-30 23:11:35 +01:00
Keir Nellyer
6a00f26d5f
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
AlexTheCoder
70541fd6f2
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 05:41:24 -04:00
Jonathan Williams
477acf044e
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-22 04:34:21 -05:00
cnr
2d02d79cec
Fix survival games' Beastmaster wolf spawning
...
Beastmaster wolf spawning suffered from the same issue as the Wizards
"Summon Wolves" spell: spigot has an issue when setting an owner to a
wolf or ocelot without a previous owner. See SpigotUtil for details.
2016-04-20 18:45:54 -05:00
AlexTheCoder
d623d0982b
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge
2016-04-17 12:02:08 -04:00
AlexTheCoder
4c35e35fc0
- More polish and bugfixes
2016-04-16 23:59:44 -04:00
AlexTheCoder
33b557eb10
- Huuuuuuuge amount of changes for chiss
2016-04-14 22:45:21 -04:00
Ben
0a32eed15d
Fix Cannon TNT firing in the wrong direction and clean up the projectile code, making it more modular.
2016-04-15 00:43:55 +01:00
Ben
b313bc5308
Make undead chests not show the 'you are not permitted to use ender chest' messages.
2016-04-10 16:52:54 +01:00
Ben
37bb64bffd
Fix Undead Camps from spawning outside of the World Border.
2016-04-10 12:47:56 +01:00
Keir Nellyer
51b5e50c20
Use pre-existing util method for item building
...
Removes util method added in previous commit.
2016-04-09 00:44:00 +01:00
Ben
92195a12d2
Completely rework Cannon explosions to use the vanilla Minecraft explosions, as those seem to look much more visually appealing, and have less issues.
...
Fixed a loading and saving bug with Cannons, they seem to be a lot more stable now than before.
2016-04-09 00:37:20 +01:00
Keir Nellyer
56b0a886bf
Add helper method for setting common item meta values
2016-04-09 00:36:04 +01:00
Keir Nellyer
390b2878dc
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-07 14:28:30 +01: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
a1f284670a
make zombie npcs actually look at the player
2016-04-03 23:49:22 +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
phobia
d4e9f638da
Fixed a crash bug with title message being too long + other fixes
2016-04-02 22:26:21 +11:00
phobia
673dd327ff
Push for shaun Fireworks
2016-04-02 20:29:56 +11:00
Cheese
9969b7d783
support for resource packs for different MC versions
2016-04-02 11:39:40 +11: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
William Burns
2fcd809447
PC-34 - Effects/Particles when you blow up enemy
2016-03-29 18:03:28 +01:00
Ben
a175ead44a
finished tutorial!
2016-03-27 05:43:31 +01:00
Shaun Bennett
caf8170a32
Tutorial Changes
2016-03-27 08:47:34 +11:00
Ben
195c990e29
further tutorial progress
2016-03-25 04:01:57 +00:00
Shaun Bennett
051539dbf6
Add cleanup and setup
2016-03-25 08:43:37 +11:00
Shaun Bennett
85511b4c26
Fixes for ben
2016-03-25 08:13:30 +11:00
Ben
2ef604aeaf
attack enemy goal
2016-03-24 19:11:05 +00: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
Shaun Bennett
e8dcc4a3e2
Merge branch 'develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-03-23 11:02:20 +11:00
Ben
995d454f87
tutorial additions.
2016-03-18 02:47:51 +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
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
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
3ae89e12a8
improve cannon UI
2016-03-15 00:21:37 +00:00
Ben
e08ba29ac1
Final fixing of cannon saving/loading
2016-03-14 22:48:31 +00:00
Ben
bcfe4a42c0
changerooonis
2016-03-11 00:41:28 +00:00
Ben
20ade492a8
tnt generator changes
2016-03-10 22:09:45 +00:00
Ben
cf6645cec7
Legendaries and other preparation for beta
2016-03-09 11:55:40 +00:00
Ben
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
Joseph Prezioso Jr
19375e5720
callEvent now has a return type
2016-03-08 16:20:53 -05: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
