6 commits

Author	SHA1	Message	Date
sOlaris38	b103671109		2020-12-05 13:31:48 +01:00
sOlaris38	4bfd9c8491	Merge branch 'master' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git ... Conflicts: objects/oPlayer/Step_0.gml objects/oPlayer/oPlayer.yy sprites/Purple/Purple.yy sprites/sSword/sSword.yy	2020-12-05 12:56:55 +01:00
sOlaris38	652d9e66ff		2020-12-05 12:50:56 +01:00
Valsept	219052f07c	sword	2020-12-05 12:45:29 +01:00
rick	5b90d5529c	Test modif	2020-12-04 22:22:43 +01:00
Valsept	798ebb3246	Purple rain	2020-12-04 22:18:23 +01:00