Sophie e11989f2c3 Merge branch 'master' of https://github.com/ConjureETS/DeathBook ...

Conflicts:
	Assets/Scenes/UiTweaking.unity

2015-08-16 07:19:35 -04:00

..

Materials

Merge branch 'master' of https://github.com/ConjureETS/DeathBook

2015-08-16 07:19:35 -04:00

ProfilePictures

- Added the friendship in the UI

2015-08-14 19:25:46 -04:00

gravestoneBubble.png

UiTweaking + assets

2015-08-16 01:06:26 -04:00

gravestoneBubble.png.meta

UiTweaking + assets

2015-08-16 01:06:26 -04:00

Materials.meta

person graphical node: awareness color code, online/offline visuals

2015-08-13 19:52:52 -04:00

ProfilePictures.meta

- Added 185 male and 185 female pictures

2015-08-14 17:25:18 -04:00

skullLogo.png

UiTweaking + assets

2015-08-16 01:06:26 -04:00

skullLogo.png.meta

Merge branch 'master' of https://github.com/ConjureETS/DeathBook

2015-08-16 07:19:35 -04:00

slaughterLogo.png

Merge branch 'master' of https://github.com/ConjureETS/DeathBook

2015-08-16 07:19:35 -04:00

slaughterLogo.png.meta

Merge branch 'master' of https://github.com/ConjureETS/DeathBook

2015-08-16 07:19:35 -04:00

splash.png

Merge branch 'master' of https://github.com/ConjureETS/DeathBook

2015-08-16 07:19:35 -04:00

splash.png.meta

Merge branch 'master' of https://github.com/ConjureETS/DeathBook

2015-08-16 07:19:35 -04:00