Evan Debenham 9d19a785ba Merge remote-tracking branch 'origin/master' ...

Conflicts:
	src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java

2014-10-30 20:00:53 -04:00

..

blobs

Merge remote-tracking branch 'origin/master'

2014-10-30 20:00:53 -04:00

buffs

Merge remote-tracking branch 'origin/master'

2014-10-30 20:00:53 -04:00

hero

v0.2.2: gave heroes remains a unique heap type & sprite

2014-10-30 10:02:25 -04:00

mobs

v0.2.2: refactored fetid rat immunity to stench gas

2014-10-27 10:34:15 -04:00

Actor.java

Merging Source v1.7.2: actor changes

2014-10-20 23:51:15 -04:00

Char.java

Merging Source v1.7.2: actor changes

2014-10-20 23:51:15 -04:00