From aeb377a85778a0247bffef00d84863b1505a400f Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Mon, 19 Dec 2016 00:56:59 +0900 Subject: [PATCH] more sprite glow (test) Former-commit-id: 857997e5a00ccbb3f3d2ca7be5065f4f66487a4f Former-commit-id: 232ae9161a43762730fad1e77003b4033d72bb2a --- assets/graphics/sprites/.gitattributes | 1 + assets/graphics/sprites/test_player_glow.png | Bin 16850 -> 0 bytes assets/graphics/sprites/test_player_raw.raw | Bin 4200 -> 0 bytes .../terrarum/gameactors/PlayerBuilderSigrid.kt | 2 +- 4 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 assets/graphics/sprites/.gitattributes delete mode 100644 assets/graphics/sprites/test_player_glow.png delete mode 100644 assets/graphics/sprites/test_player_raw.raw diff --git a/assets/graphics/sprites/.gitattributes b/assets/graphics/sprites/.gitattributes new file mode 100644 index 000000000..ca82ef549 --- /dev/null +++ b/assets/graphics/sprites/.gitattributes @@ -0,0 +1 @@ +*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/sprites/test_player_glow.png b/assets/graphics/sprites/test_player_glow.png deleted file mode 100644 index 3d0e009bf851273267f4aa2dd6ce14e320de71a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16850 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 diff --git a/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt index 9cad7aa7c..8ab97c626 100644 --- a/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt +++ b/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt @@ -30,7 +30,7 @@ object PlayerBuilderSigrid { p.sprite!!.setAsVisible() p.makeNewSpriteGlow(28, 51) - p.spriteGlow!!.setSpriteImage("assets/graphics/sprites/test_player_glow.png") + p.spriteGlow!!.setSpriteImage("assets/graphics/sprites/test_player_glow.tga") p.spriteGlow!!.setDelay(200) p.spriteGlow!!.setRowsAndFrames(1, 1) p.spriteGlow!!.setAsVisible()