Merge branch 'adding-player-object' into 'experimental'

Adding player object See merge request zolfite/project-rpg!2
Merge branch 'setting-character-sprite' into 'experimental'
2018-01-24 13:13:46 +00:00 · 2018-01-23 12:59:02 +00:00
4 changed files with 2 additions and 2 deletions
--- a/res/background.png
+++ b/res/background.png
--- a/main.go
+++ b/main.go
@ -39,13 +39,13 @@ func run() {
 		panic(err)
 	}

-	spritesheet, err := loadPicture("res/sprites.png")
+	spritesheet, err := loadPicture("sprites.png")
 	if err != nil {
 		panic(err)
 	}
 	//batch := pixel.NewBatch(&pixel.TrianglesData{}, spritesheet)

-	background, err := loadPicture("res/background.png")
+	background, err := loadPicture("background.png")

 	if err != nil {
 		panic(err)
--- a/res/tileSpriteSheet.png
+++ b/res/tileSpriteSheet.png
--- a/res/sprites.png
+++ b/res/sprites.png
Author	SHA1	Message	Date
Mollusk	b8c882a646	Merge branch 'adding-player-object' into 'experimental' Adding player object See merge request zolfite/project-rpg!2	2018-01-24 13:13:46 +00:00
Mollusk	d06a0c85b3	Merge branch 'setting-character-sprite' into 'experimental' Setting character sprite See merge request zolfite/project-rpg!1	2018-01-23 12:59:02 +00:00