Shaun Bennett
27e214a643
Region fix
2015-11-26 16:12:29 -05:00
NewGarbo
dd33d9587d
made power recharge a tad faster with Wind Blade
2015-11-26 21:12:09 +00:00
NewGarbo
0aaee24600
fixed gear UI display stuff incorrectly
2015-11-26 21:06:33 +00:00
NewGarbo
bb3ea0115d
fixed classes not loading
2015-11-26 20:41:42 +00:00
NewGarbo
67a28a94fb
bunch of fixes
2015-11-26 20:32:01 +00:00
NewGarbo
2bce722539
some code polishing. fixed some mispositioning with Spawn holograms.
2015-11-26 13:29:40 +00:00
NewGarbo
e5fa59b8da
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-26 13:17:28 +00:00
NewGarbo
009ddaaee1
stop players in tutorial from receiving/sending chat.
2015-11-26 13:16:50 +00:00
NewGarbo
bbfd319bcd
Spawn holograms
2015-11-26 13:14:10 +00:00
NewGarbo
1ce2a362c6
disallow item frames being rotated in Spawn
2015-11-26 12:34:12 +00:00
NewGarbo
be19c17fee
fixed gem -> gold conversion rate
2015-11-26 12:33:29 +00:00
NewGarbo
9aaad0b4a1
fixed formatting in /spawn command
2015-11-26 12:31:55 +00:00
Shaun Bennett
bdc08676d9
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
2015-11-26 03:34:33 -05:00
Shaun Bennett
d4f3786b1c
Fixes
2015-11-26 03:31:03 -05:00
NewGarbo
94a0f3244d
corrected typo in WindBlade.java
2015-11-26 07:53:37 +00:00
NewGarbo
af0df835b8
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
2015-11-26 07:52:35 +00:00
NewGarbo
97e903f403
updated regions
2015-11-26 07:51:10 +00:00
Shaun Bennett
75ff5bb3da
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 02:46:56 -05:00
NewGarbo
56d5c10481
oops util ent new method didn't commit in last commit
2015-11-26 07:29:59 +00:00
NewGarbo
c0cfdf9785
fixed windblade not recharging whilst jumping
2015-11-26 07:29:39 +00:00
NewGarbo
e80c1097b5
corrected regions
2015-11-26 07:08:30 +00:00
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
