This repository was archived by the owner on Mar 24, 2022. It is now read-only.

Commit af8b82f

committed

Merge remote-tracking branch 'origin/master'

# Conflicts: # Assets/ScreenSpace/FizzleFade/README.md

2 parents ba435ab + c3e65fe commit af8b82fCopy full SHA for af8b82f

File tree

+11

-26

lines changed

+11

-26

lines changed

Lines changed: 11 additions & 26 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,22 @@`
`1`	`1`	`# FizzleFade`
	`2`	`+<<<<<<< HEAD`
`2`	`3`	`![FizzleFade demo image](./readme-image.jpg)`
	`4`	`+=======`
	`5`	`+>>>>>>> origin/master`
`3`	`6`
`4`	`7`	`### Description`
`5`		`-Hello, I am a description which should be replaced so. Please replace me.`
`6`		`-`
`7`		`-#### Included:`
`8`		`-* Some stuff`
`9`		`-* Other stuff`
`10`		`-* Things`
`11`		`-`
`12`		`-#### Todo:`
`13`		`-* Everything`
	`8`	`+Fizzlefade is from Wolfenstein 3D.`
`14`	`9`
`15`	`10`	`### Supported aspect ratios`
`16`		`-* 5:4 ❓`
`17`		`-* 4:3 ❓`
`18`		`-* 3:2 ❓`
`19`		`-* 16:10 ❓`
`20`		`-* 16:9 ❓`
	`11`	`+* 5:4 ✅`
	`12`	`+* 4:3 ✅`
	`13`	`+* 3:2 ✅`
	`14`	`+* 16:10 ✅`
	`15`	`+* 16:9 ✅`
`21`	`16`
`22`	`17`	`### Supported Platforms`
`23`		`-* Editor ❓`
`24`		`-* Standalone ❓`
	`18`	`+* Editor ✅`
	`19`	`+* Standalone ✅`
`25`	`20`	`* UWP ❓`
`26`	`21`
`27`	`22`	`Mobile`
`@@ -32,13 +27,3 @@ Hello, I am a description which should be replaced so. Please replace me.`
`32`	`27`	`* Xbox One ❓`
`33`	`28`	`* PS4 ❓`
`34`	`29`
`35`		`-### Parameters`
`36`		`-* Class`
`37`		`- * Field - This is a field description.`
`38`		`- * SubClass Position`
`39`		`- * Field - This is a field description.`
`40`		`- * Field - This is a field description.`
`41`		`- * SubClass`
`42`		`- * Field - This is a field description.`
`43`		`- * Field - This is a field description.`
`44`		`-`

Comments

(0)