NewGarbo
0d43ffc7b2
fixessss
2015-11-26 06:54:49 +00:00
Shaun Bennett
6de7b8a73e
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 01:46:43 -05:00
NewGarbo
972a2d151a
simplified combat log npc title
2015-11-26 06:21:01 +00:00
NewGarbo
f92849f796
that doesn't do what i thought it did
2015-11-26 05:32:59 +00:00
NewGarbo
1e4b6b4d0f
fixed formatting error in clan tip
2015-11-26 05:30:13 +00:00
NewGarbo
7da8b8e3bf
fix players hurting each other in safe zones
2015-11-26 05:29:35 +00:00
NewGarbo
48ebfc219d
removed travel npcs from shops
2015-11-26 05:24:33 +00:00
Shaun Bennett
389956240b
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 00:20:41 -05:00
NewGarbo
76d009e0de
Unstuck (Spawn) command
2015-11-26 05:18:18 +00:00
NewGarbo
33cdd5400d
fixed some coloring issues
2015-11-26 04:32:41 +00:00
Cheese
193c5fe487
fixed static
2015-11-26 15:26:57 +11:00
Shaun Bennett
8f14c8beae
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
2015-11-25 23:26:29 -05:00
Shaun Bennett
7a663b4f7b
Fix legendaries
2015-11-25 23:24:07 -05:00
NewGarbo
8bd1f4b3c8
reduced hyper axe damage. OP as heck
2015-11-26 04:21:30 +00:00
NewGarbo
abcee009dd
stuff
2015-11-26 04:07:33 +00:00
Cheese
059a9a32cd
fixed method
2015-11-26 14:51:45 +11:00
Cheese
83a7b398bc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-26 14:47:24 +11:00
Cheese
1a5dbc073d
recursive block find method
2015-11-26 14:47:01 +11:00
NewGarbo
670afc17ef
clans chat is being weird
2015-11-26 03:26:15 +00:00
NewGarbo
5230b25dfd
fixed suicide command (?)
2015-11-26 03:24:48 +00:00
NewGarbo
4f275d79fa
fixed staff tags only displaying if player is in clan
2015-11-26 03:19:40 +00:00
NewGarbo
5fb58b1dad
added suicide command
2015-11-26 03:17:05 +00:00
NewGarbo
8a64a2f4ce
fixed world events spawning floating on grass and other boundless blocks
2015-11-26 03:06:27 +00:00
NewGarbo
b43cf0b28a
got rid of enchanted effect on rare items
2015-11-26 03:00:59 +00:00
libraryaddict
55ff04ca93
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-26 15:49:54 +13:00
libraryaddict
3e8a53562e
Add new hologram interaction thingy so holograms can catch interactions that they would normally block
2015-11-26 15:49:28 +13:00
NewGarbo
7e23f896ca
changes
2015-11-26 02:49:01 +00:00
Cheese
55f5f95869
added no ammo display
2015-11-26 13:05:27 +11:00
Cheese
65a1441e1f
-Fixed smoke being removed when bomb was planted in it
...
-Fixed being unable to defuse bomb in smoke
-Fixed older smokes removing newer intersecting smokes
-Grenades will still detonate after being burned
-Bizon now gives $600 per kill
-Added replacement smoke on gun fire
-Added shell ejecting particles on gun fire
-Removed gun bobbing when firing
-Changed ammo display location
2015-11-26 12:56:26 +11:00
NewGarbo
a19ade0739
rain rain go away
2015-11-26 00:53:01 +00:00
NewGarbo
11deec75dd
fixed illusion
2015-11-26 00:44:13 +00:00
Shaun Bennett
c150ea6175
Potatoes and Tornadoes
2015-11-25 19:08:13 -05:00
Shaun Bennett
cc75bafb4c
Bugs and thugs
2015-11-25 16:45:04 -05:00
Shaun Bennett
1306137cb2
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-25 14:51:00 -05:00
Shaun Bennett
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
NewGarbo
c5211e0368
buuugs
2015-11-25 17:40:12 +00:00
NewGarbo
9a8fba543d
auto-replanting trees
2015-11-25 17:03:48 +00:00
NewGarbo
2adfef41ca
bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 )
2015-11-25 16:46:53 +00:00
xGamingDudex
84fde1c087
Fixed double jump and entity ground tool.
...
Fixed isGrounded so that it doesn't return false positives when too
close to a wall.
Added 500ms recharge to double jump, preventing instant recharge
allowing players to jump twice before having to touch the ground again.
2015-11-25 16:42:32 +01:00
xGamingDudex
3b89d65a09
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
2015-11-25 15:59:18 +01:00
Cheese
f668ae6082
ms smoke
2015-11-25 17:49:18 +11:00
Cheese
360f3db2ed
fixed grenade vertical rebound bug
2015-11-25 17:48:32 +11:00
Cheese
8ceb6ccfca
minestrike update!
2015-11-25 17:41:00 +11:00
NewGarbo
7e9dc7968e
gear gui fixes and legendaries changes
2015-11-25 01:32:05 +00:00
NewGarbo
bbdbb209c5
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-25 00:55:37 +00:00
NewGarbo
3a6dab7224
stuff
2015-11-25 00:55:11 +00:00
NewGarbo
3cb22c8cb7
uuid bug fixed finally!
2015-11-25 00:47:35 +00:00
libraryaddict
ecf42803f9
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-11-25 13:42:31 +13:00
libraryaddict
ca81265b9e
Readded PacketHandler debug message
2015-11-25 13:42:11 +13:00
NewGarbo
aa52c1be27
custom item stuff
2015-11-25 00:14:34 +00:00
