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

get head #1

Merged
merged 262 commits into from
Dec 18, 2019
Merged

get head #1

merged 262 commits into from
Dec 18, 2019

Conversation

Jerimee
Copy link
Owner

@Jerimee Jerimee commented Dec 18, 2019

blurk

xanderrootslayer and others added 30 commits June 30, 2019 22:12
ExpandedPrisonBreak Jul 05
Catching up to current version
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
I'm surprised it was running at all before I fixed that.
hair dryers are not weapons
oh.
ZhilkinSerg and others added 25 commits December 17, 2019 21:52
…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
Revert limiting search radius for listing bionics to 3 tiles
…#36198)

* Using "cancels" makes traits mutually exclusive at character creation

* Fix trait conflict at character creation

* Shorter mod description

* exclude robust genetic
@Jerimee Jerimee merged commit 9b47c0f into Jerimee:master Dec 18, 2019
Jerimee pushed a commit that referenced this pull request Dec 18, 2019
Jerimee pushed a commit that referenced this pull request Mar 28, 2020
Jerimee pushed a commit that referenced this pull request Apr 3, 2020
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.