4 Commits

Author SHA1 Message Date
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
RosimInc
495e1dd259 Continued implementation of main menus
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-23 14:06:03 -04:00
RosimInc
27efaae69b Added the player avatars
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-23 12:20:40 -04:00
RosimInc
6092b51b67 Added UI assets and started the menus
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-23 03:44:25 -04:00