It happened again, I'm bad at this#5
Open
Bradley-Jackson wants to merge 43 commits intoerikbuck:masterfrom
DavidLandes:resolved_merge_conflict
Open
It happened again, I'm bad at this#5Bradley-Jackson wants to merge 43 commits intoerikbuck:masterfrom DavidLandes:resolved_merge_conflict
Bradley-Jackson wants to merge 43 commits intoerikbuck:masterfrom
DavidLandes:resolved_merge_conflict
Conversation
Update UserStories
Update UserStories
Create backlog & add Tasks 001-004
Update Backlog
Add documentation support with doxygen.
Added lava/rain textures and mapped them to blocks placeable by player
Controllable mouse sensitivity
Added user stories and updated backlog
Add new tasks
Resolve: 12 water invisible
13 slow movement in water lava
Tasks 10 11 14
update assigned and completed tasks.
Bradley-Jackson
changed the title
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Resolved merge conflict between task 15 and 18