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

current #54

Merged
merged 895 commits into from
Mar 30, 2020
Merged

current #54

merged 895 commits into from
Mar 30, 2020

Conversation

Soupster89
Copy link
Owner

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Rivet-the-Zombie and others added 30 commits March 18, 2020 06:07
* Store the list of languages in the options_manager

* Include language in debug game report
…to-object

Aftershock martial_art name to object
…rn-json

NC_Arsonist item groups modern json
This currently causes a scrollbar to appear which is, in my opinion,
unacceptable. It's also pretty much illegible.
Remove text logo from README
…ring-header

Hoist activity ids out of cata_string_consts.h
ZhilkinSerg and others added 29 commits March 29, 2020 12:46
Remove redundant `game g` parameter in two functions
Add test asserting that time to throw is independent of size of thrown item stack size
Move food processor recipe to electronic tools tab
Avoid use-after-free in vehicle reaper code
Call abort() instead of std::exit() on unhandled exception
Move food processor recipe to electronics tab
* Post Processing on Professions

Post processing on profession selection and generation on game start.
Rebalance triffids speeds based on mass and features
Fetched translations for 0.E on 30 Mar 2020
@Soupster89 Soupster89 merged commit c58f38e into Soupster89:master Mar 30, 2020
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.