Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Christian development #37

Merged
merged 8 commits into from
Jan 2, 2017
Merged

Christian development #37

merged 8 commits into from
Jan 2, 2017

Conversation

cl1210
Copy link
Collaborator

@cl1210 cl1210 commented Dec 8, 2016

enemy movement and projectiles

@Arne2
Copy link
Owner

Arne2 commented Dec 14, 2016

closes #28
closes #29

# Conflicts:
#	Project/Level.java
@Arne2 Arne2 merged commit 0d32b03 into master Jan 2, 2017
@Arne2 Arne2 deleted the christian-development branch January 2, 2017 16:33
This was referenced Jan 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants