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.

Sign up for GitHub

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

Jump to bottom

Merge dev branch to master branch (2020-04-01) #39154

Merged
merged 53 commits into from
Apr 2, 2020
Merged

Merge dev branch to master branch (2020-04-01) #39154

merged 53 commits into from
Apr 2, 2020

Conversation

ZhilkinSerg
Copy link
Contributor

Summary

SUMMARY: None

Purpose of change

Merge contents of dev branch to master.

It consists of following 53 PRs (squashed to one commit per one PR) and this is not a joke despite current date:

DinoModv3: DinoDNA (#26525)
[Aftershock] Millyficent whately and the migo (#36908)
[Aftershock] Mutant npcs to aftershock (#37530)
Aftershock Crafting System (#37707)
Dark Skies Part 1: Mod (#38592)
Dark Skies Part 2: Blacklists (#38501)
Dark Skies Part 3: Effects and Items (#38520)
Dark Skies Part 4: Overrides (#38526)
Dark Skies 5: Override Scraps (#38550)
Dark Skies 6: Snippets (#38551)
Dark Skies 7: Monsters (#38552)
Dark Skies 8: Adds strays, lurker, enemies; updates modinfo (#38596)
Dark Skies: Spell Fixes (#38643)
[Magiclysm] Add Magiclysm academy (#38511)
Magiclysm: Forest Tomb (#37699)
Add demon chitin armor & repairing dragon armor (#36733)
Read ids and save ids for enchantments (#38262)
Jsonize spell skills (#37368)
JSONize AEP_EVIL and implement intermittent artifact effects (#38221)
JSONize AEP_SMOKE and add emitters to enchantments (#38260)
Traps can cast spells (#38122)
Add subway maps (#37540)
Add The Satanic Bible (#37806)
Indian cookbook (#37930)
AR pistols (#37768)
SUS bathroom 3.5 (#37431)
Add map_bash_info to fields (#37865)
Add shot counter to mods and gun (#37693)
Allow professions to start with a nearby vehicle (#37314)
Add Crazy Party scenario and Frat Boy/Sorority Girl profession (#37512)
Advanced inv save settings (#35239)
Refluff power armour and adjust stats slightly (#37578)
Match armor layers ui and help text (#38762)
Match advanced inventory UI and info text (#38763)
Match message log filter info and construction filter (#38764)
Match construction UI (#38765)
Match player info and martial arts UI (#38766)
Extracts and Concentrates pt 1 (#37936)
Add "forbidden traits" to professions (#36074)
Volleyballs (#38192)
Display damage per second in the item info (#38600)
Account for the rapid strike technique in DPS calc (#38880)
Debug command to wish for every item simultaneously (#39010)
Lgtm fixes pack (#39103)
Misc warning cleanup (#39115)
Change helptext and key-hints to match other menus (#39104)
Window manager (#37894)
Use ui_manager in main menu and related menus (#38235)
Use ui_adaptor in new character menu, debug message popup, and loading ui (#38916)
Refactor non-waiting popups using ui_adaptor (#39054)
Check loaded mapgen for being used at all (#37425)
Refactor loading bonuses (#36562)
Unicode in mapgen (#38149)

@ZhilkinSerg ZhilkinSerg added the Organization General development organization issues label Apr 1, 2020
@lgtm-com
Copy link

lgtm-com bot commented Apr 1, 2020

This pull request introduces 4 alerts and fixes 39 when merging ad75b87 into ae54c8c - view on LGTM.com

new alerts:

  • 2 for Declaration hides parameter
  • 2 for FIXME comment

fixed alerts:

  • 14 for Comparison result is always the same
  • 12 for Multiplication result converted to larger type
  • 9 for Empty branch of conditional
  • 1 for Unused local variable
  • 1 for Expression has no effect
  • 1 for Declaration hides parameter
  • 1 for FIXME comment

KorGgenT
KorGgenT reviewed Apr 1, 2020
View reviewed changes
Copy link
Member

@KorGgenT KorGgenT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got aboutu halfway through the travis errors for missing spaces and then accidentally closed the browser and lost my spot.

data/mods/Dark-Skies-Above/blacklists/trait_blacklist.json Show resolved Hide resolved
data/mods/Dark-Skies-Above/monsters/mongun.json Outdated Show resolved Hide resolved
data/mods/Dark-Skies-Above/monsters/mongun.json Outdated Show resolved Hide resolved
data/mods/Dark-Skies-Above/monsters/mongun.json Outdated Show resolved Hide resolved
data/mods/Dark-Skies-Above/monsters/monspell.json Outdated Show resolved Hide resolved
data/mods/Dark-Skies-Above/snippets/newspaper.json Outdated Show resolved Hide resolved
data/mods/Dark-Skies-Above/snippets/newspaper.json Outdated Show resolved Hide resolved
data/mods/Dark-Skies-Above/snippets/newspaper.json Outdated Show resolved Hide resolved
data/mods/Dark-Skies-Above/snippets/newspaper.json Outdated Show resolved Hide resolved
data/mods/Dark-Skies-Above/snippets/newspaper.json Outdated Show resolved Hide resolved
@kevingranade
Copy link
Member

The error in data/mods//Dark-Skies-Above/overrides/furniture_terrain/indoor_furniture.json looks like a BOM, might need to be checked out to be fixed and I can't do that right now.

davidpwbrown and others added 25 commits April 2, 2020 15:54
@ZhilkinSerg
Allow professions to start with a nearby vehicle (#37314)
519a182 
Adds trucker profession.
@CountAlex @ZhilkinSerg
Add Crazy Party scenario and Frat Boy/Sorority Girl profession (#37512)
1a63600
@akozhevn @ZhilkinSerg
Advanced inv save settings (#35239)
c53d821
@ZhilkinSerg
Refluff power armour and adjust stats slightly (#37578)
d4ecee9
@Pupsi-Mupsi @ZhilkinSerg
Match armor layers ui and help text (#38762)
7527c53
@Pupsi-Mupsi @ZhilkinSerg
Match advanced inventory UI and info text (#38763)
7de8d56
@Pupsi-Mupsi @ZhilkinSerg
Match message log filter info and construction filter (#38764)
1e1edf5
@Pupsi-Mupsi @ZhilkinSerg
Match construction UI (#38765)
06bd6fd
@Pupsi-Mupsi @ZhilkinSerg
Match player info and martial arts UI (#38766)
e0b7305
@NastyNate2612 @ZhilkinSerg
Extracts and Concentrates pt 1 (#37936)
7c100cc
@np-vortex @ZhilkinSerg
Add "forbidden traits" to professions (#36074)
f64d37c
@klorpa @ZhilkinSerg
Volleyballs (#38192)
3a2d6ff
@l29ah @ZhilkinSerg
Display damage per second in the item info (#38600)
deac304 
* Display damage per second in the item info

So you can quickly eyeball the weapon effectiveness versus plain meatbags

* Added DPS to tests
@l29ah @ZhilkinSerg
Account for the rapid strike technique in DPS calc (#38880)
d0ec9ec
@kevingranade @ZhilkinSerg
Debug command to wish for every item simultaneously (#39010)
419e3fd
@AMurkin @ZhilkinSerg
Lgtm fixes pack (#39103)
ed42817 
* Comment for a get_scent_glyph in overmap_ui::draw
* Get around W `Empty branch...` in read_conversion
* Pass input_context by ref
* Untangle game::knockbakk force
force is used only in tripoint version of game::knockbak, and unused in std::vector version.
Changed its type to std::size_t because it represents 0 to std::vector.size() numbers.
* Remove branching
dexroll >= 14 and strroll >= 12 at this point.
Second branch is never executed.
* Rewrite goo pit creation at iuse::can_goo
@kevingranade @ZhilkinSerg
Misc warning cleanup (#39115)
78ca0ae
@Pupsi-Mupsi @ZhilkinSerg
Change helptext and key-hints to match other menus (#39104)
db4949d
@Qrox @ZhilkinSerg
Window manager (#37894)
a04c3f1 
For properly refreshing and resizing multiple layers of windows
@Qrox @ZhilkinSerg
Use ui_manager in main menu and related menus (#38235)
ae68d3f
@Qrox @ZhilkinSerg
Use ui_adaptor in new character menu, debug message popup, and loadin…
2a0a38c 
…g ui (#38916)
@Qrox @ZhilkinSerg
Refactor non-waiting popups using ui_adaptor (#39054)
4017ff9
@BevapDin @ZhilkinSerg
Check loaded mapgen for being used at all (#37425)
cc0d33b
@BevapDin @ZhilkinSerg
Refactor loading bonuses (#36562)
7b18364
@jbytheway @ZhilkinSerg
Unicode in mapgen (#38149)
d432807
@ZhilkinSerg
Copy link
Contributor Author

There is seemingly unrelated clang-tidy warning, otherwise everything is good, so I am merging it as it is now.

@ZhilkinSerg ZhilkinSerg merged commit acd9025 into master Apr 2, 2020
@lgtm-com
Copy link

lgtm-com bot commented Apr 2, 2020

This pull request introduces 4 alerts and fixes 39 when merging d432807 into 4b16959 - view on LGTM.com

new alerts:

  • 2 for Declaration hides parameter
  • 2 for FIXME comment

fixed alerts:

  • 14 for Comparison result is always the same
  • 12 for Multiplication result converted to larger type
  • 9 for Empty branch of conditional
  • 1 for Unused local variable
  • 1 for Expression has no effect
  • 1 for Declaration hides parameter
  • 1 for FIXME comment

@ZhilkinSerg ZhilkinSerg deleted the dev branch August 3, 2020 06:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KorGgenT KorGgenT KorGgenT left review comments

@Qrox Qrox Qrox left review comments

@kevingranade kevingranade kevingranade left review comments

@I-am-Erk I-am-Erk Awaiting requested review from I-am-Erk

@John-Candlebury John-Candlebury Awaiting requested review from John-Candlebury

Assignees
No one assigned
Labels
Organization General development organization issues
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.