33b557eb10
- Huuuuuuuge amount of changes for chiss
2016-04-14 22:45:21 -04:00
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
b313bc5308
Make undead chests not show the 'you are not permitted to use ender chest' messages.
2016-04-10 16:52:54 +01:00
37bb64bffd
Fix Undead Camps from spawning outside of the World Border.
2016-04-10 12:47:56 +01:00
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
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
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
a1f284670a
make zombie npcs actually look at the player
2016-04-03 23:49:22 +01:00
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
c1b659e738
npcs on enemy base
2016-04-03 13:50:11 +01:00
d4e9f638da
Fixed a crash bug with title message being too long + other fixes
2016-04-02 22:26:21 +11:00
673dd327ff
Push for shaun Fireworks
2016-04-02 20:29:56 +11:00
9969b7d783
support for resource packs for different MC versions
2016-04-02 11:39:40 +11:00
0fd39e1300
missing event
2016-03-31 00:47:06 +01:00
36caf16c9a
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 00:03:12 +01:00
0f22c4359d
PC-19 - Remove World Event messages for players in Tutorial
2016-03-31 00:02:51 +01:00
2fcd809447
PC-34 - Effects/Particles when you blow up enemy
2016-03-29 18:03:28 +01:00
a175ead44a
finished tutorial!
2016-03-27 05:43:31 +01:00
caf8170a32
Tutorial Changes
2016-03-27 08:47:34 +11:00
195c990e29
further tutorial progress
2016-03-25 04:01:57 +00:00
051539dbf6
Add cleanup and setup
2016-03-25 08:43:37 +11:00
85511b4c26
Fixes for ben
2016-03-25 08:13:30 +11:00
2ef604aeaf
attack enemy goal
2016-03-24 19:11:05 +00:00
2a89896084
Tutorial
2016-03-24 17:32:44 +11:00
dbd9567abb
Tutorial work
2016-03-24 15:22:07 +11:00
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
995d454f87
tutorial additions.
2016-03-18 02:47:51 +00:00
93767b7a90
tutorial changes, chat filter system, commented out all web stuff for analytics.
2016-03-16 22:46:18 +00:00
0d237370e1
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-15 23:33:09 +00:00
4638ba909d
siege weapon finalizations & analytics (wip)
2016-03-15 22:52:13 +00:00
4e85a315f9
Objectives!
2016-03-15 11:50:35 -05:00
e53b8616d1
A ton of tutorial work
2016-03-15 10:29:43 -05:00
3ae89e12a8
improve cannon UI
2016-03-15 00:21:37 +00:00
e08ba29ac1
Final fixing of cannon saving/loading
2016-03-14 22:48:31 +00:00
bcfe4a42c0
changerooonis
2016-03-11 00:41:28 +00:00
20ade492a8
tnt generator changes
2016-03-10 22:09:45 +00:00
cf6645cec7
Legendaries and other preparation for beta
2016-03-09 11:55:40 +00:00
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
19375e5720
callEvent now has a return type
2016-03-08 16:20:53 -05:00
ac91ba690c
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 16:08:14 -05:00
b8f06374cd
Made changes to accommodate for Clan ELO's
2016-03-08 16:07:52 -05:00
97f5b60404
Merge github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 13:56:05 -05:00
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
3283b873e7
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-08 12:19:28 -06:00
26b7ea2d59
fixes
2016-03-08 18:19:12 +00:00
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
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
890a3f4bc9
Merge develop into clans/beta
2016-03-08 12:09:04 -06:00
f24e196efd
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-08 18:07:57 +00:00
0ff434cf91
progress
2016-03-08 16:49:32 +00:00
d86ef81056
weaps oops
2016-03-08 01:11:16 +00:00
263e3e7768
forgot to push
2016-03-08 01:07:35 +00:00
48cfe4d91c
fixed & inv see?
2016-03-08 00:27:06 +00:00
496983ee04
Untested bugfixes
2016-03-07 22:29:14 +13:00
ae42aaaab1
Sammy changes + cleanup
2016-03-07 03:25:22 +00:00
7e2086df1c
flash fix, rares update, and outpost fixes
2016-03-06 19:55:58 +00:00
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
e88736c1aa
changes to scepter, NPE fix
2016-03-05 20:46:24 +00:00
d79107eaaa
new legendary weapons and nether finzlizations
2016-03-05 03:07:25 +00:00
7b9ff288f3
nether progresssisiannsnsssss
2016-03-03 23:23:20 +00:00
6d0ca4f813
Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-03-03 13:49:31 +13:00
0ffa67dfb8
Ring game
2016-03-03 13:48:22 +13:00
b18f2d8682
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-03-02 20:02:09 +00:00
73d8870daf
nether work (forgot to commit days ago oops)
2016-03-02 19:42:53 +00:00
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
a3b7a3269c
Merge branch 'develop' into Dual_1.9
2016-03-01 15:14:59 -06:00
e4ba5d9723
Fix colour targeting FINALLY!
2016-02-25 19:48:15 +00:00
dead7a0850
Use a different method for targeting blocks.
2016-02-25 16:09:00 +00:00
a97409b64a
Adjust max distance for targeting.
2016-02-25 15:04:19 +00:00
2a9d49ccd9
Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:11:12 +13:00
2956b18821
some hologram work
2016-02-23 18:45:04 +00:00
41e140d5ca
stop players from placing water in outposts
2016-02-23 16:07:12 +00:00
f0fc2fd519
progress [testing github]
2016-02-22 20:44:00 +00:00
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
33b3d121b3
Merge branch 'develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatLovestruck.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSecretPackage.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHeart.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java
2016-02-20 15:30:26 +01:00
3b7a7e457c
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-20 03:20:27 -05:00
d3d22bbec9
Merge pull request #168 in MIN/mineplex from clans/alpha to develop
...
* commit '67c355bf652e9c802dc1e8e56b088c44cdaaac3b': (21 commits)
remove more eclipse files
remove eclipse files
moar undead fixes
Fixes to observer settings
Clans Alpha 1.0 changes
WP Evade
More alphs bug fixes
Fixes to flame and broadsword
Clans alpha bug fixes
Fixed /c stuck timer taking 7 seconds instead of 2 minutes
Fixes to TntProtection
Added safe zone protection for flame
finalized alpha patches
alpha fixes
raised war points for invasion to 25
Fixes to war point evasion
Added fix to WarPoint evasion bug + 1 dmg bug
that's not needed
MAVEN TEST COMMIT
Fixed issues with Broadsword Added max building height of 100
...
2016-02-19 01:30:09 -06:00
67c355bf65
remove more eclipse files
2016-02-19 07:22:54 +00:00
441cf702c7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-19 07:22:09 +00:00
c811906a7e
REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a)
2016-02-19 18:21:01 +11:00
d5583b93f2
remove eclipse files
2016-02-19 07:14:13 +00:00
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
8507bb1bd8
all progress over this week
2016-02-18 21:29:42 +00:00
8b1b63c8b3
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9
...
Conflicts:
Patches/craftbukkit.jar
2016-02-18 16:45:37 +13:00
7d8ffa1311
Small stuff
2016-02-15 16:38:18 +01:00
f6c38903f2
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-13 14:34:11 -05:00
197bcc9dbf
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
2016-02-12 21:23:58 -05:00
9595a0ffae
- Lot of stuff
2016-02-12 21:22:00 -05:00
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
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
d8965179f7
More valentines adjustments/fix gladiators tutorial being enabled
2016-02-11 23:01:59 -06:00
2eeddb828b
Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop
...
* commit '51d152d48473f820ab6d03586fb41f890750f645':
Perfect build all fix
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
Stop mid game joiners from getting participation gems.
Mob egg baby fix. Also fixed non build entities from being "broken"
spec command add guardian
The infamous look direction bounce bug
Chiss' double jump mechanic
Moar fixes
Hopper item pickup fix.
2016-02-11 22:59:35 -06:00
67b12f3ae2
loads of progress
2016-02-10 19:24:57 +00:00
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
35f0162882
make catapults rideableeeeeee
2016-02-10 11:09:17 +00:00
99ece6eaea
add chest with arrwos to outpost. test for clans in area
2016-02-09 05:53:37 +00:00
052d3c3380
siege system updates
2016-02-08 21:33:12 +00:00
2c13824f9b
possesive method in UtilText
2016-02-08 20:46:45 +00:00
c4da8ef636
Cosmetic Update
...
+ Set Storm
+ Set Shadow
+ Set Music
+ Set Emerald
+ Set Blood
+ Set Enchant
+ Particle Ying and Yang
+ Particle Wings Angel
+ Particle Wings Infernal
+ Particle Wings Pixie
+ Shape Utils
* Particle Party Time
* Particle Heart
* Double Jump Firecracker
2016-02-08 00:21:47 +01:00
008fc587b0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-07 15:33:37 -05:00
AlexTheCoder
Ben
Keir Nellyer
Shaun Bennett
phobia
Cheese
William Burns
Joseph Prezioso Jr
git
Keir Nellyer
xGamingDudex
md_5
Virizion