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

Alles is opgeforked #4

Merged
merged 7 commits into from
Dec 25, 2015
Merged

Alles is opgeforked #4

merged 7 commits into from
Dec 25, 2015

Conversation

Pocket-titan
Copy link
Collaborator

the new visual age

Conflicts:
	client/components/Player.js
addition and subtraction still resulted in floating point weirdness
small ui changes
# Conflicts:
#	client/app.js
# Conflicts:
#	client/app.js
dralletje added a commit that referenced this pull request Dec 25, 2015
@dralletje dralletje merged commit 27eb1ce into dralletje:master Dec 25, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants