e211fe182d
Adjust gem conversion rate
2015-11-27 01:06:53 -05:00
c33eea28a2
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 06:05:39 +00:00
a9669ade31
Immolate fix hopefully
2015-11-27 06:05:22 +00:00
0aeca96746
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-27 01:05:16 -05:00
32c17cad7e
Shop price changes
2015-11-27 01:04:51 -05:00
77be81c216
pet changes
2015-11-27 16:50:22 +11:00
2b047cdde8
more titan stuff
2015-11-27 16:46:48 +11:00
9082ace3f3
wind blade fall damage
2015-11-27 05:46:37 +00:00
20a9ed5a6e
staff not being able to join fix
2015-11-27 05:13:47 +00:00
f81d1d390a
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 05:04:46 +00:00
b22c766c94
more clans modificatons
2015-11-27 05:04:24 +00:00
05e7183b65
titan stuff update
2015-11-27 15:55:00 +11:00
a46bed53fa
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 23:42:22 -05:00
31f083387d
Use Castle icon on travel page
2015-11-26 23:42:16 -05:00
174825776b
meow clams
2015-11-27 04:39:04 +00:00
9dcc048953
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 04:23:14 +00:00
6119500b68
changes
2015-11-27 04:23:02 +00:00
faaa1fcf0b
Use castle clan icon for /c <clan>
2015-11-26 23:15:14 -05:00
5744178286
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-27 04:06:02 +00:00
dbda29e3f3
magnetic maul fixes
2015-11-27 04:05:47 +00:00
73f4450fa3
clans fixes
2015-11-27 04:04:29 +00:00
ef511f1704
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 22:38:03 -05:00
6da10950da
Update clan icons, fix client class
2015-11-26 22:37:54 -05:00
0274bf2847
loads of changes.
2015-11-27 03:28:19 +00:00
3c98243201
Some more guardian stuff
2015-11-27 15:56:56 +13:00
0a4416381b
Fix guardian
2015-11-27 15:55:02 +13:00
98d988584d
titan cosmetics
2015-11-27 13:35:25 +11:00
e849484670
bunch of changes and fixes and bugs and stuff and things
2015-11-26 23:59:47 +00:00
055702b36e
changes and fixes and woo
2015-11-26 23:08:33 +00:00
56d4b34969
fixed formatting on death notices.
...
Made world event middle texts longer lasting.
Fixed logout NPC timer
2015-11-26 21:57:26 +00:00
5393d1d18c
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-26 21:16:21 +00:00
6e416b1059
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 16:12:54 -05:00
27e214a643
Region fix
2015-11-26 16:12:29 -05:00
dd33d9587d
made power recharge a tad faster with Wind Blade
2015-11-26 21:12:09 +00:00
0aaee24600
fixed gear UI display stuff incorrectly
2015-11-26 21:06:33 +00:00
bb3ea0115d
fixed classes not loading
2015-11-26 20:41:42 +00:00
67a28a94fb
bunch of fixes
2015-11-26 20:32:01 +00:00
2bce722539
some code polishing. fixed some mispositioning with Spawn holograms.
2015-11-26 13:29:40 +00:00
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
009ddaaee1
stop players in tutorial from receiving/sending chat.
2015-11-26 13:16:50 +00:00
bbfd319bcd
Spawn holograms
2015-11-26 13:14:10 +00:00
1ce2a362c6
disallow item frames being rotated in Spawn
2015-11-26 12:34:12 +00:00
be19c17fee
fixed gem -> gold conversion rate
2015-11-26 12:33:29 +00:00
9aaad0b4a1
fixed formatting in /spawn command
2015-11-26 12:31:55 +00:00
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
d4f3786b1c
Fixes
2015-11-26 03:31:03 -05:00
94a0f3244d
corrected typo in WindBlade.java
2015-11-26 07:53:37 +00:00
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
97e903f403
updated regions
2015-11-26 07:51:10 +00:00
75ff5bb3da
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 02:46:56 -05:00
56d5c10481
oops util ent new method didn't commit in last commit
2015-11-26 07:29:59 +00:00
c0cfdf9785
fixed windblade not recharging whilst jumping
2015-11-26 07:29:39 +00:00
e80c1097b5
corrected regions
2015-11-26 07:08:30 +00:00
0d43ffc7b2
fixessss
2015-11-26 06:54:49 +00:00
6de7b8a73e
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 01:46:43 -05:00
972a2d151a
simplified combat log npc title
2015-11-26 06:21:01 +00:00
f92849f796
that doesn't do what i thought it did
2015-11-26 05:32:59 +00:00
1e4b6b4d0f
fixed formatting error in clan tip
2015-11-26 05:30:13 +00:00
7da8b8e3bf
fix players hurting each other in safe zones
2015-11-26 05:29:35 +00:00
48ebfc219d
removed travel npcs from shops
2015-11-26 05:24:33 +00:00
389956240b
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 00:20:41 -05:00
76d009e0de
Unstuck (Spawn) command
2015-11-26 05:18:18 +00:00
33cdd5400d
fixed some coloring issues
2015-11-26 04:32:41 +00:00
193c5fe487
fixed static
2015-11-26 15:26:57 +11:00
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
7a663b4f7b
Fix legendaries
2015-11-25 23:24:07 -05:00
8bd1f4b3c8
reduced hyper axe damage. OP as heck
2015-11-26 04:21:30 +00:00
abcee009dd
stuff
2015-11-26 04:07:33 +00:00
059a9a32cd
fixed method
2015-11-26 14:51:45 +11:00
83a7b398bc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-26 14:47:24 +11:00
1a5dbc073d
recursive block find method
2015-11-26 14:47:01 +11:00
670afc17ef
clans chat is being weird
2015-11-26 03:26:15 +00:00
5230b25dfd
fixed suicide command (?)
2015-11-26 03:24:48 +00:00
4f275d79fa
fixed staff tags only displaying if player is in clan
2015-11-26 03:19:40 +00:00
5fb58b1dad
added suicide command
2015-11-26 03:17:05 +00:00
8a64a2f4ce
fixed world events spawning floating on grass and other boundless blocks
2015-11-26 03:06:27 +00:00
b43cf0b28a
got rid of enchanted effect on rare items
2015-11-26 03:00:59 +00:00
55ff04ca93
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-26 15:49:54 +13:00
3e8a53562e
Add new hologram interaction thingy so holograms can catch interactions that they would normally block
2015-11-26 15:49:28 +13:00
7e23f896ca
changes
2015-11-26 02:49:01 +00:00
55f5f95869
added no ammo display
2015-11-26 13:05:27 +11:00
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
a19ade0739
rain rain go away
2015-11-26 00:53:01 +00:00
11deec75dd
fixed illusion
2015-11-26 00:44:13 +00:00
c150ea6175
Potatoes and Tornadoes
2015-11-25 19:08:13 -05:00
cc75bafb4c
Bugs and thugs
2015-11-25 16:45:04 -05:00
1306137cb2
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-25 14:51:00 -05:00
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
c5211e0368
buuugs
2015-11-25 17:40:12 +00:00
9a8fba543d
auto-replanting trees
2015-11-25 17:03:48 +00:00
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
360f3db2ed
fixed grenade vertical rebound bug
2015-11-25 17:48:32 +11:00
8ceb6ccfca
minestrike update!
2015-11-25 17:41:00 +11:00
7e9dc7968e
gear gui fixes and legendaries changes
2015-11-25 01:32:05 +00:00
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
3a6dab7224
stuff
2015-11-25 00:55:11 +00:00
3cb22c8cb7
uuid bug fixed finally!
2015-11-25 00:47:35 +00:00
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
ca81265b9e
Readded PacketHandler debug message
2015-11-25 13:42:11 +13:00
aa52c1be27
custom item stuff
2015-11-25 00:14:34 +00:00
Shaun Bennett
NewGarbo
Cheese
libraryaddict
Shaun Bennett