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

add world status on f9 #527

Merged
merged 3 commits into from
Mar 27, 2014
Merged

add world status on f9 #527

merged 3 commits into from
Mar 27, 2014

Conversation

xchrdw
Copy link
Member

@xchrdw xchrdw commented Mar 24, 2014

No description provided.

@@ -99,6 +100,9 @@ static void keyCallback(GLFWwindow* window, int key, int scancode, int action, i
if (key == GLFW_KEY_F6 && action == GLFW_PRESS) {
PropertyManager::instance()->load("data/config.ini");
}
if (key == GLFW_KEY_F9 && action == GLFW_PRESS) {
World::instance()->print_status();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

printStatus

@mrzzzrm
Copy link

mrzzzrm commented Mar 25, 2014

After comments, :shipit:

@xchrdw
Copy link
Member Author

xchrdw commented Mar 25, 2014

fixed

@gersseba
Copy link
Contributor

you know what would be awesome? more statistics: after finishing a mission: "you personally destroyed 17 ships with a total of 14620 voxels, using 2546 bullets and 27 rockets in this game"
till then :shipit:

…tatus

Conflicts:
	src/voxeleffect/voxelparticleengine.cpp
@xchrdw
Copy link
Member Author

xchrdw commented Mar 27, 2014

#529 created an issue for this

xchrdw added a commit that referenced this pull request Mar 27, 2014
@xchrdw xchrdw merged commit 5ee2fad into master Mar 27, 2014
@xchrdw xchrdw deleted the world_status branch March 27, 2014 22:07
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.

3 participants