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

Merge pull request CleverRaven#36424 from captnblood/retrodays+ #32

Merged
merged 22 commits into from
Dec 31, 2019

Conversation

fengjixuchui
Copy link
Owner

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

captnblood and others added 22 commits December 25, 2019 03:32
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.
…erride

Add the mandatory override specifier to make clang-tidy happy
Fix building with ccache.
change <last_name> to <family_name> in graffiti list
* 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
@fengjixuchui fengjixuchui merged commit 398741a into fengjixuchui:master Dec 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants