Patrice Vignola af9d2d0942 Merge branch 'master' of https://github.com/ConjureETS/PillowFight ...

Conflicts:
	Assets/Scripts/AutoTarget.cs

2015-08-23 15:02:02 -04:00

..

UI_P1_0.png

Added the player avatars

2015-08-23 12:20:40 -04:00

UI_P1_0.png.meta

Added the player avatars

2015-08-23 12:20:40 -04:00

UI_P1_1.png

Added the player avatars

2015-08-23 12:20:40 -04:00

UI_P1_1.png.meta

Added the player avatars

2015-08-23 12:20:40 -04:00

UI_P1_2.png

Added the player avatars

2015-08-23 12:20:40 -04:00

UI_P1_2.png.meta

Added the player avatars

2015-08-23 12:20:40 -04:00

UI_P1_3.png

Added the player avatars

2015-08-23 12:20:40 -04:00

UI_P1_3.png.meta

Added the player avatars

2015-08-23 12:20:40 -04:00

UI_P1_4.png

Added the player avatars

2015-08-23 12:20:40 -04:00

UI_P1_4.png.meta

Added the player avatars

2015-08-23 12:20:40 -04:00

UI_P2_0.png

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

2015-08-23 15:02:02 -04:00

UI_P2_0.png.meta

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

2015-08-23 15:02:02 -04:00

UI_P2_1.png

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

2015-08-23 15:02:02 -04:00

UI_P2_1.png.meta

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

2015-08-23 15:02:02 -04:00

UI_P2_2.png

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

2015-08-23 15:02:02 -04:00

UI_P2_2.png.meta

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

2015-08-23 15:02:02 -04:00

UI_P2_3.png

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

2015-08-23 15:02:02 -04:00

UI_P2_3.png.meta

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

2015-08-23 15:02:02 -04:00

UI_P2_4.png

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

2015-08-23 15:02:02 -04:00

UI_P2_4.png.meta

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

2015-08-23 15:02:02 -04:00

UI_VictoireP2.png

Continued implementation of main menus

2015-08-23 14:06:03 -04:00

UI_VictoireP2.png.meta

Continued implementation of main menus

2015-08-23 14:06:03 -04:00