Magic_Ling_Pixel_Dungeon/src/com/shatteredpixel/shatteredpixeldungeon
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
..
actors Merge remote-tracking branch 'origin/master' 2014-10-30 20:00:53 -04:00
effects Merging Source v1.7.2: effects changes 2014-10-20 23:00:20 -04:00
items v0.2.2: further tweaks to heroes remains system 2014-10-30 11:16:19 -04:00
levels v0.2.2: gave heroes remains a unique heap type & sprite 2014-10-30 10:02:25 -04:00
mechanics V0.1.0 Partial Commit 2014-08-03 14:46:22 -04:00
plants v0.2.2: improved stormvine description 2014-10-30 16:27:41 -04:00
scenes v0.2.2: falling items now appear on the next depth (potions shatter) 2014-10-21 20:47:40 -04:00
sprites v0.2.2: gave heroes remains a unique heap type & sprite 2014-10-30 10:02:25 -04:00
ui v0.2.2: gave heroes remains a unique heap type & sprite 2014-10-30 10:02:25 -04:00
utils V0.1.0 Partial Commit 2014-08-03 14:46:22 -04:00
windows v0.2.2: tweaked spacing on blob cell info 2014-10-30 16:30: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.2: further tweaks to heroes remains system 2014-10-30 11:16:19 -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 v0.2.2: Implemented new potion of levitation functionality into falling potions 2014-10-26 04:21:39 -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