-
Notifications
You must be signed in to change notification settings - Fork 30
Issue 90 and 94 #106
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
Open
Hunman
wants to merge
15
commits into
codemetropolis:develop
Choose a base branch
from
Hunman:feature/OS1/combined
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Issue 90 and 94 #106
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Character is no longer an enum
DEBUG ME!!!
Changes in program: - Character is no longer an enum, but a class - BasicBlock constructors are no longer public - To get a block, use the static get() or userBlock() methods of the BasicBlock class - blocks.csv is rather massively extended - Program is prepared to accept any new block without change in program code (you have to extend only the blocks.csv) Changes in output: - The "frame" of the stairs is now in same matterial as the topBlock (Floor.prepareStairs) - The ceiling of the floor uses the external_character instead of character (still uses Character.getTopBlock) - Borders of namespaces changed from stone bricks to stone brick slabs (signs moved accordingly)
Changes in program: - Character is no longer an enum, but a class - BasicBlock constructors are no longer public - To get a block, use the static get() or userBlock() methods of the BasicBlock class - blocks.csv is rather massively extended - Program is prepared to accept any new block without change in program code (you have to extend only the blocks.csv) Changes in output: - The "frame" of the stairs is now in same matterial as the topBlock (Floor.prepareStairs) - The ceiling of the floor uses the external_character instead of character (still uses Character.getTopBlock) - Borders of namespaces changed from stone bricks to stone brick slabs (signs moved accordingly)
… feature/sanyi/full-palette
Now it uses the right method
Final cleanup and preparing for merge
Damn auto increment
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Our group's sollutions for issue #90 and #94
Combination of pull request #103 and #104