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

Added Color manager mention to COLOR.md #27991

Merged
merged 4 commits into from
Feb 1, 2019
Merged

Added Color manager mention to COLOR.md #27991

merged 4 commits into from
Feb 1, 2019

Conversation

int-ua
Copy link
Contributor

@int-ua int-ua commented Jan 31, 2019

Summary

SUMMARY: Bugfixes "Mentioned Color manager in COLOR.md"

Purpose of change

Make it easier to find color ID strings. Feel free to reject this PR and add Color manager how you would like it to be mentioned.

@ZhilkinSerg ZhilkinSerg added the <Documentation> Design documents, internal info, guides and help. label Feb 1, 2019
@ZhilkinSerg ZhilkinSerg merged commit b575483 into CleverRaven:master Feb 1, 2019
ZhilkinSerg added a commit that referenced this pull request Feb 6, 2019
* upstream/pr/28084: (88 commits)
  Fix wet morale cycling
  clear player morale effects in clear_player (#28045)
  Adds some money types. (#27963)
  You lived your life, like a candle in the wind... (#27935)
  [CR] Joint torsion ratchet CBM increases stamina drain (toggleable) (#27882)
  Allowed Snowstorms to happen - added snow wet and glare effects ( and fixed test_weather ) (#27870)
  I didn't make this mod! (#28033)
  Replaced popup with a message in a sidebar
  Added a popup after the start describing scenario
  Added Color manager mention to COLOR.md (#27991)
  Fix some more mission completion dialog bugs
  Fix NPC dialog around lying and succeeding mission
  Update MSX++DeadPeopleEdition 2019-01-31
  Update RetroDays - Mouse mutants, mailboxes
  Update lab_1.json
  Clear traps in test clear_map helper
  Fixed cyan color in COLOR.md (#27969)
  Update gfx/RetroASCIITileset/tile_config.json
  RetroAscii tileset - cleanup, update, lint
  Add lab terrain
  ...
@int-ua int-ua deleted the patch-1 branch March 14, 2019 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Documentation> Design documents, internal info, guides and help.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants