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
Joseph Prezioso Jr
97f5b60404
Merge github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 13:56:05 -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
890a3f4bc9
Merge develop into clans/beta
2016-03-08 12:09:04 -06:00
Ben
f24e196efd
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-08 18:07:57 +00:00
Ben
0ff434cf91
progress
2016-03-08 16:49:32 +00:00
Ben
d86ef81056
weaps oops
2016-03-08 01:11:16 +00:00
Ben
263e3e7768
forgot to push
2016-03-08 01:07:35 +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
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
Shaun Bennett
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
Shaun Bennett
a3b7a3269c
Merge branch 'develop' into Dual_1.9
2016-03-01 15:14:59 -06:00
William Burns
e4ba5d9723
Fix colour targeting FINALLY!
2016-02-25 19:48:15 +00:00
William Burns
dead7a0850
Use a different method for targeting blocks.
2016-02-25 16:09:00 +00:00
William Burns
a97409b64a
Adjust max distance for targeting.
2016-02-25 15:04:19 +00:00
git
2a9d49ccd9
Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:11:12 +13:00
NewGarbo
2956b18821
some hologram work
2016-02-23 18:45:04 +00:00
NewGarbo
41e140d5ca
stop players from placing water in outposts
2016-02-23 16:07:12 +00:00
NewGarbo
f0fc2fd519
progress [testing github]
2016-02-22 20:44:00 +00:00
Shaun Bennett
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
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
md_5
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
NewGarbo
d5583b93f2
remove eclipse files
2016-02-19 07:14:13 +00:00
md_5
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
NewGarbo
8507bb1bd8
all progress over this week
2016-02-18 21:29:42 +00:00