Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/39406'
Browse files Browse the repository at this point in the history
* origin/pr/39406: (125 commits)
  Update npc_talk_test.cpp
  Update player_helpers.h
  temporarily disable padding clang tidy check
  Update item_pocket.h
  Update tools.json
  fix json errors
  Update item_location.cpp
  fix merge conflict
  astyle
  disable newcharacter test temporarily and maybe fix padding error
  Update offal_dishes.json
  fix vehicle interact test
  move pockets member in itype to attempt to fix padding error
  fix comestible tests
  adjust item::fill_with to take itype instead of item parameter
  fix crafting tests
  disable iteminfo test
  fix vehicle efficiency test crash
  fix seg fault in reloading test
  Update item.cpp
  ...
  • Loading branch information
kevingranade committed May 3, 2020
2 parents da38caf + d662a32 commit ecc602c
Show file tree
Hide file tree
Showing 199 changed files with 7,521 additions and 4,048 deletions.
1 change: 1 addition & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ readability-*,\
-readability-magic-numbers,\
-readability-named-parameter,\
-readability-redundant-control-flow,\
-clang-analyzer-optin.performance.Padding,\
"
WarningsAsErrors: '*'
HeaderFilterRegex: '(src|test|tools).*'
Expand Down
5 changes: 0 additions & 5 deletions data/json/item_actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -989,11 +989,6 @@
"id": "ammobelt",
"name": { "str": "Reload" }
},
{
"type": "item_action",
"id": "bandolier",
"name": { "str": "Store/unload ammo" }
},
{
"type": "item_action",
"id": "consume_drug",
Expand Down
Loading

0 comments on commit ecc602c

Please sign in to comment.