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
Merge pull request CleverRaven#36424 from captnblood/retrodays+ #32
Merged
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
When building with ccache enabled, it removes the comments before passing them to the compiler. So the `/* fallthrough */` comment that prevents certain warnings is removed as well. Adding the `-C` switch prevents that removal and the comments remains and the warning from the compiler does not appear.
This instructs ccache directly. The former version relied on gcc to interpret the "-C" flag, but clang apparently does not understand it.
Tweak vinegar recipe
…erride Add the mandatory override specifier to make clang-tidy happy
Fix building with ccache.
change <last_name> to <family_name> in graffiti list
…icles Deprecate atomic cars
* Adds 4-door Hatchback, renames old Hatchback to City Car * Adds car_hatch spawns at 50% car spawn rate, reduces car_mini spawns by 50% * Fixes car_hatch item group spawns. * Increase car_hatch fuel tank size to 40L (midpoint between city car and regular car)
Make JSON formatter conserve escape sequences
Replace characters in the Graphical Overmap mod with escape sequences
Fix token from %d to %s in color-related debug message
* autoswim * prompting and smarter choice
new tileset retrodays+
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.
Summary
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context