Diffusion witchblast 233257da773d

Merge remote-tracking branch 'Cirrus-Minor/dev' into dev
233257da773d
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'Cirrus-Minor/dev' into dev

Details

Provenance

Cong	Authored on Sep 12 2015, 2:57 PM

Parents

R78:2a6aca2ce79c: Merge pull request #19 from cxong/dev
R78:20b236d5454e: Only play fire animation if player is firing

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

2a6aca2ce79c Merge pull request #19 from cxong/dev
Author
Sébastien
Browse Repository
No Builds
No Audits
a9dddfaf457d Merge branch 'dev' of https://github.com/Cirrus-Minor/witchblast into dev
Author
Seby
Browse Repository
No Builds
No Audits
f6ebefb96792 Cleaning dev code
Author
Seby
Browse Repository
No Builds
No Audits
abc682d5f59d ADD Player drops an empty bottle while drinking
Author
Seby
Browse Repository
No Builds
No Audits
5534d02f09b4 Merge pull request #18 from cxong/dev
Author
Sébastien
Browse Repository
No Builds
No Audits

Changes (3)

Path

Size

media/

src/

PlayerEntity.cpp

WitchBlastGame.cpp

R78:233257da773d

media/items.png

Loading...

src/PlayerEntity.cpp

Loading...

src/WitchBlastGame.cpp

Loading...