forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 0
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
get head #1
Merged
Merged
get head #1
Conversation
This file contains 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
ExpandedPrisonBreakJune30
ExpandedPrisonBreakJuly1
ExpandedPrisonBreakJul02
ExpandedPrisonBreak Jul 05
ChattyCyborg July 07
July 12th
BathroomBreakAugust19
BathroomSupplyAugust21
TrueBathroomAugust25
BathroomUpdateSeptember2
bathroomTrueSept5
BathroomProperSept7
BathroomProperSept14
BathroomTrueSept19
Catching up to current version
BathroomBreakOct2
BathroomTrueOct9
adding a few clutter items. This first half is introducing the items, their craft recipes and their uncraft recipes.
Catchup to current mainline
starting with correcting some description errors.
these typoes were breaking the code and I won't tolerate that.
just a few spacing issues.
damage values of 0 need not be listed
sneaky redundancies. Lots of PRs happened in a short time too. Had to catch up with the recent robot tweaks.
more unique ASCII symbols for items
orange is not a creative color
…a map extra (#35990) * add json-based map extras for fields add shed adjust frequencies based on playtest * add new extras to forests too * reduce trees and bushes in fields
Updated Android build process (2019-12-18)
Only allow vertical view shifting when 3D FOV is enabled
Also add alt map key to mod testing to prevent this. Graphical overmap needs mod font support to be able to be run with CI.
Fix typo in variable name in gradle file
Fix alt map key after #36075
Remove dough from aftershock
Revert limiting search radius for listing bionics to 3 tiles
Report Android tools version during build
…#36198) * Using "cancels" makes traits mutually exclusive at character creation * Fix trait conflict at character creation * Shorter mod description * exclude robust genetic
Fix light drizzle being green
Fix NPC pulping
Jerimee
pushed a commit
that referenced
this pull request
Jun 8, 2020
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.
blurk