Merge pull request CleverRaven#38334 from davidpwbrown/dead_npc_owner… #91
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The Travis CI test using the sanitizers is *still* timing out sometimes, so disable the next-slowest test. This one should save about 90 seconds.
Made a test category so I didn't need to disable them individually.
Another test that's slow on a CI run that's sometimes taking too long.
item_groups sorting
* adds newspaper item groups * adds more uses of the new groups * more uses of the new groups * fix * linting * more linting * New group uses in new item group file
There are a bunch of types which are just a std::array of pointers to two-dimensional arrays. These are all quite verbose. Introduce a template alias to simplify all those types.
Crouching affects your ability to see past adjacent obstacles. Previously this was implemented by altering the transparency cache. However, this also stops light passing the tile, and means that crouching by a window can cause a room to fall dark. Fix by separating the transparency cache into two, one for light and one for vision. The latter is a copy of the former, except with tweaks for crouching and with the avatar's tile forced to be transparent.
This tests that the player cannot see past an adjacent obstacle when crouching, but light can still pass it.
Tainted tallow is a feedstock for oil production, and thus most likely used in a chemlab.
Mutated poppies are a feedstock into various medicines, and thus most likely used in a chemlab.
So the player won't mistakenly decide the pro fishing rod is equal to the basic one.
* Add -Wlogical-op -Wrestrict These don't trigger anything in our code, but are useful gcc warnings to have enabled. * Remove redundant declarations * Remove unused macros * Fix format signedness * NULL -> nullptr * Guard dbg declaration in sounds.cpp * Enable a few more gcc warning options * Add -Wnon-virtual-dtor and virtual destructors This warning detects classes with virtual functions but a non-virtual destructor. Deleting instances through pointers whose type is such a class is undefined behaviour. I'm not certain whether any of the classes I've added the virtual destructors to here actually needed it, but there should be negligible performance impact, and it's a good warning to have enabled. * Remove -Wrestrict Turns out it's not actually supported by gcc 5.3.
fix laundromat
* Decreasing how many Zombie brides and priests there are. * Running JSON lint for the zombie brides JSON changes.
* Disable grenade_lethality test for sanitizer CI The Travis CI test using the sanitizers is *still* timing out sometimes, so disable the next-slowest test. This one should save about 90 seconds. * Disable all starve tests on clang sanitizer test Made a test category so I didn't need to disable them individually. * Disable vehicle efficiency on the gcc asan build Another test that's slow on a CI run that's sometimes taking too long.
Fix bug where crouching affects lighting
Bionic_item name to object
Gun name to object
Don't crash on loss of target for ACT_READ
Make 3l jar a by-product of heavy cream from milk cream jar recipe
* Revert "Moved more string consts into single file (#38237)" This reverts commit 4987742. * Revert "Moved more string consts into single file (#38220)" This reverts commit d9c6079. * Revert "Move string consts into single file (#38195)" This reverts commit b1b48ba. * Revert "More string consts into single file (#38189)" This reverts commit 4fffd96. * Revert "More string consts into single file (#38183)" This reverts commit 05940bf. * Revert "Move string consts into single file (#38184)" This reverts commit 19c5698. * Revert "Move string consts into single file (#38181)" This reverts commit 55cabb7. * Revert "Move more string consts into single file (#38175)" This reverts commit 571efb2. * Revert "Merge pull request #38176 from Ramza13/string_consts_and_more" This reverts commit 9c9835f, reversing changes made to 07995cd. * Revert "Move more string consts into single file (#38169)" This reverts commit 07995cd. * Revert "Merge pull request #38168 from Ramza13/even_more_string_consts" This reverts commit 2bf1c1e, reversing changes made to 24a32c0. * Revert "Merge pull request #38141 from ZhilkinSerg/sa-2020-02-18" This reverts commit 142295b, reversing changes made to f98c67d. * Revert "Move string consts into single file (#38158)" This reverts commit 50059c8. * Revert "Merge pull request #38157 from Ramza13/string_consts_more_flags" This reverts commit 8ec8e78, reversing changes made to 72ef022. * Revert "Move string_consts" This reverts commit 0a6bf67. * Revert "Merge pull request #38146 from Ramza13/battery" This reverts commit 9286722, reversing changes made to e9f1cd7. * Revert "Merge pull request #38134 from AMurkin/rename-blob" This reverts commit 06f72d2, reversing changes made to bcfe074. * Revert "Yet more string consts moved out (#38130)" This reverts commit b5f18f3. * Revert "Merge pull request #38115 from Ramza13/string_consts_game" This reverts commit 9807657, reversing changes made to 036465f. * Fixup to the picked_up * RE-inline item_location initialization * Update character.h * Update item.cpp * Update item.h * Update item_action.cpp * Update item_factory.cpp * Update point.h * Update safemode_ui.cpp
Gun name to object
Ammo name to object
Ammo name to object
Generic name to object
rename houses in fuji structures mod
Ammo name to object
Note that rock forge and smokers are usable for crafting
Magazine name to object
Fix BLOB error in mingw builds
Clear up item ownership for dead factions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context