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

[RDY] Jsonify mapgen (churches and doctor office) #21217

Merged
merged 11 commits into from Sep 23, 2017

Conversation

4 participants
@ZhilkinSerg
Copy link
Contributor

commented Jun 11, 2017

Conversion of church_gothic, church_new_england and office_doctor mapgen to JSON.

  • Needs #20770 to be merged beforehand in order for computers to work.

ZhilkinSerg added some commits Jun 11, 2017

Initial commit
Move mapgen of doctors office and two types of churches to json. Depends
on #20770 in order to computers to work properly.

@ZhilkinSerg ZhilkinSerg changed the title Jsonify mapgen (churches and doctor office) [WIP] Jsonify mapgen (churches and doctor office) Jun 11, 2017

@Leland

This comment has been minimized.

Copy link
Contributor

commented Aug 15, 2017

@ZhilkinSerg this and #21211 can be updated - #20770 has been merged.

@ZhilkinSerg ZhilkinSerg changed the title [WIP] Jsonify mapgen (churches and doctor office) [RDY] Jsonify mapgen (churches and doctor office) Aug 16, 2017

@ZhilkinSerg

This comment has been minimized.

Copy link
Contributor Author

commented Aug 16, 2017

@ZhilkinSerg this and #21211 can be updated - #20770 has been merged.

Should be good to merge now.

@Coolthulhu

This comment has been minimized.

Copy link
Contributor

commented Sep 10, 2017

Needs update

@ZhilkinSerg

This comment has been minimized.

Copy link
Contributor Author

commented Sep 10, 2017

Needs update

I've just updated to current master.

EDIT: There is some network issue in Jenkins (see http://gorgon.narc.ro:8080/job/Cataclysm-PR-Builder/1589/console). Can we restart checking without pushing anything?

EDIT2: Anyway, I've found something to be changed and pushed to trigger checking.

@kevingranade kevingranade merged commit 3e3562a into CleverRaven:master Sep 23, 2017

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.07%) to 22.028%
Details
gorgon-ghprb Build finished.
Details

@ZhilkinSerg ZhilkinSerg deleted the ZhilkinSerg:mapgen-church-doctor branch Sep 25, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.