Evan Debenham 1592ceb6d8 Merge branch 'v0.2.1' of https://github.com/00-Evan/shattered-pixel-dungeon ...

Changes in v0.2.1c

Conflicts:
	src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java

Additionally:
   Improved challenge characteristics (now armor challenge removes the reward menu button, rather than giving cloth armor)

2014-10-21 09:52:56 -04:00

..

actors

Merge branch 'v0.2.1' of https://github.com/00-Evan/shattered-pixel-dungeon

2014-10-21 09:52:56 -04:00

effects

Merging Source v1.7.2: effects changes

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

items

Merging Source v1.7.2: item changes

2014-10-21 00:38:15 -04:00

levels

Merging Source v1.7.2: level changes

2014-10-20 22:55:37 -04:00

mechanics

V0.1.0 Partial Commit

2014-08-03 14:46:22 -04:00

plants

Merging Source v1.7.2: plant changes

2014-10-20 22:38:13 -04:00

scenes

Merge branch 'v0.2.1' of https://github.com/00-Evan/shattered-pixel-dungeon

2014-10-21 09:52:56 -04:00

sprites

Merging Source v1.7.2: corrected sleeping typo

2014-10-21 00:41:44 -04:00

ui

Merging Source v1.7.2: UI changes

2014-10-18 21:30:38 -04:00

utils

V0.1.0 Partial Commit

2014-08-03 14:46:22 -04:00

windows

Merging Source v1.7.2: window changes

2014-10-20 03:24:59 -04:00

Assets.java

Merging Source v1.7.2: top-level class changes

2014-10-17 02:16:42 -04:00

Badges.java

Merging Source v1.7.2: top-level class changes

2014-10-17 02:16:42 -04:00

Bones.java

V0.2.0: updated sprites, reworked some class hierarchies (probably adds some bugs!)

2014-08-24 23:55:10 -04:00

Challenges.java

Merging Source v1.7.2: top-level class changes

2014-10-17 02:16:42 -04:00

Chrome.java

Merging Source v1.7.2: top-level class changes

2014-10-17 02:16:42 -04:00

Dungeon.java

Merging Source v1.7.2: top-level class changes

2014-10-17 02:16:42 -04:00

DungeonTilemap.java

V0.1.0 Partial Commit

2014-08-03 14:46:22 -04:00

FogOfWar.java

V0.1.0 Partial Commit

2014-08-03 14:46:22 -04:00

GamesInProgress.java

Merging Source v1.7.2: top-level class changes

2014-10-17 02:16:42 -04:00

Journal.java

V0.1.0 Partial Commit

2014-08-03 14:46:22 -04:00

Preferences.java

Merging Source v1.7.2: top-level class changes

2014-10-17 02:16:42 -04:00

Rankings.java

V0.1.0 Partial Commit

2014-08-03 14:46:22 -04:00

ResultDescriptions.java

V0.2.0: fixed death interaction with Scroll of Psionic Blast

2014-08-30 02:25:52 -04:00

ShatteredPixelDungeon.java

Merging Source v1.7.2: main class changes

2014-10-18 04:55:31 -04:00

Statistics.java

V0.1.0 Partial Commit

2014-08-03 14:46:22 -04:00